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

	* Makefile.am, include/bsp.h, startup/bspstart.c: Moved most of the
	remaining CPU Table fields to the Configuration Table. This included
	pretasking_hook, predriver_hook, postdriver_hook, idle_task,
	do_zero_of_workspace, extra_mpci_receive_server_stack,
	stack_allocate_hook, and stack_free_hook. As a side-effect of this
	effort some multiprocessing code was made conditional and some style
	clean up occurred.

8 files changed, 38 insertions, 24 deletions

diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index e46271e108..fa87252c6f 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-03	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, include/bsp.h, startup/bspstart.c: Moved most of the
+	remaining CPU Table fields to the Configuration Table. This included
+	pretasking_hook, predriver_hook, postdriver_hook, idle_task,
+	do_zero_of_workspace, extra_mpci_receive_server_stack,
+	stack_allocate_hook, and stack_free_hook. As a side-effect of this
+	effort some multiprocessing code was made conditional and some style
+	clean up occurred.
+
 2007-09-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1257/bsps
diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am
index 77c99c47b8..2d314ec439 100644
--- a/c/src/lib/libbsp/arm/gp32/Makefile.am
+++ b/c/src/lib/libbsp/arm/gp32/Makefile.am
@@ -28,6 +28,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+    ../../shared/bsppredriverhook.c \
     startup/bspstart.c startup/exit.c startup/memmap.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h
index 23f3070bb3..e331ffc37c 100644
--- a/c/src/lib/libbsp/arm/gp32/include/bsp.h
+++ b/c/src/lib/libbsp/arm/gp32/include/bsp.h
@@ -64,6 +64,15 @@ void gp32_setPalette( unsigned char pos, uint16_t color);
 /* 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
+ *  to configure a BSP specific one.
+ */
+void bsp_idle_task(void);
+
+#define BSP_IDLE_TASK_BODY bsp_idle_task
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
index 56f96ad4bd..64a35db952 100644
--- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
@@ -99,14 +99,6 @@ void bsp_start_default( void )
     uint32_t pend,last;
     uint32_t REFCNT;
     int i;
-    /* If we don't have command line arguments set default program name. */
-
-    Cpu_table.pretasking_hook      = bsp_pretasking_hook; /* init libc, etc. */
-    Cpu_table.predriver_hook       = NULL;                /* use system's    */
-    Cpu_table.postdriver_hook      = bsp_postdriver_hook;
-    Cpu_table.idle_task            = bsp_idle_task;
-    Cpu_table.interrupt_stack_size = 4096;
-    Cpu_table.extra_mpci_receive_server_stack = 0;
 
     /* stop RTC */
     rTICINT=0x0;
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
index 3c5c8e76b6..37c0083125 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
+++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-03	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, include/bsp.h, startup/bspstart.c: Moved most of the
+	remaining CPU Table fields to the Configuration Table. This included
+	pretasking_hook, predriver_hook, postdriver_hook, idle_task,
+	do_zero_of_workspace, extra_mpci_receive_server_stack,
+	stack_allocate_hook, and stack_free_hook. As a side-effect of this
+	effort some multiprocessing code was made conditional and some style
+	clean up occurred.
+
 2007-11-03      Ray Xu <rayx.cn@gmail.com>
 
         * start/start.S, startup/bspclean.c: Add veneer between ARM and 
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index e1fbc81c03..3ca09a41e7 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -29,9 +29,9 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 include_HEADERS += ../../arm/shared/comm/uart.h
 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+    ../../shared/bsppredriverhook.c \
     startup/bspstart.c startup/bspclean.c ../../shared/bootcard.c \
-    ../../shared/sbrk.c \
-    ../../shared/gnatinstallhandler.c
+    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
@@ -75,6 +75,7 @@ startup_rel-bootcard.o \
 startup_rel-bspclean.o \
 startup_rel-bsplibc.o \
 startup_rel-bsppost.o \
+startup_rel-bsppredriverhook.o \
 startup_rel-bspstart.o \
 startup_rel-sbrk.o
 
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
index d1882b0897..9ef62b2568 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
+++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
@@ -121,15 +121,6 @@ extern "C" {
 // RTL8019AS definition
 #define RTL8019AS_BASE            0x82000000                //
 
-
-
-
-/*
- *  Define the interrupt mechanism for Time Test 27
- *
- *  NOTE: Following are not defined and are board independent
- *
- */
 struct rtems_bsdnet_ifconfig;
 int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config,
                           int                          attaching);
@@ -145,6 +136,11 @@ extern rtems_configuration_table BSP_Configuration;
 #define RTEMS_BSP_NETWORK_DRIVER_NAME	"eth0"
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH	cs8900_driver_attach
 
+/*
+ *  BSP Configuration Default Overrides
+ */
+#define BSP_ZERO_WORKSPACE_AUTOMATICALLY TRUE
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
index cafe0ae42e..965deabde7 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
@@ -184,11 +184,6 @@ void bsp_start_default( void )
     /* Setup interrupt controller.*/
     VICProtection = 0;
 
-
-    Cpu_table.pretasking_hook        = bsp_pretasking_hook;
-    Cpu_table.postdriver_hook        = bsp_postdriver_hook;
-    Cpu_table.do_zero_of_workspace   = TRUE;
-    BSP_Configuration.microseconds_per_tick=100000;
     /* Place RTEMS workspace at beginning of free memory. */
     BSP_Configuration.work_space_start = (void *)&_bss_free_start;