bsps: Move extern "C" to not cover includes

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

20 files changed, 81 insertions, 80 deletions

diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h
index 6741fda635..007fc40faa 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h
+++ b/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;
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
index 7a18974475..12b2c906d0 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/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"
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
index e560c78a23..5e86dfeb38 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
+++ b/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
  *
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index e89f44573b..4f789d288b 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/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
  *
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
index cb9c1a3403..a6c6254eb9 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/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
  *
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
index e8ea67f602..d8187630cb 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ b/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                                         **/
 
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
index d11c34dca1..6c4dd9f7cb 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
+++ b/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!!! */
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
index fd3f85171d..f8073bc988 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
+++ b/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)
 
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
index e5701ed641..2d71dff1b3 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
+++ b/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)    
 
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
index 96355e276b..38eb68bc19 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
+++ b/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;
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
index 4ba7f0f39e..706583b0f6 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
+++ b/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;
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 15549a4efc..54f7ae37ac 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/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 */
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
index e699c09399..d99b87849a 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/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
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
index 5f842da8ba..33c86d58fc 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/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
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
index cf9b777674..71bd56bbdc 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ b/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
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
index 056cb1a2e7..c0d370f947 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/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 {
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
index f5429f6b78..b15462c01f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/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 */
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
index ae3699ac47..fa4daab526 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
+++ b/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
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
index aeb8ded548..fbfc37ce53 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/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
  */
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
index 23579f230a..3e646becd8 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
+++ b/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                                                    **/
 /*