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

2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* shared/startup/bspstart.c, shared/startup/pretaskinghook.c: Eliminate
	copies of the Configuration Table. Use the RTEMS provided accessor
	macros to obtain configuration fields.
This commit is contained in:
Joel Sherrill
2007-12-11 15:46:56 +00:00
parent d11d1d2aa8
commit 4b39acf19a
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* shared/startup/bspstart.c, shared/startup/pretaskinghook.c: Eliminate
copies of the Configuration Table. Use the RTEMS provided accessor
macros to obtain configuration fields.
2007-12-10 Till Straumann <strauman@slac.stanford.edu> 2007-12-10 Till Straumann <strauman@slac.stanford.edu>
* Makefile.am, start/preload.S: moved preload.S * Makefile.am, start/preload.S: moved preload.S

17
c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
View File

@@ -109,15 +109,6 @@ void _BSP_Fatal_error(unsigned int v)
__asm__ __volatile ("sc"); __asm__ __volatile ("sc");
} }
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -382,12 +373,12 @@ void bsp_start( void )
bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000); bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000);
#ifdef SHOW_MORE_INIT_SETTINGS #ifdef SHOW_MORE_INIT_SETTINGS
printk("BSP_Configuration.work_space_size = %x\n", printk("rtems_configuration_get_work_space_size() = %x\n",
BSP_Configuration.work_space_size); rtems_configuration_get_work_space_size());
#endif #endif
work_space_start = work_space_start =
(unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; (unsigned char *)BSP_mem_size - rtems_configuration_get_work_space_size();
if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE +
rtems_configuration_get_interrupt_stack_size()) { rtems_configuration_get_interrupt_stack_size()) {
@@ -395,7 +386,7 @@ void bsp_start( void )
bsp_cleanup(); bsp_cleanup();
} }
BSP_Configuration.work_space_start = work_space_start; Configuration.work_space_start = work_space_start;
/* /*
* Initalize RTEMS IRQ system * Initalize RTEMS IRQ system

2
c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c
View File

@@ -52,7 +52,7 @@ void bsp_pretasking_hook(void)
/* make sure it's properly aligned */ /* make sure it's properly aligned */
BSP_heap_start = (BSP_heap_start + CPU_ALIGNMENT - 1) & ~(CPU_ALIGNMENT-1); BSP_heap_start = (BSP_heap_start + CPU_ALIGNMENT - 1) & ~(CPU_ALIGNMENT-1);
heap_size = (BSP_mem_size - BSP_heap_start) - BSP_Configuration.work_space_size; heap_size = (BSP_mem_size - BSP_heap_start) - rtems_configuration_get_work_space_size();
heap_sbrk_spared=_bsp_sbrk_init(BSP_heap_start, &heap_size); heap_sbrk_spared=_bsp_sbrk_init(BSP_heap_start, &heap_size);
#ifdef SHOW_MORE_INIT_SETTINGS #ifdef SHOW_MORE_INIT_SETTINGS