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

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

Browse Source 
* amba/amba.c, startup/bspstart.c: Moved most of the remaining CPU
	Table fields to the Configuration Table. This included
	pretasking_hook, predriver_hook, postdriver_hook, idle_task,
	do_zero_of_workspace, extra_mpci_receive_server_stack,
	stack_allocate_hook, and stack_free_hook. As a side-effect of this
	effort some multiprocessing code was made conditional and some style
	clean up occurred.
This commit is contained in:
Joel Sherrill
2007-12-03 22:24:07 +00:00
parent 2f1d801fd3
commit 03bfdbb39c
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libbsp/sparc/leon3/ChangeLog
View File

@@ -1,3 +1,13 @@
2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* amba/amba.c, startup/bspstart.c: Moved most of the remaining CPU
Table fields to the Configuration Table. This included
pretasking_hook, predriver_hook, postdriver_hook, idle_task,
do_zero_of_workspace, extra_mpci_receive_server_stack,
stack_allocate_hook, and stack_free_hook. As a side-effect of this
effort some multiprocessing code was made conditional and some style
clean up occurred.
2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com> 2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* shmsupp/getcfg.c: Fix spacing. * shmsupp/getcfg.c: Fix spacing.

12
c/src/lib/libbsp/sparc/leon3/amba/amba.c
View File

@@ -24,7 +24,7 @@ volatile LEON3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs;
int LEON3_Cpu_Index = 0; int LEON3_Cpu_Index = 0;
/* /*
* bsp_leon3_predriver_hook * bsp_predriver_hook
* *
* BSP predriver hook. Called just before drivers are initialized. * BSP predriver hook. Called just before drivers are initialized.
* Used to scan system bus. Probes for AHB masters, AHB slaves and * Used to scan system bus. Probes for AHB masters, AHB slaves and
@@ -44,14 +44,14 @@ asm(" .text \n"
extern rtems_configuration_table Configuration; extern rtems_configuration_table Configuration;
void bsp_leon3_predriver_hook(void) void bsp_predriver_hook(void)
{ {
int i; int i;
unsigned int tmp; unsigned int tmp;
amba_apb_device dev; amba_apb_device dev;
/* Scan the AMBA Plug&Play info at the default LEON3 area */ /* Scan the AMBA Plug&Play info at the default LEON3 area */
amba_scan(&amba_conf,LEON3_IO_AREA,NULL); amba_scan(&amba_conf,LEON3_IO_AREA,NULL);
/* Find LEON3 Interrupt controler */ /* Find LEON3 Interrupt controler */
i = amba_find_apbslv(&amba_conf,VENDOR_GAISLER,GAISLER_IRQMP,&dev); i = amba_find_apbslv(&amba_conf,VENDOR_GAISLER,GAISLER_IRQMP,&dev);
@@ -59,8 +59,8 @@ void bsp_leon3_predriver_hook(void)
/* Found APB IRQ_MP Interrupt Controller */ /* Found APB IRQ_MP Interrupt Controller */
LEON3_IrqCtrl_Regs = (volatile LEON3_IrqCtrl_Regs_Map *) dev.start; LEON3_IrqCtrl_Regs = (volatile LEON3_IrqCtrl_Regs_Map *) dev.start;
if (Configuration.User_multiprocessing_table != NULL) { if (Configuration.User_multiprocessing_table != NULL) {
tmp = getasr17(); tmp = getasr17();
LEON3_Cpu_Index = (tmp >> 28) & 3; LEON3_Cpu_Index = (tmp >> 28) & 3;
} }
} }

13
c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
View File

@@ -100,7 +100,7 @@ void bsp_pretasking_hook(void)
bsp_spurious_initialize(); bsp_spurious_initialize();
} }
void bsp_leon3_predriver_hook(void); void bsp_predriver_hook(void);
/* /*
* bsp_start * bsp_start
@@ -112,20 +112,9 @@ void bsp_start( void )
{ {
unsigned char *work_space_start; unsigned char *work_space_start;
/*
* Set up our hooks
* Make sure libc_init is done before drivers initialized so that
* they can use atexit()
*/
Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */
Cpu_table.postdriver_hook = bsp_postdriver_hook;
Cpu_table.predriver_hook = bsp_leon3_predriver_hook; /* scan system bus */
/* /*
* This should be enough interrupt stack. * This should be enough interrupt stack.
*/ */
Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
work_space_start = work_space_start =