diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
| commit | 6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch) | |
| tree | af53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/m68k/mvme162/startup | |
| parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 | |
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme162/startup')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/page_table.c | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index cc581d62cf..ec26fdf77e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -27,7 +27,7 @@ #include <rtems/libio.h> #include <rtems/libcsupport.h> #include <page_table.h> - + /* * The original table from the application and our copy of it with * some changes. @@ -43,7 +43,7 @@ char *rtems_progname; /* * Use the shared implementations of the following routines */ - + void bsp_postdriver_hook(void); void bsp_libc_init( void *, uint32_t, int ); void bsp_pretasking_hook(void); /* m68k version */ diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c b/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c index 35fd0dd6b2..2629aa053c 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c @@ -1,4 +1,4 @@ -/* +/* * $Id$ * * This file was submitted by Eric Vaitl <vaitl@viasat.com>. @@ -85,15 +85,15 @@ static unsigned long *table_alloc(int size){ illegal. */ void page_table_init(){ - + /* put everything in a known state */ page_table_teardown(); root_table=table_alloc(ROOT_TABLE_SIZE); - /* First set up TTR. + /* First set up TTR. base address = 0x80000000 - address mask = 0x7f + address mask = 0x7f Ignore FC2 for match. Noncachable. Not write protected.*/ @@ -117,7 +117,7 @@ void page_table_init(){ asm volatile ("movec %0,%%cacr" :: "d" (0x80008000)); } - + void page_table_teardown(){ next_avail=(unsigned long *)BASE_TABLE_ADDR; /* Turn off paging. Turn off the cache. Flush the cache. Tear down @@ -156,7 +156,7 @@ int page_table_map(void *addr, unsigned long size, int cache_type){ root_index &= 0x7f; if(root_table[root_index]){ - pointer_table = + pointer_table = (unsigned long *) (root_table[root_index] & 0xfffffe00); }else{ if(!(pointer_table=table_alloc(POINTER_TABLE_SIZE))){ @@ -164,21 +164,21 @@ int page_table_map(void *addr, unsigned long size, int cache_type){ } root_table[root_index]=((unsigned long)pointer_table) + 0x03; } - + pointer_index=(unsigned long)addr; pointer_index >>=18; pointer_index &= 0x7f; - + if(pointer_table[pointer_index]){ - page_table = - (unsigned long *) (pointer_table[pointer_index] & + page_table = + (unsigned long *) (pointer_table[pointer_index] & 0xffffff00); }else{ if(!(page_table=table_alloc(PAGE_TABLE_SIZE))){ return PTM_NO_TABLE_SPACE; } pointer_table[pointer_index]= - ((unsigned long)page_table) + 0x03; + ((unsigned long)page_table) + 0x03; } page_index=(unsigned long)addr; |