From c0c776645dc5530ed3a0f6af28e74763b2bded6a Mon Sep 17 00:00:00 2001 From: Andrew Fernandes Date: Tue, 16 Jun 2015 15:41:05 -0400 Subject: [PATCH] Fix GCC compilation warnings. --- .../targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h | 2 +- .../targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h index c9b0123341..4ce34e15e1 100644 --- a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h +++ b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h @@ -45,7 +45,7 @@ __ASM ( " BNE loop\n\t"); } #elif defined ( __GNUC__ ) -static void __INLINE nrf_delay_us(uint32_t volatile number_of_us) +__INLINE static void nrf_delay_us(uint32_t volatile number_of_us) { do { diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c index 8e3e8c34c7..3dd0118a76 100755 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c @@ -29,7 +29,7 @@ static uint32_t serial_irq_ids[UART_NUM] = {0}; static uart_irq_handler irq_handler; -static uint32_t acceptedSpeeds[17][2] = {{1200, UART_BAUDRATE_BAUDRATE_Baud1200}, +static int acceptedSpeeds[17][2] = {{1200, UART_BAUDRATE_BAUDRATE_Baud1200}, {2400, UART_BAUDRATE_BAUDRATE_Baud2400}, {4800, UART_BAUDRATE_BAUDRATE_Baud4800}, {9600, UART_BAUDRATE_BAUDRATE_Baud9600},