[PATCH 19/23] sapi: Delete duplicate declarations

Sebastian Huber sebastian.huber at embedded-brains.de
Tue Nov 6 12:56:41 UTC 2012


---
 c/src/lib/libbsp/arm/gumstix/include/bsp.h         |    2 --
 c/src/lib/libbsp/m68k/idp/clock/ckinit.c           |    1 -
 .../lib/libbsp/powerpc/beatnik/startup/bspstart.c  |    7 -------
 .../lib/libbsp/powerpc/mvme3100/startup/bspstart.c |    7 -------
 cpukit/sapi/include/confdefs.h                     |    1 -
 cpukit/sapi/include/rtems/config.h                 |    6 ------
 6 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/c/src/lib/libbsp/arm/gumstix/include/bsp.h
index beee318..e9358fe 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h
+++ b/c/src/lib/libbsp/arm/gumstix/include/bsp.h
@@ -37,8 +37,6 @@ static inline int32_t BSP_get_baud(void) {return 115200;}
 /* How big should the interrupt stack be? */
 #define CONFIGURE_INTERRUPT_STACK_MEMORY  (16 * 1024)
 
-extern rtems_configuration_table Configuration;
-
 #define ST_PIMR_PIV	33	/* 33 ticks of the 32.768Khz clock ~= 1msec */
 
 #define outport_byte(port,val) *((unsigned char volatile*)(port)) = (val)
diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
index 8391f8c..c2e6dbf 100644
--- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
@@ -30,7 +30,6 @@ volatile uint32_t         Clock_driver_ticks;
                                     /* ticks since initialization */
 rtems_isr_entry  Old_ticker;
 
-extern rtems_configuration_table Configuration;
 extern void led_putnum(void);
 void Disable_clock(void);
 
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c b/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c
index feda093..b3a17e7 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c
@@ -130,13 +130,6 @@ char BSP_serialNumber[20] = {0};
 char BSP_enetAddr0[7] = {0};
 char BSP_enetAddr1[7] = {0};
 
-/*
- *  The original table from the application and our copy of it with
- *  some changes.
- */
-
-extern rtems_configuration_table Configuration;
-
 char *rtems_progname;
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
index 91741b1..edf8ea1 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
@@ -118,13 +118,6 @@ void _BSP_Fatal_error(unsigned int v)
   __asm__ __volatile ("sc");
 }
 
-/*
- *  The original table from the application and our copy of it with
- *  some changes.
- */
-
-extern rtems_configuration_table Configuration;
-
 char *rtems_progname;
 
 /*
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 09edc97..17cb2ee 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -50,7 +50,6 @@ extern "C" {
 
 extern rtems_initialization_tasks_table Initialization_tasks[];
 extern rtems_driver_address_table       Device_drivers[];
-extern rtems_configuration_table        Configuration;
 #if defined(RTEMS_MULTIPROCESSING)
   extern rtems_multiprocessing_table      Multiprocessing_configuration;
 #endif
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/sapi/include/rtems/config.h
index 6426121..55b7bda 100644
--- a/cpukit/sapi/include/rtems/config.h
+++ b/cpukit/sapi/include/rtems/config.h
@@ -280,12 +280,6 @@ extern rtems_configuration_table  Configuration;
 #define rtems_configuration_get_idle_task_stack_size() \
         (Configuration.idle_task_stack_size)
 
-/* XXX We need to get this from the generated table
- *     since BSPs need it before the pointer is set.
- *     Eventually all should be done this way.
- */
-extern rtems_configuration_table    Configuration;
-
 #define rtems_configuration_get_interrupt_stack_size() \
         (Configuration.interrupt_stack_size)
 
-- 
1.7.7




More information about the devel mailing list