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.

9 files changed, 18 insertions, 40 deletions

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;