RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* page.c: Fixed warnings.
This commit is contained in:
Joel Sherrill
2009-05-06 16:36:52 +00:00
parent 430f6ffa61
commit a1d478230e
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libcpu/i386/ChangeLog
View File

@@ -1,3 +1,7 @@
2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* page.c: Fixed warnings.
2008-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-12-03 Joel Sherrill <joel.sherrill@OARcorp.com>
Michael South <msouth@msouth.org> Michael South <msouth@msouth.org>

51
c/src/lib/libcpu/i386/page.c
View File

@@ -42,7 +42,8 @@ extern uint32_t rtemsFreeMemStart;
/* /*
* Disable the paging * Disable the paging
*/ */
void _CPU_disable_paging(void) { void _CPU_disable_paging(void)
{
cr0 regCr0; cr0 regCr0;
rtems_cache_flush_entire_data(); rtems_cache_flush_entire_data();
@@ -54,7 +55,8 @@ void _CPU_disable_paging(void) {
/* /*
* Enable the paging * Enable the paging
*/ */
void _CPU_enable_paging(void) { void _CPU_enable_paging(void)
{
cr0 regCr0; cr0 regCr0;
regCr0.i = i386_get_cr0(); regCr0.i = i386_get_cr0();
@@ -68,8 +70,8 @@ void _CPU_enable_paging(void) {
* Initialize the paging with 1-to-1 mapping * Initialize the paging with 1-to-1 mapping
*/ */
int init_paging(void) { int init_paging(void)
{
int memorySize; int memorySize;
int nbPages; int nbPages;
int nbInitPages; int nbInitPages;
@@ -156,7 +158,8 @@ int init_paging(void) {
/* /*
* Is cache enable * Is cache enable
*/ */
int _CPU_is_cache_enabled() { int _CPU_is_cache_enabled(void)
{
cr0 regCr0; cr0 regCr0;
regCr0.i = i386_get_cr0(); regCr0.i = i386_get_cr0();
@@ -166,7 +169,8 @@ int _CPU_is_cache_enabled() {
/* /*
* Is paging enable * Is paging enable
*/ */
int _CPU_is_paging_enabled() { int _CPU_is_paging_enabled(void)
{
cr0 regCr0; cr0 regCr0;
regCr0.i = i386_get_cr0(); regCr0.i = i386_get_cr0();
@@ -179,9 +183,13 @@ int _CPU_is_paging_enabled() {
* the translated address in mappedAddress * the translated address in mappedAddress
*/ */
int _CPU_map_phys_address int _CPU_map_phys_address(
(void **mappedAddress, void *physAddress, int size, int flag){ void **mappedAddress,
void *physAddress,
int size,
int flag
)
{
page_table *localPageTable; page_table *localPageTable;
unsigned int lastAddress, countAddress; unsigned int lastAddress, countAddress;
char *Tables; char *Tables;
@@ -199,7 +207,7 @@ int _CPU_map_phys_address
lastAddress = (unsigned int)physAddress + (size - 1); lastAddress = (unsigned int)physAddress + (size - 1);
virtualAddress.address = 0; virtualAddress.address = 0;
while (1){ while (1) {
if ((countAddress & ~MASK_OFFSET) > (lastAddress & ~MASK_OFFSET)) if ((countAddress & ~MASK_OFFSET) > (lastAddress & ~MASK_OFFSET))
break; break;
@@ -273,7 +281,8 @@ int _CPU_map_phys_address
* "Compress" the Directory and Page tables to avoid * "Compress" the Directory and Page tables to avoid
* important loss of address range * important loss of address range
*/ */
static void Paging_Table_Compress() { static void Paging_Table_Compress(void)
{
unsigned int dirCount, pageCount; unsigned int dirCount, pageCount;
page_table *localPageTable; page_table *localPageTable;
@@ -325,7 +334,11 @@ static void Paging_Table_Compress() {
* (we do not deallocate the table already allocated) * (we do not deallocate the table already allocated)
*/ */
int _CPU_unmap_virt_address(void *mappedAddress, int size){ int _CPU_unmap_virt_address(
void *mappedAddress,
int size
)
{
linear_address linearAddr; linear_address linearAddr;
page_table *localPageTable; page_table *localPageTable;
@@ -381,8 +394,13 @@ int _CPU_unmap_virt_address(void *mappedAddress, int size){
* of the page's descriptor. * of the page's descriptor.
*/ */
int _CPU_change_memory_mapping_attribute int _CPU_change_memory_mapping_attribute(
(void **newAddress, void *mappedAddress, unsigned int size, unsigned int flag){ void **newAddress,
void *mappedAddress,
unsigned int size,
unsigned int flag
)
{
linear_address linearAddr; linear_address linearAddr;
page_table *localPageTable; page_table *localPageTable;
@@ -441,7 +459,8 @@ int _CPU_change_memory_mapping_attribute
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
int _CPU_display_memory_attribute(){ int _CPU_display_memory_attribute(void)
{
unsigned int dirCount, pageCount; unsigned int dirCount, pageCount;
cr0 regCr0; cr0 regCr0;
page_table *localPageTable; page_table *localPageTable;
@@ -505,6 +524,6 @@ int _CPU_display_memory_attribute(){
} }
if (pagingWasEnabled) if (pagingWasEnabled)
_CPU_enable_paging(); _CPU_enable_paging();
return 0;
return 0;
} }