This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit f00c6d3047f256a12d0be05106e31fcb2e6f69d0 Author: Petro Karashchenko <[email protected]> AuthorDate: Mon Jul 31 20:43:16 2023 +0200 arch/arm: fix declaration of extern types Signed-off-by: Petro Karashchenko <[email protected]> --- arch/arm/src/am335x/am335x_gpio.h | 14 +++++++------- arch/arm/src/common/arm_internal.h | 4 ++-- arch/arm/src/kinetis/kinetis_usbhshost.h | 4 ++-- arch/arm/src/s32k1xx/s32k1xx_clockconfig.h | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/arm/src/am335x/am335x_gpio.h b/arch/arm/src/am335x/am335x_gpio.h index 3c54d55c7d..e510aff20a 100644 --- a/arch/arm/src/am335x/am335x_gpio.h +++ b/arch/arm/src/am335x/am335x_gpio.h @@ -165,13 +165,6 @@ typedef uint32_t gpio_pinset_t; * Public Data ****************************************************************************/ -/**************************************************************************** - * Inline Functions - ****************************************************************************/ - -extern const uintptr_t g_gpiobase[AM335X_GPIO_NPORTS]; -#define am335x_gpion_vbase(n) (g_gpiobase[(n)]) - #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" @@ -181,6 +174,13 @@ extern "C" #define EXTERN extern #endif +/**************************************************************************** + * Inline Functions + ****************************************************************************/ + +EXTERN const uintptr_t g_gpiobase[AM335X_GPIO_NPORTS]; +#define am335x_gpion_vbase(n) (g_gpiobase[(n)]) + /**************************************************************************** * Public Function Prototypes ****************************************************************************/ diff --git a/arch/arm/src/common/arm_internal.h b/arch/arm/src/common/arm_internal.h index 773650d5f2..7c625d847b 100644 --- a/arch/arm/src/common/arm_internal.h +++ b/arch/arm/src/common/arm_internal.h @@ -358,9 +358,9 @@ uintptr_t arm_intstack_top(void); #if defined(__ICCARM__) /* _vectors replaced on __vector_table for IAR C-SPY Simulator */ -extern const void *__vector_table[]; +EXTERN const void *__vector_table[]; #else -extern const void * const _vectors[]; +EXTERN const void * const _vectors[]; #endif /* Interrupt acknowledge and dispatch */ diff --git a/arch/arm/src/kinetis/kinetis_usbhshost.h b/arch/arm/src/kinetis/kinetis_usbhshost.h index 7640e88b6a..1cc48c882e 100644 --- a/arch/arm/src/kinetis/kinetis_usbhshost.h +++ b/arch/arm/src/kinetis/kinetis_usbhshost.h @@ -74,7 +74,7 @@ extern "C" * ****************************************************************************/ -extern void kinetis_usbhost_vbusdrive(int rhport, bool enable); +void kinetis_usbhost_vbusdrive(int rhport, bool enable); /**************************************************************************** * Name: kinetis_setup_overcurrent @@ -93,7 +93,7 @@ extern void kinetis_usbhost_vbusdrive(int rhport, bool enable); * ****************************************************************************/ -extern int kinetis_setup_overcurrent(xcpt_t handler, void *arg); +int kinetis_setup_overcurrent(xcpt_t handler, void *arg); /**************************************************************************** * Name: kinetis_ehci_initialize diff --git a/arch/arm/src/s32k1xx/s32k1xx_clockconfig.h b/arch/arm/src/s32k1xx/s32k1xx_clockconfig.h index 01cd3fd470..2719896aff 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_clockconfig.h +++ b/arch/arm/src/s32k1xx/s32k1xx_clockconfig.h @@ -86,8 +86,6 @@ * Public Types ****************************************************************************/ -extern const unsigned int num_of_peripheral_clocks_0; - /* Clock Configuration ******************************************************/ enum scg_system_clock_type_e @@ -456,10 +454,6 @@ enum scg_system_clock_mode_e #ifndef __ASSEMBLY__ -/**************************************************************************** - * Public Data - ****************************************************************************/ - #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" @@ -469,6 +463,12 @@ extern "C" #define EXTERN extern #endif +/**************************************************************************** + * Public Data + ****************************************************************************/ + +EXTERN const unsigned int num_of_peripheral_clocks_0; + /**************************************************************************** * Public Function Prototypes ****************************************************************************/
