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.

15 files changed, 42 insertions, 103 deletions

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;
 }