bsps: Move extern "C" to not cover includes

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

11 files changed, 55 insertions, 57 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
index 08edee542e..d27c9c1b8c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
+++ b/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
  */
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
index 6f97c57891..e5fc4cebca 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
+++ b/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 */
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
index 704ab34aaa..153f7e4c6b 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
+++ b/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
  */
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
index a3511fdb5c..422817bf00 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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>
 
@@ -31,6 +27,10 @@ extern "C" {
 #include <bsp/irq.h>
 #include <bsp/vectors.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Board configuration registers
  */
diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h
index 53822d5617..2164800ef3 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h
@@ -30,10 +30,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 
 #ifdef ASM
@@ -49,6 +45,10 @@ extern "C" {
 #include <bsp/vectors.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Constants */
 
 /*
@@ -82,12 +82,12 @@ int rtems_ifsim_attach(struct rtems_bsdnet_ifconfig *ifcfg, int attaching);
 int BSP_disconnect_clock_handler(void);
 int BSP_connect_clock_handler(void);
 
-#endif /* ASM */
-
-#define BSP_HAS_NO_VME
-
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* ASM */
+
+#define BSP_HAS_NO_VME
+
 #endif
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h b/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h
index 4da204ac43..4a2bda9cfb 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h
@@ -17,10 +17,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/console.h>
 #include <rtems/clockdrv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Convert decrementer value to tenths of microseconds (used by shared timer
  *  driver).
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index dc78498a47..a98b5fb2c0 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -14,10 +14,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define BSP_ZERO_WORKSPACE_AUTOMATICALLY TRUE
 
 #include <bspopts.h>
@@ -45,6 +41,10 @@ extern "C" {
 #include <gen2.h>
 #include <bsp/irq.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * The following macro calculates the Baud constant. For the Z8530 chip.
  *
@@ -190,10 +190,10 @@ void PCI_bus_write(volatile uint32_t *_addr, uint32_t _data);
 int BSP_disconnect_clock_handler(void);
 int BSP_connect_clock_handler(void);
 
-#endif /* ASM */
-
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* ASM */
+
 #endif
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
index fbe0c56346..ce708b0791 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
@@ -21,10 +21,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -36,6 +32,10 @@ extern "C" {
 #include <libcpu/vectors.h>
 #include <bsp/irq.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Clock definitions
  */
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
index a1fbdd3bd8..b4a47dc4b7 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
@@ -41,10 +41,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 
 #ifdef ASM
@@ -61,6 +57,10 @@ extern "C" {
 #include <bsp/vectors.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BSP_FEATURE_IRQ_EXTENSION
 
 #define BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN
@@ -78,10 +78,10 @@ extern bool bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */
 extern xilTemac_driver_attach(struct rtems_bsdnet_ifconfig*, int );
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH xilTemac_driver_attach
 
-#endif /* ASM */
-
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* ASM */
+
 #endif
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
index 0b1e10632f..3090bda349 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
@@ -42,10 +42,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 
 /*
@@ -66,6 +62,10 @@ extern "C" {
 
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* miscellaneous stuff assumed to exist */
 extern bool bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */
 
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
index 6a7ef2915a..f690095a47 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
@@ -43,10 +43,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <bspopts.h>
 
 /*
@@ -66,6 +62,10 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* miscellaneous stuff assumed to exist */
 extern bool bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */