bsps: Move extern "C" to not cover includes

Some includes may use C++ and this conflicts if surrounded extern "C".

c/src/lib/libbsp/arm/csb336/include/bsp.h

@@ -19,10 +19,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -32,6 +28,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <mc9328mxl.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup arm_csb336 CSB336 Support
  *

c/src/lib/libbsp/arm/csb337/include/bsp.h

@@ -19,10 +19,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup arm_csb337 CSB337 Support
  *

c/src/lib/libbsp/arm/edb7312/include/bsp.h

@@ -18,10 +18,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 
 /**

c/src/lib/libbsp/arm/gba/include/bsp.h

@@ -20,10 +20,6 @@
 #ifndef __BSP_H_
 #define __BSP_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -32,6 +28,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 
 /** Define operation count for Tests */

c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h

@@ -18,10 +18,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup arm_gdbarmsim GDBARMSIM Support
  *

c/src/lib/libbsp/arm/gp32/include/bsp.h

@@ -16,10 +16,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -29,6 +25,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <s3c24xx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 
 #define gp32_initButtons() {rPBCON=0x0;}

c/src/lib/libbsp/arm/gumstix/include/bsp.h

@@ -15,10 +15,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -26,6 +22,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup arm_gumstix Gumstix Support
  * @ingroup bsp_arm

c/src/lib/libbsp/arm/nds/include/bsp.h

@@ -10,11 +10,6 @@
 #ifndef __BSP_H_
 #define __BSP_H_
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 #include <rtems.h>
@@ -23,6 +18,10 @@ extern "C"
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rtems_bsdnet_ifconfig;
 
 int rtems_wifi_driver_attach (struct rtems_bsdnet_ifconfig *config,

c/src/lib/libbsp/arm/rtl22xx/include/bsp.h

@@ -16,10 +16,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -35,6 +31,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 
 #define CONFIG_ARM_CLK 60000000L

c/src/lib/libbsp/avr/avrtest/include/bsp.h

@@ -14,10 +14,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -26,6 +22,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* support for simulated clock tick */
 Thread clock_driver_sim_idle_body(uintptr_t);
 #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body

c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h

@@ -19,10 +19,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -33,6 +29,10 @@ extern "C" {
 #include <rtems/bfin/bf52x.h>
 #include <bf52x.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup bfin_tll6527m TLL6527M Support
  * @ingroup bsp_bfin

c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h

@@ -17,10 +17,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -31,6 +27,10 @@ extern "C" {
 #include <libcpu/bf537.h>
 #include <libcpu/memoryRegs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* configure data cache to use 16K of each SRAM bank when enabled */
 #define BSP_DATA_CACHE_CONFIG  (3 << DMEM_CONTROL_DMC_SHIFT)
 

c/src/lib/libbsp/bfin/eZKit533/include/bsp.h

@@ -25,10 +25,6 @@
 
 #include <libcpu/bf533.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -38,6 +34,10 @@ extern "C" {
 #include <rtems/score/bfin.h>
 #include <rtems/bfin/bf533.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup bfin_ezkit533 eZKit533 Support
  * @ingroup bsp_bfin

c/src/lib/libbsp/h8300/h8sim/include/bsp.h

@@ -21,10 +21,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -33,6 +29,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup h8300_bsp Clock Tick Support
  *

c/src/lib/libbsp/i386/pc386/include/bsp.h

@@ -49,10 +49,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -63,6 +59,10 @@ extern "C" {
 #include <libcpu/cpu.h>
 #include <rtems/bspIo.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @degroup pc386_i386 PC386 Support
  *

c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h

@@ -22,10 +22,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -34,6 +30,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
   *  @defgroup m32c_bsp Clock Tick Support
   *

c/src/lib/libbsp/m32r/m32rsim/include/bsp.h

@@ -22,10 +22,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -34,6 +30,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup m32r_bsp Clock Tick Support
  *

c/src/lib/libbsp/m68k/av5282/include/bsp.h

@@ -23,10 +23,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -41,6 +37,10 @@ extern "C" {
 /**  Hardware data structure headers                                      **/
 #include <mcf5282/mcf5282.h>   /* internal MCF5282 modules */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***************************************************************************/
 /**  Network driver configuration                                         **/
 struct rtems_bsdnet_ifconfig;

c/src/lib/libbsp/m68k/csb360/include/bsp.h

@@ -117,10 +117,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <rtems.h>
 #include <rtems/console.h>
@@ -128,6 +124,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rtems_bsdnet_ifconfig;
 extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config);
 #define RTEMS_BSP_NETWORK_DRIVER_NAME	"eth0"

c/src/lib/libbsp/m68k/gen68302/include/bsp.h

@@ -18,10 +18,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup m68k_gen68302 GEN68302 Support
  *

c/src/lib/libbsp/m68k/gen68340/include/bsp.h

@@ -28,10 +28,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -40,6 +36,10 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup m68k_gen68340 Motorola MC68340 Support
  *

c/src/lib/libbsp/m68k/gen68360/include/bsp.h

@@ -31,10 +31,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -43,6 +39,10 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup gen68360_bsp Network driver
  *

c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h

@@ -54,9 +54,6 @@
 #ifndef __GENMCF548X_BSP_H
 #define __GENMCF548X_BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -79,6 +76,10 @@ extern "C" {
 /**  Hardware data structure headers                                      **/
 #include <mcf548x/mcf548x.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***************************************************************************/
 /**  User Definable configuration                                         **/
 

c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h

@@ -117,10 +117,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <rtems.h>
 #include <rtems/console.h>
@@ -131,6 +127,10 @@ extern "C" {
 
 #include "i2c.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* System frequency */
 #define BSP_SYSTEM_FREQUENCY ((unsigned int)&_SYS_CLOCK_FREQUENCY)
 extern char _SYS_CLOCK_FREQUENCY; /* Don't use this variable directly!!! */

c/src/lib/libbsp/m68k/mcf52235/include/bsp.h

@@ -5,10 +5,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 #include <rtems.h>
@@ -22,6 +18,10 @@ extern "C" {
 /**  Hardware data structure headers                                      **/
 #include <mcf5223x/mcf5223x.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Declare base address of peripherals area */
 #define __IPSBAR ((vuint8 *) 0x40000000)
 

c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h

@@ -7,10 +7,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 #include <rtems.h>
@@ -23,7 +19,11 @@ extern "C" {
 /***************************************************************************/
 /**  Hardware data structure headers                                      **/
 #include <mcf5225x/mcf5225x.h>
-    
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Declare base address of peripherals area */
 #define __IPSBAR ((vuint8 *) 0x40000000)    
 

c/src/lib/libbsp/m68k/mcf5235/include/bsp.h

@@ -5,10 +5,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 #include <rtems.h>
@@ -22,6 +18,10 @@ extern "C" {
 /**  Hardware data structure headers                                      **/
 #include <mcf5235/mcf5235.h>   /* internal MCF5235 modules */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***************************************************************************/
 /**  Network driver configuration                                         **/
 struct rtems_bsdnet_ifconfig;

c/src/lib/libbsp/m68k/mcf5329/include/bsp.h

@@ -5,10 +5,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 #include <rtems.h>
@@ -22,6 +18,10 @@ extern "C" {
 /**  Hardware data structure headers                                      **/
 #include <mcf532x/mcf532x.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef volatile unsigned char vuint8;
 typedef volatile unsigned short vuint16;
 typedef volatile unsigned long vuint32;

c/src/lib/libbsp/m68k/mrm332/include/bsp.h

@@ -15,10 +15,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -29,6 +25,10 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <mrm332.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CONSOLE_SCI
 
 /* externals */

c/src/lib/libbsp/m68k/mvme136/include/bsp.h

@@ -14,10 +14,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -26,6 +22,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/iosupp.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Constants */
 
 #define RAM_START 0

c/src/lib/libbsp/m68k/mvme147/include/bsp.h

@@ -17,10 +17,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -29,6 +25,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/iosupp.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Constants */
 
 #define RAM_START 0x00005000

c/src/lib/libbsp/m68k/mvme147s/include/bsp.h

@@ -17,10 +17,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -29,6 +25,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/iosupp.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Constants */
 
 #define RAM_START 0x00007000

c/src/lib/libbsp/m68k/mvme162/include/bsp.h

@@ -21,10 +21,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -35,6 +31,10 @@ extern "C" {
 
 #include <mvme16x_hw.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*----------------------------------------------------------------*/
 
 typedef volatile struct {

c/src/lib/libbsp/m68k/mvme167/include/bsp.h

@@ -22,10 +22,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -37,6 +33,10 @@ extern "C" {
 
 #include <mvme16x_hw.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* GCSR is in mvme16x_hw.h */
 /* LCSR is in mvme16x_hw.h */
 /* i82596 is in mvme16x_hw.h */

c/src/lib/libbsp/m68k/ods68302/include/bsp.h

@@ -17,10 +17,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <rtems/m68k/m68302.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef VARIANT
 #define VARIANT bare
 #endif

c/src/lib/libbsp/m68k/sim68000/include/bsp.h

@@ -14,10 +14,6 @@
 #ifndef __BSVC_SIM
 #define __BSVC_SIM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -26,6 +22,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Define some hardware constants here
  */

c/src/lib/libbsp/m68k/uC5282/include/bsp.h

@@ -14,10 +14,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -28,6 +24,10 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <rtems/bspIo.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***************************************************************************/
 /**  BSP Configuration                                                    **/
 /*

c/src/lib/libbsp/mips/csb350/include/bsp.h

@@ -17,10 +17,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <libcpu/au1x00.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 #define BSP_SHARED_HANDLER_SUPPORT      1
 

c/src/lib/libbsp/mips/genmongoosev/include/bsp.h

@@ -17,10 +17,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <bsp/mongoose-v.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 #define BSP_SHARED_HANDLER_SUPPORT      1
 

c/src/lib/libbsp/mips/hurricane/include/bsp.h

@@ -16,10 +16,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -29,6 +25,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <libcpu/rm5231.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void WriteDisplay( char * string );
 
 extern uint32_t mips_get_timer( void );

c/src/lib/libbsp/mips/jmr3904/include/bsp.h

@@ -17,10 +17,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -30,6 +26,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <libcpu/tx3904.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 #define BSP_SHARED_HANDLER_SUPPORT      1
 

c/src/lib/libbsp/mips/malta/include/bsp.h

@@ -19,10 +19,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -31,6 +27,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 #define BSP_SHARED_HANDLER_SUPPORT      1
 

c/src/lib/libbsp/mips/rbtx4925/include/bsp.h

@@ -18,10 +18,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -31,6 +27,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <libcpu/tx4925.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 #define BSP_SHARED_HANDLER_SUPPORT      1
 

c/src/lib/libbsp/mips/rbtx4938/include/bsp.h

@@ -18,10 +18,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -31,6 +27,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <libcpu/tx4938.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 #define BSP_SHARED_HANDLER_SUPPORT      1
 

c/src/lib/libbsp/moxie/moxiesim/include/bsp.h

@@ -15,10 +15,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 
 #include <rtems.h>
@@ -27,6 +23,10 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* support for simulated clock tick */
 Thread clock_driver_sim_idle_body(uintptr_t);
 #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body

c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h

@@ -15,10 +15,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
@@ -27,6 +23,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ============================================ */
 
 /* SOPC-specific Constants */

c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h

@@ -17,10 +17,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -28,6 +24,10 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* functions */
 
 rtems_isr_entry set_vector(                     /* returns old vector */

c/src/lib/libbsp/powerpc/gen5200/include/bsp.h

@@ -141,11 +141,6 @@ LINKER_SYMBOL(MBAR);
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 #include <rtems.h>
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
@@ -156,6 +151,10 @@ extern "C" {
 #include <bsp/u-boot.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Network driver configuration
  */

c/src/lib/libbsp/powerpc/haleakala/include/bsp.h

@@ -45,10 +45,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 
 #ifdef ASM
@@ -69,6 +65,10 @@ extern "C" {
   #include <bsp/vectors.h>
   #include <bsp/default-initial-extension.h>
 
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+
   /* Network Defines */
   #define RTEMS_BSP_NETWORK_DRIVER_NAME     "eth0"
 
@@ -83,10 +83,9 @@ extern "C" {
 
   #define BSP_UART_BAUD_BASE    (11059200 / 16)    /* Kilauea ext clock, max speed */
 
+  #ifdef __cplusplus
+  }
+  #endif
 #endif /* ASM */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* BSP_H */

c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h

@@ -15,10 +15,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -31,6 +27,10 @@ extern "C" {
 #include <mpc8xx/console.h>
 #include <bsp/vectors.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Representation of initialization data in NVRAM
  */