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 /c/src/lib/libbsp/m68k/mvme147s | |
| 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 'c/src/lib/libbsp/m68k/mvme147s')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/include/bsp.h | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c | 16 |
3 files changed, 11 insertions, 20 deletions
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; } |