DongEun Koak / mbed-src

mbed library sources

Dependents:   Freedman_v2 Nucleo_i2c_OLED_BME280_copy

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 570:e6ed7264c56c, committed 2015-06-17

Comitter:
mbed_official
Date:
Wed Jun 17 08:15:08 2015 +0100
Parent:
569:18c5cf67e74d
Child:
571:1f7ee966c9ea
Commit message:
Synchronized with git revision a57d6f3d1d0446439d04220c04a225e4cd13fafb

Full URL: https://github.com/mbedmicro/mbed/commit/a57d6f3d1d0446439d04220c04a225e4cd13fafb/

Nordic - Fix GCC compilation warnings

Changed in this revision

targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h	Tue Jun 16 07:45:08 2015 +0100
+++ b/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h	Wed Jun 17 08:15:08 2015 +0100
@@ -45,7 +45,7 @@
        " 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 
     {

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c	Tue Jun 16 07:45:08 2015 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c	Wed Jun 17 08:15:08 2015 +0100
@@ -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},