From 46dde0fcefbff77eb814b3b0662cb01fb280d437 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 23 Oct 2014 10:05:17 +0200 Subject: 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 | 8 ++++---- c/src/lib/libbsp/arm/csb337/include/bsp.h | 8 ++++---- c/src/lib/libbsp/arm/edb7312/include/bsp.h | 8 ++++---- c/src/lib/libbsp/arm/gba/include/bsp.h | 8 ++++---- c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h | 8 ++++---- c/src/lib/libbsp/arm/gp32/include/bsp.h | 8 ++++---- c/src/lib/libbsp/arm/gumstix/include/bsp.h | 8 ++++---- c/src/lib/libbsp/arm/nds/include/bsp.h | 9 ++++----- c/src/lib/libbsp/arm/rtl22xx/include/bsp.h | 8 ++++---- c/src/lib/libbsp/avr/avrtest/include/bsp.h | 8 ++++---- c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h | 8 ++++---- c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h | 8 ++++---- c/src/lib/libbsp/bfin/eZKit533/include/bsp.h | 8 ++++---- c/src/lib/libbsp/h8300/h8sim/include/bsp.h | 8 ++++---- c/src/lib/libbsp/i386/pc386/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m32r/m32rsim/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/av5282/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/csb360/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/gen68302/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/gen68340/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h | 7 ++++--- c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mcf52235/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h | 10 +++++----- c/src/lib/libbsp/m68k/mcf5235/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mcf5329/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mrm332/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mvme147/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mvme147s/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mvme162/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mvme167/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/ods68302/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/sim68000/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/uC5282/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/csb350/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/genmongoosev/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/hurricane/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/jmr3904/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/malta/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/rbtx4925/include/bsp.h | 8 ++++---- c/src/lib/libbsp/mips/rbtx4938/include/bsp.h | 8 ++++---- c/src/lib/libbsp/moxie/moxiesim/include/bsp.h | 8 ++++---- c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h | 8 ++++---- c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h | 8 ++++---- c/src/lib/libbsp/powerpc/gen5200/include/bsp.h | 9 ++++----- c/src/lib/libbsp/powerpc/haleakala/include/bsp.h | 15 +++++++-------- c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h | 8 ++++---- c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h | 8 ++++---- c/src/lib/libbsp/powerpc/psim/include/bsp.h | 16 ++++++++-------- c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h | 8 ++++---- c/src/lib/libbsp/powerpc/score603e/include/bsp.h | 12 ++++++------ c/src/lib/libbsp/powerpc/ss555/include/bsp.h | 8 ++++---- c/src/lib/libbsp/powerpc/virtex/include/bsp.h | 12 ++++++------ c/src/lib/libbsp/powerpc/virtex4/include/bsp.h | 8 ++++---- c/src/lib/libbsp/powerpc/virtex5/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sh/gensh1/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sh/gensh2/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sh/gensh4/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sh/shsim/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sparc/erc32/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sparc/leon2/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sparc/leon3/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sparc64/niagara/include/bsp.h | 8 ++++---- c/src/lib/libbsp/sparc64/usiii/include/bsp.h | 8 ++++---- c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h | 8 ++++---- 68 files changed, 284 insertions(+), 286 deletions(-) diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/c/src/lib/libbsp/arm/csb336/include/bsp.h index c04a8457f5..c9ce435fa5 100644 --- a/c/src/lib/libbsp/arm/csb336/include/bsp.h +++ b/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 #include @@ -32,6 +28,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup arm_csb336 CSB336 Support * diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h index b752b00017..7374adfa86 100644 --- a/c/src/lib/libbsp/arm/csb337/include/bsp.h +++ b/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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup arm_csb337 CSB337 Support * diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h index 00e8d40b50..33a60306cd 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h +++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h @@ -18,10 +18,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION /** diff --git a/c/src/lib/libbsp/arm/gba/include/bsp.h b/c/src/lib/libbsp/arm/gba/include/bsp.h index 1b9f4808cb..f9cbbc4163 100644 --- a/c/src/lib/libbsp/arm/gba/include/bsp.h +++ b/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 #include @@ -32,6 +28,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION /** Define operation count for Tests */ diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h b/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h index bbb514ff9f..316041833d 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h +++ b/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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup arm_gdbarmsim GDBARMSIM Support * diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h index d2fa603840..4e1439aed8 100644 --- a/c/src/lib/libbsp/arm/gp32/include/bsp.h +++ b/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 #include @@ -29,6 +25,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define gp32_initButtons() {rPBCON=0x0;} diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/c/src/lib/libbsp/arm/gumstix/include/bsp.h index fec1ebb48a..80525a7ec4 100644 --- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h +++ b/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 #include @@ -26,6 +22,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup arm_gumstix Gumstix Support * @ingroup bsp_arm diff --git a/c/src/lib/libbsp/arm/nds/include/bsp.h b/c/src/lib/libbsp/arm/nds/include/bsp.h index a0bc5e1fa2..2f1d730bb7 100644 --- a/c/src/lib/libbsp/arm/nds/include/bsp.h +++ b/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 #include #include @@ -23,6 +18,10 @@ extern "C" #include #include +#ifdef __cplusplus +extern "C" { +#endif + struct rtems_bsdnet_ifconfig; int rtems_wifi_driver_attach (struct rtems_bsdnet_ifconfig *config, diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h index f6f8a15eaf..5908ed6ac3 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h +++ b/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 #include @@ -35,6 +31,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define CONFIG_ARM_CLK 60000000L diff --git a/c/src/lib/libbsp/avr/avrtest/include/bsp.h b/c/src/lib/libbsp/avr/avrtest/include/bsp.h index e4c1cca282..b64d59ccc5 100644 --- a/c/src/lib/libbsp/avr/avrtest/include/bsp.h +++ b/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 #include @@ -26,6 +22,10 @@ extern "C" { #include #include +#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 diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h index 6efc30ef40..e9063a291f 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h +++ b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h @@ -19,10 +19,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -33,6 +29,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup bfin_tll6527m TLL6527M Support * @ingroup bsp_bfin diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h index 4261c44163..578918dfcb 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h +++ b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h @@ -17,10 +17,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#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) diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h index 3eb0635856..b654d2d7b7 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h +++ b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h @@ -25,10 +25,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -38,6 +34,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup bfin_ezkit533 eZKit533 Support * @ingroup bsp_bfin diff --git a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h index 61f0d2e173..f21917917c 100644 --- a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h +++ b/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 #include @@ -33,6 +29,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup h8300_bsp Clock Tick Support * diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h index cefb726a93..21aa05484d 100644 --- a/c/src/lib/libbsp/i386/pc386/include/bsp.h +++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h @@ -49,10 +49,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -63,6 +59,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @degroup pc386_i386 PC386 Support * diff --git a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h b/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h index cad4580cfc..6c1509e04a 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h +++ b/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 #include @@ -34,6 +30,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup m32c_bsp Clock Tick Support * diff --git a/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h b/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h index 2ecea3b82c..26074f6868 100644 --- a/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h +++ b/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 #include @@ -34,6 +30,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup m32r_bsp Clock Tick Support * 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 #include @@ -41,6 +37,10 @@ extern "C" { /** Hardware data structure headers **/ #include /* 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 #include #include @@ -128,6 +124,10 @@ extern "C" { #include #include +#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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#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 #include @@ -40,6 +36,10 @@ extern "C" { #include #include +#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 #include @@ -43,6 +39,10 @@ extern "C" { #include #include +#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 #include @@ -79,6 +76,10 @@ extern "C" { /** Hardware data structure headers **/ #include +#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 #include #include @@ -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 #include #include @@ -22,6 +18,10 @@ extern "C" { /** Hardware data structure headers **/ #include +#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 #include #include @@ -23,7 +19,11 @@ extern "C" { /***************************************************************************/ /** Hardware data structure headers **/ #include - + +#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 #include #include @@ -22,6 +18,10 @@ extern "C" { /** Hardware data structure headers **/ #include /* 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 #include #include @@ -22,6 +18,10 @@ extern "C" { /** Hardware data structure headers **/ #include +#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 #include @@ -29,6 +25,10 @@ extern "C" { #include #include +#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 #include @@ -26,6 +22,10 @@ extern "C" { #include #include +#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 #include @@ -29,6 +25,10 @@ extern "C" { #include #include +#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 #include @@ -29,6 +25,10 @@ extern "C" { #include #include +#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 #include @@ -35,6 +31,10 @@ extern "C" { #include +#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 #include @@ -37,6 +33,10 @@ extern "C" { #include +#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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#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 #include @@ -26,6 +22,10 @@ extern "C" { #include #include +#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 #include @@ -28,6 +24,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /***************************************************************************/ /** BSP Configuration **/ /* diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/c/src/lib/libbsp/mips/csb350/include/bsp.h index 4c3b5ab38d..aeffce35bf 100644 --- a/c/src/lib/libbsp/mips/csb350/include/bsp.h +++ b/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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h index 06debfe921..a55162b44f 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h +++ b/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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/c/src/lib/libbsp/mips/hurricane/include/bsp.h index e297ba8788..5b4dab18fe 100644 --- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h +++ b/c/src/lib/libbsp/mips/hurricane/include/bsp.h @@ -16,10 +16,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -29,6 +25,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + extern void WriteDisplay( char * string ); extern uint32_t mips_get_timer( void ); diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h index 6c661ddbe0..3af8ccaf65 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h +++ b/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 #include @@ -30,6 +26,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 diff --git a/c/src/lib/libbsp/mips/malta/include/bsp.h b/c/src/lib/libbsp/mips/malta/include/bsp.h index 0d5b01540d..e99804c425 100644 --- a/c/src/lib/libbsp/mips/malta/include/bsp.h +++ b/c/src/lib/libbsp/mips/malta/include/bsp.h @@ -19,10 +19,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h index 1c380adb2a..58bdb5850a 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h +++ b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h @@ -18,10 +18,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h index df029b266a..090df017d6 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h +++ b/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h @@ -18,10 +18,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 diff --git a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h b/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h index a146936b2c..0bca5f0d94 100644 --- a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h +++ b/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 #include @@ -27,6 +23,10 @@ extern "C" { #include #include +#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 diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index 06c6526520..c87009d5a1 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/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 #include #include @@ -27,6 +23,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* ============================================ */ /* SOPC-specific Constants */ diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index c50700a3af..33620f8469 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h +++ b/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 #include @@ -28,6 +24,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* functions */ rtems_isr_entry set_vector( /* returns old vector */ 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 #include #include @@ -156,6 +151,10 @@ extern "C" { #include #include +#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 #ifdef ASM @@ -69,6 +65,10 @@ extern "C" { #include #include + #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 #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#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 #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#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 #ifdef ASM @@ -49,6 +45,10 @@ extern "C" { #include #include +#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 #include @@ -29,6 +25,10 @@ extern "C" { #include #include +#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 @@ -45,6 +41,10 @@ extern "C" { #include #include +#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 #include @@ -36,6 +32,10 @@ extern "C" { #include #include +#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 #ifdef ASM @@ -61,6 +57,10 @@ extern "C" { #include #include +#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 /* @@ -66,6 +62,10 @@ extern "C" { #include +#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 /* @@ -66,6 +62,10 @@ extern "C" { #include #include +#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/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h index 6f7c77b809..ced4967c93 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h @@ -25,10 +25,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include #include @@ -36,6 +32,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* EDIT: To activate the sci driver, change the define below */ #if 1 #include diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h index 5ef882a5bf..6ab35109d1 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h @@ -36,10 +36,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include #include @@ -51,6 +47,10 @@ extern "C" { #include +#ifdef __cplusplus +extern "C" { +#endif + #if 1 /* FIXME: * These definitions will be no longer necessary if the old diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h index a2b41d0e4d..e9d39a9ee8 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h @@ -40,10 +40,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include #include @@ -53,6 +49,10 @@ extern "C" { #include "rtems/score/sh7750_regs.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Constants */ /* diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h index bb8a4a5255..6e606b4e2e 100644 --- a/c/src/lib/libbsp/sh/shsim/include/bsp.h +++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h @@ -26,10 +26,6 @@ #ifndef ASM -#ifdef __cplusplus -extern "C" { -#endif - #include #include #include @@ -42,6 +38,10 @@ extern "C" { */ #include +#ifdef __cplusplus +extern "C" { +#endif + /* Constants */ Thread clock_driver_sim_idle_body(uintptr_t); diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h index 4406826c8a..33939106d8 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h +++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h @@ -25,10 +25,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -39,6 +35,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup sparc_erc32 ERC32 Support * diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h index 8cb92b8c3f..41a1e43629 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h @@ -28,10 +28,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -41,6 +37,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup sparc_leon2 LEON2 Support * diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h index dbd3a3dd1c..83510810df 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h @@ -28,10 +28,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -41,6 +37,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup sparc_leon3 LEON3 Support * diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h index 0710705bd1..7e5c5ee939 100644 --- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h @@ -19,10 +19,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -31,6 +27,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* support for simulated clock tick */ /* Thread clock_driver_sim_idle_body(uintptr_t); diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h index 9d5994af75..59f90a5bef 100644 --- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h @@ -21,10 +21,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -33,6 +29,10 @@ extern "C" { #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* support for simulated clock tick */ /* Thread clock_driver_sim_idle_body(uintptr_t); diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h b/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h index d1894dfb79..c0e5acf3aa 100644 --- a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h +++ b/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h @@ -15,10 +15,6 @@ #ifndef _BSP_H #define _BSP_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include @@ -27,6 +23,10 @@ extern "C" { #include #include +#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 -- cgit v1.2.3