diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-04 22:22:26 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-04 22:22:26 +0000 |
commit | d34d8692b674a3366e3cef11a33941e8160c338d (patch) | |
tree | 2a9254debb288cf2f5d2c896c1c8cf9dd67317e1 | |
parent | 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-d34d8692b674a3366e3cef11a33941e8160c338d.tar.bz2 |
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field
from CPU Table to Configuration Table. Eliminate CPU Table from all
ports. Delete references to CPU Table in all forms.
Diffstat (limited to '')
111 files changed, 257 insertions, 532 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index dbc9afae19..e2b1f7fa4b 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/c/src/lib/libbsp/arm/csb336/include/bsp.h index 465040cbb6..67753012ad 100644 --- a/c/src/lib/libbsp/arm/csb336/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb336/include/bsp.h @@ -26,7 +26,6 @@ extern "C" { #include <rtems/console.h> #include <rtems/clockdrv.h> #include <mc9328mxl.h> - /* What is the input clock freq in hertz? */ #define BSP_OSC_FREQ 16000000 /* 16 MHz oscillator */ @@ -35,9 +34,6 @@ extern "C" { /* How many serial ports? */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -/* How big should the interrupt stack be? */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) - extern rtems_configuration_table BSP_Configuration; int get_perclk1_freq(void); diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c index 2f9d379b99..66c1967206 100644 --- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c @@ -29,7 +29,6 @@ unsigned long free_mem_end; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; char *rtems_progname = "RTEMS"; extern void rtems_irq_mngt_init(void); diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 69e236860a..418d627876 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h index cedcf8d30f..b6eac8a6c7 100644 --- a/c/src/lib/libbsp/arm/csb337/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb337/include/bsp.h @@ -40,9 +40,6 @@ static inline int32_t BSP_get_baud(void) {return 38400;} /* How many serial ports? */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 -/* How big should the interrupt stack be? */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) - extern rtems_configuration_table BSP_Configuration; #define ST_PIMR_PIV 33 /* 33 ticks of the 32.768Khz clock ~= 1msec */ diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c index e6d4c2150a..d7f381fd07 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c @@ -30,7 +30,6 @@ unsigned long free_mem_start; unsigned long free_mem_end; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; char *rtems_progname = "RTEMS"; /* Function prototypes */ diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 8255504816..0533a63bbb 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h index 4b3540e01c..b6df498c9e 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h +++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h @@ -36,7 +36,6 @@ int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config, int attaching); #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) extern rtems_configuration_table BSP_Configuration; diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c index 12731e5ed6..9816bd3fff 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c @@ -44,7 +44,6 @@ unsigned long free_mem_end; extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; /* CPU configuration table. */ char *rtems_progname; /* Program name - from main(). */ /*************************************************************/ diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index fa87252c6f..66ca618fbd 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, include/bsp.h, startup/bspstart.c: Moved most of the diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h index e331ffc37c..2a9c7c15cc 100644 --- a/c/src/lib/libbsp/arm/gp32/include/bsp.h +++ b/c/src/lib/libbsp/arm/gp32/include/bsp.h @@ -61,9 +61,6 @@ void gp32_setPalette( unsigned char pos, uint16_t color); /* How many serial ports? */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 -/* How big should the interrupt stack be? */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) - /* * This BSP provides its own IDLE task to override the RTEMS one. * So we prototype it and define the constant confdefs.h expects diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c index 64a35db952..e92dbf8e41 100644 --- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c @@ -37,7 +37,6 @@ unsigned long free_mem_end; extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; /* CPU configuration table. */ char *rtems_progname = "RTEMS"; /* Program name - from main(). */ /*-------------------------------------------------------------------------+ diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index 37c0083125..2f1ad8ca86 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, include/bsp.h, startup/bspstart.c: Moved most of the diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h index 9ef62b2568..dd624d7384 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h +++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h @@ -126,7 +126,6 @@ int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config, int attaching); #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (1 * 1024) extern rtems_configuration_table BSP_Configuration; diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c index 965deabde7..fad578de95 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c @@ -49,7 +49,6 @@ unsigned long free_mem_end; extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; /* CPU configuration table. */ char *rtems_progname; /* Program name - from main(). */ /*************************************************************/ diff --git a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog index 63ea5ee3fb..3a1011c3bd 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog +++ b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h index 1b76d84da2..ec34c37609 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h +++ b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h @@ -80,15 +80,6 @@ extern "C" { #define FIFOLENGTH 0x100 /* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c b/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c index db4a9d0fbd..04e712498e 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c +++ b/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c @@ -34,8 +34,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; @@ -159,12 +157,6 @@ void bsp_start( void ) BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - int i=0; for (i=5;i<16;i++) { set_vector((rtems_isr_entry)null_isr, i, 1); diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index ea1587fcea..766dd1ec79 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h index 369e946528..eb27804579 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h +++ b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h @@ -66,8 +66,6 @@ void bsp_spurious_initialize( void ); extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ - extern uint32_t bsp_isr_level; #endif /* ASM */ diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c index 75bbb036ee..d15ce74ce2 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c +++ b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c @@ -28,8 +28,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - /* * Use the shared implementations of the following routines */ @@ -73,14 +71,8 @@ extern void C4X_BSP_output_char(char c); void bsp_start( void ) { - extern void *_WorkspaceBase; - extern uint32_t _WorkspaceMax; - - /* - * This should be enough interrupt stack. - */ - - Cpu_table.interrupt_stack_size = 0; + extern void *_WorkspaceBase; + extern uint32_t _WorkspaceMax; BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; /* XXX check to see if satisfying small memory model */ diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 5b7e7a7ea3..e137640ed1 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h index 9fb9f18100..743fec4bea 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h @@ -29,15 +29,6 @@ extern "C" { #include <bsp/irq.h> /* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (8 * 1024) - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c index 59f6555ef4..2783762b8e 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c @@ -35,8 +35,6 @@ void bsp_clean_up(void); extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - /* * Tells us where to put the workspace in case remote debugger is present. */ @@ -95,13 +93,6 @@ void bsp_start( void ) { void rtems_irq_mngt_init(); - /* - * we do not use the pretasking_hook. - */ - - /* changed Sept 14 STACK_MINIMUM_SIZE */ - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) RAM_END - BSP_Configuration.work_space_size; #ifdef DEBUG diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 65327f640f..c4999b82a3 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h index 216f445ae6..bd0f3551e8 100644 --- a/c/src/lib/libbsp/i386/pc386/include/bsp.h +++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h @@ -62,12 +62,6 @@ extern "C" { #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 -#if STACK_MINIMUM_SIZE < (4 * 1024) -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) -#else -#define CONFIGURE_INTERRUPT_STACK_MEMORY STACK_MINIMUM_SIZE -#endif - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index fe57d0d6f4..15dce5d31b 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -76,7 +76,6 @@ uint32_t rtemsFreeMemStart; extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; /* CPU configuration table. */ char *rtems_progname; /* Program name - from main(). */ /*-------------------------------------------------------------------------+ @@ -180,8 +179,6 @@ void bsp_start_default( void ) /* set the value of start of free memory. */ rtemsFreeMemStart = (uint32_t)&_end + _stack_size; - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - /* Place RTEMS workspace at beginning of free memory. */ if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */ diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index fc9442e689..d6bd76e493 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h index 6654f6f9a7..870ecc2bfc 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h @@ -29,15 +29,6 @@ extern "C" { #include <bsp/irq.h> /* - * confdefs.h overrides for this BSP: - * - termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (8 * 1024) - -/* * Network driver configuration */ diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c index c64ab0d88b..61a192934a 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c @@ -34,8 +34,6 @@ void bsp_clean_up(void); extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - /* * Tells us where to put the workspace in case remote debugger is present. */ @@ -93,8 +91,6 @@ void bsp_start( void ) { void rtems_irq_mngt_init(); - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) RAM_END - BSP_Configuration.work_space_size; diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index bb21bb3d4d..be5ea6e21e 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 77f49110eb..3dd7adf417 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -125,7 +125,6 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config); */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) /* System frequency */ #define BSP_SYSTEM_FREQUENCY (66 * 1000 * 1000) diff --git a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c index 8bfdb32265..36dfd25723 100644 --- a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c @@ -40,17 +40,12 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - extern unsigned int _RamSize; - - 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 */ @@ -64,7 +59,6 @@ void bsp_start( void ) extern unsigned long _M68k_Ramsize; _M68k_Ramsize = (unsigned long)&_RamSize; /* size set in linker script */ - /* * Need to "allocate" the memory for the RTEMS Workspace and * tell the RTEMS configuration where it is. This memory is @@ -72,9 +66,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - Cpu_table.interrupt_stack_size = 4096; } diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 528dceffe7..bd3cab3bbb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 11d966e24e..10f69dcc66 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -29,15 +29,6 @@ extern "C" { #include <rtems/clockdrv.h> /* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c index d83e91c34b..543595fc5e 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c @@ -28,8 +28,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -71,10 +69,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 6c16e44e85..f749815873 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index a451f0ca93..15afbfa4b3 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -32,15 +32,6 @@ extern "C" { #include <rtems/clockdrv.h> /* - * confdefs.h overrides for this BSP: - * - termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c index c6b064b44f..4bb4ed4a7a 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c @@ -33,8 +33,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* Initialize whatever libc we are using @@ -74,9 +72,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 74788dd560..fec20de52c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 6d8fa567d5..9486831ac2 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -38,15 +38,6 @@ extern "C" { #include <rtems/clockdrv.h> /* - * confdefs.h overrides for this BSP: - * - termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - -/* * Network driver configuration */ struct rtems_bsdnet_ifconfig; diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index 9b0cbfcd9b..3b505cf999 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -27,8 +27,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* Amount of RAM on this board. Dynamically set in start.S */ diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 1a2b43401f..8e13047923 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index 7ae6d7f199..6b0917f6d8 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -16,15 +16,6 @@ #include <rtems/motorola/mc68230.h> #include <rtems/motorola/mc68681.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - #define DUART_ADDR 0xb00003 /* base address of the MC68681 DUART */ /* Constants */ diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index ee740c4c17..c3d9431856 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -35,8 +35,6 @@ void led_putnum(); extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -91,12 +89,6 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; /* led_putnum('e'); * for debugging purposes only */ diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 0142466a22..aa212143ed 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index a5d48835ce..8c8605c679 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -145,7 +145,6 @@ extern "C" { */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) /* System frequency */ #define BSP_SYSTEM_FREQUENCY ((unsigned int)&_SYS_CLOCK_FREQUENCY) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c index 2a14dd64c4..ba1a4239f4 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c @@ -40,8 +40,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - unsigned long _RamSize; char *rtems_progname; @@ -68,9 +66,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - Cpu_table.interrupt_stack_size = 4096; } diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 729730ce06..bc76a38ab4 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index e204740a19..0ac7b2dc0f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -38,7 +38,6 @@ extern "C" { #define CONSOLE_SCI /* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -/* #define CONFIGURE_INTERRUPT_STACK_MEMORY (TBD * 1024) */ /* * Simple spin delay in microsecond units for device drivers. diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c index 5e42d9db5a..b98009bd63 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c @@ -26,9 +26,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index bc29522a47..2d7e6784ea 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index c0a89d16fd..efa813d8c6 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -27,15 +27,6 @@ extern "C" { #include <rtems/iosupp.h> /* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 756c8b5bba..60878303d3 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -28,9 +28,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -74,11 +71,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index ef962a1953..f51b882e7a 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index 1d15e16094..ce1fd8f410 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -30,15 +30,6 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - /* Constants */ #define RAM_START 0x00005000 diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c index 09d0258728..0606257937 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c @@ -31,9 +31,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -82,11 +79,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index b99bc8aa6c..474707ace2 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 4b707195a5..94b6d374d7 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -30,15 +30,6 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - /* Constants */ #define RAM_START 0x00007000 diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c index b2336c260a..6b1736b720 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c @@ -31,9 +31,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -93,9 +90,12 @@ void bsp_start( void ) /* Make VME access round-robin */ } - node_number = - (uint8_t) +#if defined(RTEMS_MULTIPROCESSING) + node_number = (uint8_t) (Configuration.User_multiprocessing_table->node - 1) & 0xF; +#else + node_number = 1; +#endif /* Get and store node ID, first node_number = 0 */ vme_gcsr->board_identification = node_number; @@ -140,11 +140,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 401dec1f58..fa2dd8c312 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 3dc38b4507..ce808b6b1b 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -33,15 +33,6 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - #include <mvme16x_hw.h> /*----------------------------------------------------------------*/ diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index d625226f02..2ca2c25541 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -35,9 +35,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -98,11 +95,5 @@ void bsp_start( void ) page_table_init(); - /* - * we only use a hook to get the C library initialized. - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 12f70edc1f..3b7726d08c 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index d4cae9fc0b..6e775ca2da 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -40,7 +40,6 @@ extern "C" { */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 4 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) #include <mvme16x_hw.h> diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c index 7cb49c090f..fa2034e4cf 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c @@ -35,9 +35,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; rtems_extensions_table user_extension_table; - -rtems_cpu_table Cpu_table; - /* * Use the shared implementations of the following routines. * Look in rtems/c/src/lib/libbsp/shared/bsppost.c and @@ -125,9 +122,6 @@ void bsp_start( void ) */ page_table_init( &Configuration ); - /* Must match value in start.s */ - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - /* * If the application has not overriden the default User_extension_table, * supply one with our own fatal error handler that returns control to diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 600b8eee3a..e7b0f50c28 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 076d625405..571e4b3834 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -29,15 +29,6 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/m68k/m68302.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - #ifndef VARIANT #define VARIANT bare #endif diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c index e801783fa3..e2548547af 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c @@ -27,10 +27,7 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; rtems_interrupt_level bsp_isr_level; - char *rtems_progname; /* @@ -62,10 +59,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; - - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/mips/hurricane/ChangeLog b/c/src/lib/libbsp/mips/hurricane/ChangeLog index 01084c6fa0..16667f0aaa 100644 --- a/c/src/lib/libbsp/mips/hurricane/ChangeLog +++ b/c/src/lib/libbsp/mips/hurricane/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/c/src/lib/libbsp/mips/hurricane/include/bsp.h index 0dbe88ba79..cb27172e0d 100644 --- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h +++ b/c/src/lib/libbsp/mips/hurricane/include/bsp.h @@ -29,15 +29,6 @@ extern "C" { #include <rtems/clockdrv.h> #include <libcpu/rm5231.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - extern void WriteDisplay( char * string ); /* diff --git a/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c b/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c index 9c7833798e..93d2173d0d 100644 --- a/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c @@ -28,11 +28,7 @@ uint32_t bsp_clicks_per_microsecond; */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -103,11 +99,6 @@ void bsp_start( void ) BSP_Configuration.work_space_start = (void *)((uint64_t)((&end) + LIBC_HEAP_SIZE + 0x2000) & ~0x7); - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; bsp_clicks_per_microsecond = CPU_CLOCK_RATE_MHZ; mips_install_isr_entries(); /* Install generic MIPS exception handler */ diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog index d5156dce66..5d6837a7d3 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog +++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index 724433a061..9071c2e6fd 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h @@ -28,15 +28,6 @@ extern "C" { #include <rtems/clockdrv.h> /* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - -/* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c index a2d6730a53..4c37dd5286 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c @@ -26,11 +26,7 @@ */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -93,10 +89,4 @@ void bsp_start( void ) */ BSP_Configuration.work_space_start = (void *) 0; - - /* - * initialize the CPU table for this BSP - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 1a0b6bcc20..b959fa89ca 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h index 001fe3d8d3..1c1aee5ea9 100644 --- a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h @@ -49,15 +49,6 @@ extern "C" { #include <bspopts.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) - #ifdef ASM /* Definition of where to store registers in alignment handler */ #define ALIGN_REGS 0x0140 @@ -77,7 +68,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ /* * Device Driver Table Entries diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c index bba3dfe6fd..62f9af6913 100644 --- a/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c @@ -70,11 +70,7 @@ */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; void *bsp_ram_end = (void *)RAM_END; /* first addr behind avail. ram area */ @@ -183,11 +179,8 @@ void bsp_start( void ) ((char *)(bsp_ram_end)) - BSP_Configuration.work_space_size; /* - * initialize the CPU table for this BSP + * initialize the device driver parameters */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - bsp_clicks_per_usec = 300; bsp_serial_per_sec = 14625000; bsp_serial_external_clock = 0; diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index d08fedd5a4..7b5d9c4273 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h index 0540514818..305f7d427a 100644 --- a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h @@ -46,15 +46,6 @@ extern "C" { #include <bspopts.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) - #ifdef ASM /* Definition of where to store registers in alignment handler */ #define ALIGN_REGS 0x0140 @@ -74,7 +65,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ /* * Device Driver Table Entries diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c b/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c index 4b82e295dd..ee00a0418c 100644 --- a/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c @@ -68,11 +68,7 @@ */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; void *bsp_ram_end = (void *)RAM_END; /* first addr behind avail. ram area */ @@ -173,11 +169,8 @@ void bsp_start( void ) ((char *)(bsp_ram_end)) - BSP_Configuration.work_space_size; /* - * initialize the CPU table for this BSP + * initialize the device driver parameters */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - bsp_clicks_per_usec = 25; bsp_serial_per_sec = 25000000; bsp_serial_external_clock = 0; diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 80fcce2c88..ac11707290 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, include/bsp.h, startup/bspstart.c: Moved most of the diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h index 2b8a8526d1..06df360651 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h @@ -69,7 +69,6 @@ */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) /* uart.c uses out_8 instead of outb */ #define BSP_UART_IOBASE_COM1 GT64260_DEV1_BASE + 0x20000 diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c index 6419539f8a..d61a44e642 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c @@ -127,10 +127,9 @@ static char cmdline_buf[CMDLINE_BUF_SIZE]; char *BSP_commandline_string = cmdline_buf; /* - * system init stack and soft ir stack size + * system init stack */ #define INIT_STACK_SIZE 0x1000 -#define INTR_STACK_SIZE CONFIGURE_INTERRUPT_STACK_MEMORY void BSP_panic(char *s) { @@ -150,11 +149,7 @@ void _BSP_Fatal_error(unsigned int v) */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -327,7 +322,8 @@ void bsp_start( void ) * This could be done latter (e.g in IRQ_INIT) but it helps to understand * some settings below... */ - BSP_heap_start = ((uint32_t) __rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE; + BSP_heap_start = ((uint32_t) __rtems_end) + INIT_STACK_SIZE + + rtems_configuration_get_interrupt_stack_size(); intrStack = BSP_heap_start - PPC_MINIMUM_STACK_FRAME_SIZE; /* make sure it's properly aligned */ @@ -402,13 +398,6 @@ void bsp_start( void ) printk("Now BSP_mem_size = 0x%x\n",BSP_mem_size); - /* - * Set up our hooks - * Make sure libc_init is done before drivers initialized so that - * they can use atexit() - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; /* P94 : 7455 TB/DECR is clocked by the system bus clock frequency */ bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000); @@ -421,8 +410,8 @@ void bsp_start( void ) work_space_start = (unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; - if ( work_space_start <= - ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE) { + if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + + rtems_configuration_get_interrupt_stack_size()) { printk( "bspstart: Not enough RAM!!!\n" ); bsp_cleanup(); } diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 6f61c2594b..f131f98dad 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, irq/no_pic.c: Spacing. diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h index 0a828ff75a..d97f8461db 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h @@ -38,15 +38,6 @@ extern "C" { #include <bspopts.h> -/* - * confdefs.h overrides for this BSP: - * - termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (12 * 1024) - #ifdef ASM /* Definition of where to store registers in alignment handler */ #define ALIGN_REGS 0x0140 @@ -91,7 +82,6 @@ extern int end; /* last address in the program */ void bsp_cleanup( void ); extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ #endif /* ASM */ diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c index a8f3090240..e9d2c30c64 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c @@ -51,7 +51,6 @@ extern int PSIM_INSTRUCTIONS_PER_MICROSECOND; extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; /* * Tells us where to put the workspace in case remote debugger is present. @@ -79,10 +78,9 @@ void bsp_postdriver_hook(void); void bsp_libc_init( void *, uint32_t, int ); /* - * system init stack and soft irq stack size + * system init stack */ #define INIT_STACK_SIZE 0x1000 -#define INTR_STACK_SIZE CONFIGURE_INTERRUPT_STACK_MEMORY void BSP_panic(char *s) { @@ -142,13 +140,8 @@ void bsp_start( void ) current_ppc_cpu = PPC_PSIM; /* - * Set up our hooks - * Make sure libc_init is done before drivers initialized so that - * they can use atexit() + * initialize the device driver parameters */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - BSP_bus_frequency = (unsigned int)&PSIM_INSTRUCTIONS_PER_MICROSECOND; BSP_time_base_divisor = 1; @@ -182,8 +175,9 @@ void bsp_start( void ) * This could be done latter (e.g in IRQ_INIT) but it helps to understand * some settings below... */ - intrStack = ((uint32_t) __rtems_end) + - INIT_STACK_SIZE + INTR_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE; + intrStack = ((uint32_t) __rtems_end) + INIT_STACK_SIZE + + rtems_configuration_get_interrupt_stack_size() - + PPC_MINIMUM_STACK_FRAME_SIZE; /* make sure it's properly aligned */ intrStack &= ~(CPU_STACK_ALIGNMENT-1); diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 9b79d7cdc1..a6a9a4a15f 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h index cbae0dce19..94d677ae72 100644 --- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h @@ -37,7 +37,6 @@ extern "C" { #else #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS (4) #endif -#define CONFIGURE_INTERRUPT_STACK_MEMORY (12 * 1024) #ifdef ASM /* Definition of where to store registers in alignment handler */ @@ -222,7 +221,6 @@ unsigned int SCORE603e_FLASH_Enable_writes( ( ((_data&0x00ff)<<8) | ((_data&0xff00)>>8) ) extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ extern uint32_t bsp_isr_level; #endif /* ASM */ diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c index e17bb625f6..f042f07645 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c @@ -49,7 +49,6 @@ uint32_t bsp_clicks_per_usec; extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; uint32_t bsp_isr_level; void BSP_panic(char *s) @@ -306,11 +305,8 @@ void bsp_start( void ) BSP_Configuration.work_space_start = work_space_start; /* - * initialize the CPU table for this BSP + * initialize the device driver parameters */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - bsp_clicks_per_usec = 66 / 4; /* XXX get from linkcmds */ #if ( PPC_USE_DATA_CACHE ) diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog index df255177f9..5897646efc 100644 --- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog +++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h index e71ee284a9..ad525641fb 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h @@ -49,15 +49,6 @@ extern "C" { #include <bspopts.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024) - #ifdef ASM /* Definition of where to store registers in alignment handler */ #define ALIGN_REGS 0x0140 @@ -82,7 +73,6 @@ extern uint32_t _top_of_ram; /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ /* Network Defines */ diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c index c409f5350c..5203d44a1a 100644 --- a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c @@ -79,11 +79,8 @@ SPR_RW(SPRG1) */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; -rtems_cpu_table Cpu_table; - char *rtems_progname; uint32_t _heap_start; @@ -197,17 +194,13 @@ void bsp_start( void ) */ myCpu = get_ppc_cpu_type(); myCpuRevision = get_ppc_cpu_revision(); + /* - * initialize the CPU table for this BSP - * NOTE: this must be before the exception initialization, - * because exception code useses some information from Cpu_table + * initialize the device driver parameters */ - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - /* timebase register ticks/microsecond */ bsp_clicks_per_usec = (250000000 / 1000000); - bsp_serial_per_sec = 14625000; bsp_serial_external_clock = 0; bsp_timer_internal_clock = 1; diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index 65363feeac..faf5dd1a97 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h index bea13f5d93..02e2e544a4 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h @@ -35,15 +35,6 @@ extern "C" { #include <bspopts.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - /* EDIT: To activate the sci driver, change the define below */ #if 1 #include <rtems/devnull.h> diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c index 5dc83018eb..31989ccde8 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c @@ -38,11 +38,7 @@ uint32_t bsp_clicks_per_second; */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -116,14 +112,6 @@ void bsp_start(void) #if ( CPU_ALLOCATE_INTERRUPT_STACK == FALSE ) _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; - - Cpu_table.interrupt_stack_size = - (uint32_t) (&CPU_Interrupt_stack_high) - - (uint32_t) (&CPU_Interrupt_stack_low) ; -#endif - -#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE ) - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #endif bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; } diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 97d8c2b28e..de9260ab2e 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h index 7d909109d2..72d5504d45 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h @@ -46,15 +46,6 @@ extern "C" { #include <bspopts.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - #if 0 #include <rtems/devnull.h> #define BSP_CONSOLE_DEVNAME "/dev/null" diff --git a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c index 789ffaf896..dc64f5a43e 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c @@ -38,13 +38,8 @@ uint32_t bsp_clicks_per_second; */ extern void bsp_hw_init(void); - extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -122,15 +117,10 @@ void bsp_start(void) #if ( CPU_ALLOCATE_INTERRUPT_STACK == FALSE ) _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; - - /* This isn't used anywhere */ - Cpu_table.interrupt_stack_size = - &CPU_Interrupt_stack_high - &CPU_Interrupt_stack_low ; -#endif - -#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE ) - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #endif + /* + * initialize the device driver parameters + */ bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; } diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index 779f64c954..681b546bf5 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h index fdffcbfbdc..b8f0202052 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h @@ -51,15 +51,6 @@ extern "C" { #include "rtems/score/sh7750_regs.h" -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - /* Constants */ /* diff --git a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c index 7d36127dbb..c600c0338c 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c @@ -39,13 +39,8 @@ uint32_t bsp_clicks_per_second; */ extern void bsp_hw_init(void); - extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -124,16 +119,10 @@ void bsp_start(void) #if ( CPU_ALLOCATE_INTERRUPT_STACK == FALSE ) _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; - - /* This isn't used anywhere */ - Cpu_table.interrupt_stack_size = - (uint32_t) (&CPU_Interrupt_stack_high) - - (uint32_t) (&CPU_Interrupt_stack_low) ; -#endif - -#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE ) - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #endif + /* + * initialize the device driver parameters + */ bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; } diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 94998ffa31..66de4cc265 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h index 76df8ff593..8db58b7b77 100644 --- a/c/src/lib/libbsp/sh/shsim/include/bsp.h +++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h @@ -32,15 +32,6 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 0 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - #include <bspopts.h> /* diff --git a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c index e78e23ae4a..89d9d6292b 100644 --- a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c @@ -35,11 +35,7 @@ uint32_t bsp_clicks_per_second; */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -113,14 +109,10 @@ void bsp_start( void ) #if ( CPU_ALLOCATE_INTERRUPT_STACK == FALSE ) _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; - - Cpu_table.interrupt_stack_size = - (uint32_t) (&CPU_Interrupt_stack_high) - - (uint32_t) (&CPU_Interrupt_stack_low) ; #endif -#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE ) - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; -#endif + /* + * initialize the device driver parameters + */ bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; } diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index fd359a7bcc..e084a2ada7 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU diff --git a/c/src/lib/libbsp/sh/simsh4/include/bsp.h b/c/src/lib/libbsp/sh/simsh4/include/bsp.h index 7d5e0b2288..9b72c24710 100644 --- a/c/src/lib/libbsp/sh/simsh4/include/bsp.h +++ b/c/src/lib/libbsp/sh/simsh4/include/bsp.h @@ -59,7 +59,6 @@ extern "C" { */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) /* !!! Should be defined in accordance to simulator considerations.*/ #define CLOCK_VECTOR 32 @@ -89,9 +88,6 @@ extern void *CPU_Interrupt_stack_high ; /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; - -extern rtems_cpu_table Cpu_table; - extern void bsp_cleanup( void ); /* diff --git a/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c b/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c index 55e48be4bd..3d86bcd6b4 100644 --- a/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c @@ -44,11 +44,7 @@ uint32_t bsp_clicks_per_second; extern void bsp_hw_init(void); extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -127,16 +123,10 @@ void bsp_start(void) #if ( CPU_ALLOCATE_INTERRUPT_STACK == FALSE ) _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; - - /* This isn't used anywhere */ - Cpu_table.interrupt_stack_size = - (uint32_t) (&CPU_Interrupt_stack_high) - - (uint32_t) (&CPU_Interrupt_stack_low) ; -#endif - -#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE ) - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #endif + /* + * initialize the device driver parameters + */ bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; } diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index e8719aa6d7..e4bd88520b 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field + from CPU Table to Configuration Table. Eliminate CPU Table from all + ports. Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Moved most of the remaining CPU Table fields to diff --git a/c/src/lib/libbsp/unix/posix/include/bsp.h b/c/src/lib/libbsp/unix/posix/include/bsp.h index 20f13586c3..4e262de946 100644 --- a/c/src/lib/libbsp/unix/posix/include/bsp.h +++ b/c/src/lib/libbsp/unix/posix/include/bsp.h @@ -26,15 +26,6 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> -/* - * confdefs.h overrides for this BSP: - * - number of termios serial ports (defaults to 1) - * - Interrupt stack space is not minimum if defined. - */ - -/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - #define RAM_START 0 #define RAM_END 0x100000 @@ -63,8 +54,6 @@ void bsp_cleanup( void ); /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ -extern rtems_cpu_table Cpu_table; /* owned by BSP */ - extern int rtems_argc; extern char **rtems_argv; diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c index a9923db267..977b355ef6 100644 --- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c +++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c @@ -33,7 +33,6 @@ extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; rtems_multiprocessing_table BSP_Multiprocessing; -rtems_cpu_table Cpu_table; uint32_t bsp_isr_level; uint32_t Heap_size; int rtems_argc; @@ -179,12 +178,6 @@ void bsp_start(void) BSP_Configuration.work_space_start = (void *) workspace_ptr; /* - * XXX; interrupt stack not currently used, so this doesn't matter - */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - - /* * Add 1 extension for MPCI_fatal */ @@ -198,8 +191,5 @@ void bsp_start(void) * main() will start the rest */ - bsp_isr_level = rtems_initialize_executive_early( - &BSP_Configuration, - &Cpu_table - ); + bsp_isr_level = rtems_initialize_executive_early( &BSP_Configuration ); } |