From 4c61464ee7bec1e6526ecbabe215639b7679dda0 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 14 May 2014 15:44:33 +0100 Subject: [PATCH 01/13] all targets - gpio - NC guard - gpio init enables to set pin to NC, thus the rest of gpio HAL should not do any action if pin is set to NC. --- .../TARGET_Freescale/TARGET_K20D5M/gpio_api.c | 5 ++- .../TARGET_K20D5M/gpio_object.h | 4 +++ .../TARGET_Freescale/TARGET_KLXX/gpio_api.c | 14 +++++++-- .../TARGET_KLXX/gpio_object.h | 4 +++ .../hal/TARGET_Freescale/TARGET_KLXX/pinmap.c | 6 ++-- .../TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c | 5 +-- .../TARGET_K64F/gpio_object.h | 4 +++ .../TARGET_NORDIC/TARGET_NRF51822/gpio_api.c | 9 ++++-- .../TARGET_NRF51822/gpio_object.h | 4 +++ .../hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c | 31 +++++++++---------- .../TARGET_NXP/TARGET_LPC11U6X/gpio_object.h | 5 +++ .../hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c | 21 ++++++++----- .../TARGET_NXP/TARGET_LPC11UXX/gpio_object.h | 6 ++++ .../TARGET_LPC11XX_11CXX/gpio_api.c | 6 +++- .../TARGET_LPC11XX_11CXX/gpio_object.h | 4 +++ .../hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c | 14 ++++----- .../TARGET_NXP/TARGET_LPC13XX/gpio_object.h | 4 +++ .../hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c | 30 ++++++++---------- .../TARGET_NXP/TARGET_LPC15XX/gpio_object.h | 5 +++ .../hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC176X/gpio_object.h | 4 +++ .../hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC23XX/gpio_object.h | 4 +++ .../hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c | 16 +++++++--- .../TARGET_NXP/TARGET_LPC408X/gpio_object.h | 5 +++ .../hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c | 8 +++-- .../TARGET_NXP/TARGET_LPC43XX/gpio_object.h | 5 +++ .../hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c | 16 +++++++--- .../TARGET_NXP/TARGET_LPC81X/gpio_object.h | 6 ++++ .../TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c | 9 +++--- .../TARGET_DISCO_F051R8/gpio_object.h | 5 +++ .../TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c | 9 +++--- .../TARGET_DISCO_F100RB/gpio_object.h | 5 +++ .../TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c | 13 ++++---- .../TARGET_DISCO_F303VC/gpio_object.h | 5 +++ .../TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c | 10 +++--- .../TARGET_DISCO_F407VG/gpio_object.h | 4 +++ .../TARGET_NUCLEO_F030R8/gpio_api.c | 9 +++--- .../TARGET_NUCLEO_F030R8/gpio_object.h | 4 +++ .../TARGET_NUCLEO_F103RB/gpio_api.c | 7 +++-- .../TARGET_NUCLEO_F103RB/gpio_object.h | 4 +++ .../TARGET_NUCLEO_F302R8/gpio_api.c | 7 +++-- .../TARGET_NUCLEO_F302R8/gpio_object.h | 5 +++ .../TARGET_NUCLEO_F401RE/gpio_api.c | 7 +++-- .../TARGET_NUCLEO_F401RE/gpio_object.h | 4 +++ .../TARGET_NUCLEO_L053R8/gpio_api.c | 7 +++-- .../TARGET_NUCLEO_L053R8/gpio_object.h | 5 +++ .../TARGET_NUCLEO_L152RE/gpio_api.c | 8 ++--- .../TARGET_NUCLEO_L152RE/gpio_object.h | 4 +++ .../TARGET_STM/TARGET_STM32F3XX/gpio_api.c | 6 ++-- .../TARGET_STM/TARGET_STM32F3XX/gpio_object.h | 4 +++ .../TARGET_STM/TARGET_STM32F4XX/gpio_api.c | 11 +++++-- .../TARGET_STM/TARGET_STM32F4XX/gpio_object.h | 4 +++ 53 files changed, 294 insertions(+), 119 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c index 111340ba57..5daf354974 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c @@ -22,7 +22,7 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) + if(pin == (PinName)NC) return; obj->pin = pin; @@ -42,6 +42,9 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h index 58c9d4b096..cd9e6608f9 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h @@ -31,6 +31,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } else { @@ -39,6 +41,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c index 8341b5d029..bdcb54cbcc 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c @@ -22,7 +22,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == (PinName)NC) return; + if (pin == (PinName)NC) + return; obj->pin = pin; obj->mask = gpio_set(pin); @@ -41,8 +42,15 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h index 8f8d5eb595..bde8b15256 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h @@ -31,6 +31,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) *obj->reg_set = obj->mask; else @@ -38,6 +40,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c index 9bb5c3f220..9efe64843d 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c @@ -17,7 +17,8 @@ #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) return; + if (pin == (PinName)NC) + return; uint32_t port_n = (uint32_t)pin >> PORT_SHIFT; uint32_t pin_n = (uint32_t)(pin & 0x7C) >> 2; @@ -30,7 +31,8 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } + if (pin == (PinName)NC) + return; __IO uint32_t* pin_pcr = (__IO uint32_t*)(PORTA_BASE + pin); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c index ed2f1219b5..e9fa1fa86d 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c @@ -27,9 +27,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) { + if (pin == (PinName)NC) return; - } obj->pinName = pin; uint32_t port = pin >> GPIO_PORT_SHIFT; @@ -43,6 +42,8 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin_num = obj->pinName & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h index a1d3b611e9..6a5189040a 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h @@ -27,6 +27,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin = obj->pinName & 0xFF; @@ -34,6 +36,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin = obj->pinName & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c index 9804d8748c..b79bd6eb2b 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c @@ -17,10 +17,11 @@ #include "pinmap.h" void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; + if(pin == (PinName)NC) + return; obj->pin = pin; - obj->mask = (1ul<mask = (1ul << pin); obj->reg_set = &NRF_GPIO->OUTSET; obj->reg_clr = &NRF_GPIO->OUTCLR; @@ -33,6 +34,8 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; switch (direction) { case PIN_INPUT : NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) @@ -40,7 +43,7 @@ void gpio_dir(gpio_t *obj, PinDirection direction) { | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos); break; - case PIN_OUTPUT: + case PIN_OUTPUT: NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h index 8f8d5eb595..bde8b15256 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h @@ -31,6 +31,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) *obj->reg_set = obj->mask; else @@ -38,6 +40,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c index c0702ae982..89003d7dc4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c @@ -16,31 +16,21 @@ #include "gpio_api.h" #include "pinmap.h" -static int gpio_enabled = 0; - -static void gpio_enable(void) { - gpio_enabled = 1; - +uint32_t gpio_set(PinName pin) { /* Enable AHB clock to the GPIO and IOCON domain. */ LPC_SYSCON->SYSAHBCLKCTRL |= ((1 << 16) | (1 << 6)); -} - -uint32_t gpio_set(PinName pin) { - - if (!gpio_enabled) - gpio_enable(); - return (1UL << ((int)pin >> PIN_SHIFT & 0x1F)); } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; - + if (pin == (PinName)NC) + return; + obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)(pin >> PORT_SHIFT); - + obj->reg_set = &LPC_GPIO_PORT->SET[port]; obj->reg_clr = &LPC_GPIO_PORT->CLR[port]; obj->reg_in = &LPC_GPIO_PORT->PIN[port]; @@ -52,8 +42,15 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h index 8f8d5eb595..f458edb9b5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h @@ -31,6 +31,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) *obj->reg_set = obj->mask; else @@ -38,6 +41,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c index fc1120afde..0026dfe4ca 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c @@ -17,18 +17,16 @@ #include "pinmap.h" uint32_t gpio_set(PinName pin) { - int f = ((pin == P0_11) || - (pin == P0_12) || - (pin == P0_13) || - (pin == P0_14)) ? (1) : (0); - + int f = ((pin == P0_11) || (pin == P0_12) || + (pin == P0_13) || (pin == P0_14)) ? (1) : (0); pin_function(pin, f); return (1 << ((int)pin & 0x1F)); } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; + if (pin == (PinName)NC) + return; obj->pin = pin; obj->mask = gpio_set(pin); @@ -46,8 +44,15 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h index 8f8d5eb595..afef5d0f46 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h @@ -31,6 +31,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (pin == (PinName)NC) + return; + if (value) *obj->reg_set = obj->mask; else @@ -38,6 +41,9 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (pin == (PinName)NC) + return 0; + return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c index e899331579..f91ae52f8e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c @@ -35,7 +35,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; + if (pin == (PinName)NC) + return; obj->pin = pin; LPC_GPIO_TypeDef *port_reg = ((LPC_GPIO_TypeDef *) (LPC_GPIO0_BASE + (((pin & 0xF000) >> PORT_SHIFT) * 0x10000))); @@ -50,6 +51,9 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + int pin_number = ((obj->pin & 0x0F00) >> 8); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~(1 << pin_number); break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h index 2ece747074..ccac8dce10 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h @@ -28,6 +28,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; uint32_t pin_number = ((obj->pin & 0x0F00) >> 8); if (value) *obj->reg_write |= (1 << pin_number); @@ -36,6 +38,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return; return ((*obj->reg_mask_read) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c index fc1120afde..acdd9aceab 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c @@ -17,18 +17,16 @@ #include "pinmap.h" uint32_t gpio_set(PinName pin) { - int f = ((pin == P0_11) || - (pin == P0_12) || - (pin == P0_13) || - (pin == P0_14)) ? (1) : (0); - + int f = ((pin == P0_11) || (pin == P0_12) || + (pin == P0_13) || (pin == P0_14)) ? (1) : (0); pin_function(pin, f); - + return (1 << ((int)pin & 0x1F)); } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; + if (pin == (PinName)NC) + return; obj->pin = pin; obj->mask = gpio_set(pin); @@ -46,6 +44,8 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h index 8f8d5eb595..bde8b15256 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h @@ -31,6 +31,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) *obj->reg_set = obj->mask; else @@ -38,6 +40,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c index f16536b1e6..6e7a378444 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c @@ -16,26 +16,15 @@ #include "gpio_api.h" #include "pinmap.h" -static int gpio_enabled = 0; - -static void gpio_enable(void) { - gpio_enabled = 1; - - /* Enable AHB clock to the GPIO0/1/2 and IOCON domain. */ - LPC_SYSCON->SYSAHBCLKCTRL0 |= (0xFUL << 13); -} - uint32_t gpio_set(PinName pin) { - - if (!gpio_enabled) - gpio_enable(); - + LPC_SYSCON->SYSAHBCLKCTRL0 |= (0xFUL << 13); return (1UL << ((int)pin & 0x1f)); } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; - + if (pin == (PinName)NC) + return; + obj->pin = pin; obj->mask = gpio_set(pin); @@ -52,8 +41,15 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h index 8f8d5eb595..f458edb9b5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h @@ -31,6 +31,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) *obj->reg_set = obj->mask; else @@ -38,6 +41,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c index a3903a74fa..5bbfca3778 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c @@ -22,8 +22,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; - + if (pin == (PinName)NC) + return; obj->pin = pin; obj->mask = gpio_set(pin); @@ -39,6 +39,8 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h index 8f8d5eb595..bde8b15256 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h @@ -31,6 +31,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) *obj->reg_set = obj->mask; else @@ -38,6 +40,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c index b0c5a383bf..1e9ef6e99c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c @@ -25,8 +25,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; - + if (pin == (PinName)NC) + return; obj->pin = pin; obj->mask = gpio_set(pin); @@ -43,6 +43,8 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h index 8f8d5eb595..bde8b15256 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h @@ -31,6 +31,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) *obj->reg_set = obj->mask; else @@ -38,6 +40,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c index b855a42aac..1b79dbdbf4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c @@ -22,8 +22,9 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; - + if (pin == (PinName)NC) + return; + obj->pin = pin; obj->mask = gpio_set(pin); @@ -40,8 +41,15 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h index 8f8d5eb595..f458edb9b5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h @@ -31,6 +31,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) *obj->reg_set = obj->mask; else @@ -38,6 +41,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c index 54fe0a28ca..8ec9895b14 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c @@ -29,8 +29,9 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; - + if (pin == (PinName)NC) + return; + obj->pin = pin; obj->mask = gpio_set(pin); @@ -48,6 +49,9 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h index 8f8d5eb595..f458edb9b5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h @@ -31,6 +31,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) *obj->reg_set = obj->mask; else @@ -38,6 +41,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c index 631c92b887..7abd786d68 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c @@ -40,8 +40,9 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; - + if (pin == (PinName)NC) + return; + obj->pin = pin; obj->mask = gpio_set(pin); @@ -56,8 +57,15 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + if (obj->pin == (PinName)NC) + return; + switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h index 8f8d5eb595..0688da0ab9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h @@ -31,6 +31,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) *obj->reg_set = obj->mask; else @@ -38,6 +41,9 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; + return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c index 443c99f57b..24bd4d7866 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c @@ -33,16 +33,17 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; +uint32_t gpio_set(PinName pin) { + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h index ac414c2162..627efff9d0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h @@ -48,6 +48,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) { *obj->reg_set = obj->mask; } @@ -57,6 +60,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c index a9b81bce62..a58e4faf6f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c @@ -33,16 +33,17 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; +uint32_t gpio_set(PinName pin) { + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN_FLOATING, 0)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h index 84f8eb4d32..e784f466b4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h @@ -48,6 +48,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) { *obj->reg_set = obj->mask; } @@ -57,6 +60,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c index adcbf1f924..18ca26de89 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c @@ -33,23 +33,24 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; +uint32_t gpio_set(PinName pin) { + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); - + // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; - + // Fill GPIO object structure for future use obj->pin = pin; obj->mask = gpio_set(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h index 46fdf92515..15515cfeac 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h @@ -48,6 +48,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +59,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c index 4dd63ed069..1b4497ecc7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c @@ -34,17 +34,17 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; +uint32_t gpio_set(PinName pin) { + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; - + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); // Enable GPIO clock diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h index 15c1f77179..c8cf0aa398 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h @@ -48,6 +48,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } @@ -57,6 +59,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c index 443c99f57b..24bd4d7866 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c @@ -33,16 +33,17 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); -uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; +uint32_t gpio_set(PinName pin) { + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h index ac414c2162..fde4b94296 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h @@ -48,6 +48,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } @@ -57,6 +59,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c index 1bb7f79a34..2babb7a67f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c @@ -34,15 +34,16 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN_FLOATING, 0)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h index aa2a3f7b21..4bad4fcb3f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h @@ -48,6 +48,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +58,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c index 5686e79d03..18ca26de89 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c @@ -34,15 +34,16 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h index 46fdf92515..15515cfeac 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h @@ -48,6 +48,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +59,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c index 8a4f8cb4a3..2f44517db2 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c @@ -34,15 +34,16 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h index ebe377b942..8a258bee05 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h @@ -48,6 +48,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +58,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c index 7c2bf1d792..ceb238d89d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c @@ -34,15 +34,16 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h index 46fdf92515..15515cfeac 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h @@ -48,6 +48,9 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; + if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +59,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c index 5339743b60..059cc68b97 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c @@ -34,16 +34,16 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); - return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; - + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); // Enable GPIO clock diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h index c3ae5ac506..c1cb3a8b88 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h @@ -48,6 +48,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +58,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c index 5686e79d03..9a3a6705c6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c @@ -34,7 +34,8 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == NC) return 0; + if (pin == (PinName)NC) + return 0; pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); @@ -42,7 +43,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if (pin == NC) return; + if (pin == (PinName)NC) + return; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h index 46fdf92515..504b3c012b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h @@ -48,6 +48,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) { *obj->reg_set = obj->mask; } else { @@ -56,6 +58,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c index e9cc039333..768e9e7bba 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c @@ -27,7 +27,8 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == NC) return; + if (pin == (PinName)NC) + return; obj->pin = pin; obj->mask = gpio_set(pin); @@ -47,7 +48,11 @@ void gpio_mode(gpio_t *obj, PinMode mode) { void gpio_dir(gpio_t *obj, PinDirection direction) { switch (direction) { - case PIN_INPUT : pin_function(obj->pin, STM_PIN_DATA(0, 0)); break; - case PIN_OUTPUT: pin_function(obj->pin, STM_PIN_DATA(1, 0)); break; + case PIN_INPUT : + pin_function(obj->pin, STM_PIN_DATA(0, 0)); + break; + case PIN_OUTPUT: + pin_function(obj->pin, STM_PIN_DATA(1, 0)); + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h index caaef02439..23c6ad8e51 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h @@ -32,6 +32,8 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { + if (obj->pin == (PinName)NC) + return; if (value) *obj->reg_set = obj->mask; else @@ -39,6 +41,8 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { + if (obj->pin == (PinName)NC) + return 0; return ((*obj->reg_in & obj->mask) ? 1 : 0); } From 09fe00f0417fc6b36f8c83769d1cfb164296c5dc Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Thu, 15 May 2014 15:30:14 +0100 Subject: [PATCH 02/13] gpio and pinmap - asserts for NC as parameters (not init), abort retarget - retarget - abort - calls mbed_die - asserts added to gpio mbed hal for all targets --- libraries/mbed/common/pinmap_common.c | 12 +++-- libraries/mbed/common/retarget.cpp | 7 +++ .../TARGET_Freescale/TARGET_K20D5M/gpio_api.c | 10 ++-- .../TARGET_K20D5M/gpio_object.h | 8 +-- .../TARGET_Freescale/TARGET_K20D5M/pinmap.c | 8 ++- .../TARGET_Freescale/TARGET_KLXX/gpio_api.c | 8 +-- .../TARGET_KLXX/gpio_object.h | 8 +-- .../hal/TARGET_Freescale/TARGET_KLXX/pinmap.c | 8 ++- .../TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c | 7 +-- .../TARGET_K64F/gpio_object.h | 7 ++- .../TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c | 11 ++-- .../TARGET_NORDIC/TARGET_NRF51822/gpio_api.c | 16 +++--- .../TARGET_NRF51822/gpio_object.h | 8 +-- .../TARGET_NORDIC/TARGET_NRF51822/pinmap.c | 5 +- .../hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c | 8 +-- .../TARGET_NXP/TARGET_LPC11U6X/gpio_object.h | 9 ++-- .../hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c | 13 ++--- .../hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c | 8 +-- .../TARGET_NXP/TARGET_LPC11UXX/gpio_object.h | 10 ++-- .../hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c | 13 ++--- .../TARGET_LPC11XX_11CXX/gpio_api.c | 20 ++++--- .../TARGET_LPC11XX_11CXX/gpio_object.h | 8 +-- .../TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c | 9 ++-- .../hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c | 15 ++++-- .../TARGET_NXP/TARGET_LPC13XX/gpio_object.h | 8 +-- .../hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c | 5 +- .../hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c | 8 +-- .../TARGET_NXP/TARGET_LPC15XX/gpio_object.h | 8 +-- .../hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c | 3 +- .../hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c | 19 ++++--- .../TARGET_NXP/TARGET_LPC176X/gpio_object.h | 8 +-- .../hal/TARGET_NXP/TARGET_LPC176X/pinmap.c | 7 +-- .../hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c | 1 + .../TARGET_NXP/TARGET_LPC23XX/gpio_object.h | 8 +-- .../hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c | 11 ++-- .../hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC408X/gpio_object.h | 9 ++-- .../hal/TARGET_NXP/TARGET_LPC408X/pinmap.c | 6 +-- .../hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c | 16 +++--- .../TARGET_NXP/TARGET_LPC43XX/gpio_object.h | 9 ++-- .../hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c | 7 ++- .../hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c | 7 ++- .../TARGET_NXP/TARGET_LPC81X/gpio_object.h | 10 ++-- .../hal/TARGET_NXP/TARGET_LPC81X/pinmap.c | 5 +- .../TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c | 7 +-- .../TARGET_DISCO_F051R8/gpio_object.h | 8 ++- .../TARGET_STM/TARGET_DISCO_F051R8/pinmap.c | 12 ++--- .../TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c | 7 +-- .../TARGET_DISCO_F100RB/gpio_object.h | 1 + .../TARGET_STM/TARGET_DISCO_F100RB/pinmap.c | 52 +++++++++---------- .../TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c | 7 +-- .../TARGET_DISCO_F303VC/gpio_object.h | 8 ++- .../TARGET_STM/TARGET_DISCO_F303VC/pinmap.c | 10 ++-- .../TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c | 7 +-- .../TARGET_DISCO_F407VG/gpio_object.h | 7 ++- .../TARGET_STM/TARGET_DISCO_F407VG/pinmap.c | 14 ++--- .../TARGET_NUCLEO_F030R8/gpio_api.c | 7 +-- .../TARGET_NUCLEO_F030R8/gpio_object.h | 7 ++- .../TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c | 7 +-- .../TARGET_NUCLEO_F103RB/gpio_api.c | 7 +-- .../TARGET_NUCLEO_F103RB/gpio_object.h | 7 ++- .../TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c | 7 ++- .../TARGET_NUCLEO_F302R8/gpio_api.c | 7 +-- .../TARGET_NUCLEO_F302R8/gpio_object.h | 8 ++- .../TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c | 10 ++-- .../TARGET_NUCLEO_F401RE/gpio_api.c | 7 +-- .../TARGET_NUCLEO_F401RE/gpio_object.h | 7 ++- .../TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c | 10 ++-- .../TARGET_NUCLEO_L053R8/gpio_api.c | 7 +-- .../TARGET_NUCLEO_L053R8/gpio_object.h | 8 ++- .../TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c | 10 ++-- .../TARGET_NUCLEO_L152RE/gpio_api.c | 7 +-- .../TARGET_NUCLEO_L152RE/gpio_object.h | 7 ++- .../TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c | 8 +-- .../TARGET_STM/TARGET_STM32F3XX/gpio_api.c | 7 +-- .../TARGET_STM/TARGET_STM32F3XX/gpio_object.h | 7 ++- .../hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c | 8 +-- .../TARGET_STM/TARGET_STM32F4XX/gpio_api.c | 5 +- .../TARGET_STM/TARGET_STM32F4XX/gpio_object.h | 8 +-- .../hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c | 5 +- 80 files changed, 366 insertions(+), 350 deletions(-) diff --git a/libraries/mbed/common/pinmap_common.c b/libraries/mbed/common/pinmap_common.c index eef617fd45..3dc4433176 100644 --- a/libraries/mbed/common/pinmap_common.c +++ b/libraries/mbed/common/pinmap_common.c @@ -17,7 +17,8 @@ #include "error.h" void pinmap_pinout(PinName pin, const PinMap *map) { - if (pin == NC) return; + if (pin == NC) + return; while (map->pin != NC) { if (map->pin == pin) { @@ -33,11 +34,14 @@ void pinmap_pinout(PinName pin, const PinMap *map) { uint32_t pinmap_merge(uint32_t a, uint32_t b) { // both are the same (inc both NC) - if (a == b) return a; + if (a == b) + return a; // one (or both) is not connected - if (a == (uint32_t)NC) return b; - if (b == (uint32_t)NC) return a; + if (a == (uint32_t)NC) + return b; + if (b == (uint32_t)NC) + return a; // mis-match error case error("pinmap mis-match"); diff --git a/libraries/mbed/common/retarget.cpp b/libraries/mbed/common/retarget.cpp index 35a815916c..cfc3f1d274 100644 --- a/libraries/mbed/common/retarget.cpp +++ b/libraries/mbed/common/retarget.cpp @@ -396,6 +396,13 @@ extern "C" WEAK void __cxa_pure_virtual(void) { #endif +#include "mbed_interface.h" + +extern "C" void abort(void) { + mbed_die(); + while(1); +} + // **************************************************************************** // mbed_main is a function that is called before main() // mbed_sdk_init() is also a function that is called before main(), but unlike diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c index 5daf354974..70671ed002 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c @@ -13,19 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); pin_function(pin, 1); return 1 << ((pin & 0x7F) >> 2); } void gpio_init(gpio_t *obj, PinName pin) { - if(pin == (PinName)NC) + obj->pin = pin; + if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)pin >> PORT_SHIFT; @@ -42,9 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h index cd9e6608f9..35923ebd1f 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -41,8 +42,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c index 9adef24d09..a7a0be9297 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" -#include "error.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) - return; + assert(pin != (PinName)NC); uint32_t port_n = (uint32_t)pin >> PORT_SHIFT; uint32_t pin_n = (uint32_t)(pin & 0x7C) >> 2; @@ -31,8 +30,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } - + assert(pin != (PinName)NC); __IO uint32_t* pin_pcr = (__IO uint32_t*)(PORTA_BASE + pin); // pin pullup bits: [1:0] -> 11 = (0x3) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c index bdcb54cbcc..add01e1216 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c @@ -13,19 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); pin_function(pin, 1); return 1 << ((pin & 0x7F) >> 2); } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)pin >> PORT_SHIFT; @@ -42,9 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h index bde8b15256..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -40,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c index 9efe64843d..36ff078d93 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" -#include "error.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) - return; + assert(pin != (PinName)NC); uint32_t port_n = (uint32_t)pin >> PORT_SHIFT; uint32_t pin_n = (uint32_t)(pin & 0x7C) >> 2; @@ -31,8 +30,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) - return; + assert(pin != (PinName)NC); __IO uint32_t* pin_pcr = (__IO uint32_t*)(PORTA_BASE + pin); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c index e9fa1fa86d..909bd6198d 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" #include "fsl_port_hal.h" @@ -20,6 +21,7 @@ #include "fsl_sim_hal.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); uint32_t pin_num = pin & 0xFF; pin_function(pin, (int)kPortMuxAsGpio); @@ -27,10 +29,10 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pinName = pin; if (pin == (PinName)NC) return; - obj->pinName = pin; uint32_t port = pin >> GPIO_PORT_SHIFT; uint32_t pin_num = pin & 0xFF; clock_hal_set_gate(kSimClockModulePORT, port, true); @@ -42,8 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pinName != (PinName)NC); uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin_num = obj->pinName & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h index 6a5189040a..94db08ea1e 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h @@ -16,6 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "fsl_gpio_hal.h" #ifdef __cplusplus @@ -27,8 +28,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pinName != (PinName)NC); uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin = obj->pinName & 0xFF; @@ -36,8 +36,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pinName != (PinName)NC); uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin = obj->pinName & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c index f03db67a9f..db0b212baf 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c @@ -13,25 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" #include "fsl_clock_manager.h" #include "fsl_port_hal.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) { - return; - } - + assert(pin != (PinName)NC); clock_manager_set_gate(kClockModulePORT, pin >> GPIO_PORT_SHIFT, true); port_hal_mux_control(pin >> GPIO_PORT_SHIFT, pin & 0xFF, (port_mux_t)function); } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { - return; - } - + assert(pin != (PinName)NC); uint32_t instance = pin >> GPIO_PORT_SHIFT; uint32_t pinName = pin & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c index b79bd6eb2b..82bece68fd 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" void gpio_init(gpio_t *obj, PinName pin) { - if(pin == (PinName)NC) + obj->pin = pin; + if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = (1ul << pin); obj->reg_set = &NRF_GPIO->OUTSET; @@ -34,22 +35,21 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : - NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) + NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos); - break; + break; case PIN_OUTPUT: - NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) + NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos); - break; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h index bde8b15256..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -40,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c index 2c63ac2fa3..3a9eb37545 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" @@ -20,10 +21,10 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; NRF_GPIO->PIN_CNF[pin_number] &= ~GPIO_PIN_CNF_PULL_Msk; - NRF_GPIO->PIN_CNF[pin_number] |= (mode<PIN_CNF[pin_number] |= (mode << GPIO_PIN_CNF_PULL_Pos); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c index 89003d7dc4..0361f2b99f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c @@ -13,20 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); /* Enable AHB clock to the GPIO and IOCON domain. */ LPC_SYSCON->SYSAHBCLKCTRL |= ((1 << 16) | (1 << 6)); return (1UL << ((int)pin >> PIN_SHIFT & 0x1F)); } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)(pin >> PORT_SHIFT); @@ -42,9 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h index f458edb9b5..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,9 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c index d6628be206..8142396fc0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c @@ -13,15 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (uint32_t)NC) - { - return; - } - + assert(pin != (PinName)NC); __IO uint32_t *reg = (__IO uint32_t*)(LPC_IOCON_BASE + (pin & 0x1FF)); // pin function bits: [2:0] -> 111 = (0x7) @@ -29,11 +26,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) - { - return; - } - + assert(pin != (PinName)NC); if ((pin == P0_4) || (pin == P0_5)) { // The true open-drain pins PIO0_4 and PIO0_5 can be configured for different I2C-bus speeds. return; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c index 0026dfe4ca..00ae42d82a 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); int f = ((pin == P0_11) || (pin == P0_12) || (pin == P0_13) || (pin == P0_14)) ? (1) : (0); pin_function(pin, f); @@ -25,10 +27,10 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)pin >> PORT_SHIFT; @@ -44,9 +46,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h index afef5d0f46..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,9 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,9 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (pin == (PinName)NC) - return 0; - + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c index d7a157a1df..c431a9a12e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" @@ -20,27 +21,27 @@ #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60) void pin_function(PinName pin, int function) { + assert(pin != (PinName)NC); if (pin == (PinName)NC) return; uint32_t pin_number = (uint32_t)pin; __IO uint32_t *reg = (pin_number < 32) ? - (__IO uint32_t*)(LPC_IOCON0_BASE + 4 * pin_number) : - (__IO uint32_t*)(LPC_IOCON1_BASE + 4 * (pin_number - 32)); + (__IO uint32_t*)(LPC_IOCON0_BASE + 4 * pin_number) : + (__IO uint32_t*)(LPC_IOCON1_BASE + 4 * (pin_number - 32)); // pin function bits: [2:0] -> 111 = (0x7) *reg = (*reg & ~0x7) | (function & 0x7); } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } - + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; __IO uint32_t *reg = (pin_number < 32) ? - (__IO uint32_t*)(LPC_IOCON0_BASE + 4 * pin_number) : - (__IO uint32_t*)(LPC_IOCON1_BASE + 4 * (pin_number - 32)); + (__IO uint32_t*)(LPC_IOCON0_BASE + 4 * pin_number) : + (__IO uint32_t*)(LPC_IOCON1_BASE + 4 * (pin_number - 32)); uint32_t tmp = *reg; // pin mode bits: [4:3] -> 11000 = (0x3 << 3) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c index f91ae52f8e..b695978ea1 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" #include "reserved_pins.h" @@ -20,25 +21,26 @@ static const PinName reserved_pins[] = TARGET_RESERVED_PINS; uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); // PIO default value of following ports are not same as others unsigned i; int f = 0; - for (i = 0; i < sizeof(reserved_pins) / sizeof(PinName); i ++) + for (i = 0; i < sizeof(reserved_pins) / sizeof(PinName); i ++) { if (pin == reserved_pins[i]) { f = 1; break; } - + } pin_function(pin, f); return ((pin & 0x0F00) >> 8); } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; LPC_GPIO_TypeDef *port_reg = ((LPC_GPIO_TypeDef *) (LPC_GPIO0_BASE + (((pin & 0xF000) >> PORT_SHIFT) * 0x10000))); obj->reg_mask_read = &port_reg->MASKED_ACCESS[1 << gpio_set(pin)]; @@ -51,12 +53,14 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); int pin_number = ((obj->pin & 0x0F00) >> 8); switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~(1 << pin_number); break; - case PIN_OUTPUT: *obj->reg_dir |= (1 << pin_number); break; + case PIN_INPUT : + *obj->reg_dir &= ~(1 << pin_number); + break; + case PIN_OUTPUT: + *obj->reg_dir |= (1 << pin_number); + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h index ccac8dce10..71a8ce10e2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -28,8 +30,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); uint32_t pin_number = ((obj->pin & 0x0F00) >> 8); if (value) *obj->reg_write |= (1 << pin_number); @@ -38,8 +39,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); return ((*obj->reg_mask_read) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c index 8006ca18f1..a20eba6e02 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (uint32_t)NC) return; - + assert(pin != (PinName)NC); uint32_t offset = (uint32_t)pin & 0xff; __IO uint32_t *reg = (__IO uint32_t*)(LPC_IOCON_BASE + offset); @@ -27,10 +27,9 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) { return; } - + assert(pin != (PinName)NC); uint32_t offset = (uint32_t)pin & 0xff; - uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; + uint32_t drain = ((uint32_t)mode & (uint32_t)OpenDrain) >> 2; __IO uint32_t *reg = (__IO uint32_t*)(LPC_IOCON_BASE + offset); uint32_t tmp = *reg; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c index acdd9aceab..09f67a6cb2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); int f = ((pin == P0_11) || (pin == P0_12) || (pin == P0_13) || (pin == P0_14)) ? (1) : (0); pin_function(pin, f); @@ -25,10 +27,10 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)pin >> PORT_SHIFT; @@ -44,10 +46,13 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h index bde8b15256..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -40,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c index 4e2445c658..c28c675938 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" @@ -20,7 +21,7 @@ #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60) void pin_function(PinName pin, int function) { - if (pin == (uint32_t)NC) return; + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; @@ -33,7 +34,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) { return; } + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c index 6e7a378444..94479a4359 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c @@ -13,19 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); LPC_SYSCON->SYSAHBCLKCTRL0 |= (0xFUL << 13); return (1UL << ((int)pin & 0x1f)); } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); unsigned int port = (unsigned int)(pin >> 5); @@ -41,9 +43,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h index f458edb9b5..b0eabec850 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; @@ -41,8 +42,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c index d39c6912dc..5592282829 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" @@ -20,7 +21,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) { return; } + assert(pin != (PinName)NC); if ((pin == P0_22) || (pin == P0_23)) { // The true open-drain pins PIO0_22 and PIO0_23 can be configured for different I2C-bus speeds. diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c index 5bbfca3778..dd34db71da 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c @@ -13,21 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); pin_function(pin, 0); return (1 << ((int)pin & 0x1F)); } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; + obj->mask = gpio_set(pin); - - LPC_GPIO_TypeDef *port_reg = (LPC_GPIO_TypeDef *) ((int)pin & ~0x1F); + LPC_GPIO_TypeDef *port_reg = (LPC_GPIO_TypeDef *)((int)pin & ~0x1F); obj->reg_set = &port_reg->FIOSET; obj->reg_clr = &port_reg->FIOCLR; obj->reg_in = &port_reg->FIOPIN; @@ -39,10 +41,13 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h index bde8b15256..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -40,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c index be017ce181..1600a5fe5d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) return; - + assert(pin != (PinName)NC); + uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 4; int offset = (pin_number & 0xF) << 1; @@ -28,7 +29,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c index 1e9ef6e99c..ada9c74615 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h index bde8b15256..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,8 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -40,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c index 84173661c9..ef1ed3752c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) return; + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 4; @@ -28,15 +29,13 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } - + assert((pin != (PinName)NC) && (mode != OpenDrain)); + uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 5; int offset = pin_number & 0x1F; uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; - - if (mode == OpenDrain) error("OpenDrain not supported on LPC2368"); - + if (!drain) { index = pin_number >> 4; offset = (pin_number & 0xF) << 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c index 1b79dbdbf4..012b5b256b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c @@ -13,19 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); pin_function(pin, 0); return (1 << ((int)pin & 0x1F)); } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); LPC_GPIO_TypeDef *port_reg = (LPC_GPIO_TypeDef *) ((int)(LPC_GPIO0_BASE+pin) & ~0x1F); @@ -41,8 +43,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h index f458edb9b5..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,9 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c index d2e277ba9e..6b3a49defb 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (PinName)NC) return; - + assert(pin != (PinName)NC); __IO uint32_t *reg = (__IO uint32_t*) (LPC_IOCON_BASE + 4 * pin); // pin function bits: [2:0] -> 111 = (0x7) @@ -26,7 +26,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (PinName)NC) { return; } + assert(pin != (PinName)NC); uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c index 8ec9895b14..c2706befd9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c @@ -15,10 +15,12 @@ * * Ported to NXP LPC43XX by Micromint USA */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); int f = 0; unsigned int port = (unsigned int)MBED_GPIO_PORT(pin); @@ -29,10 +31,10 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); LPC_GPIO_T *port_reg = (LPC_GPIO_T *) (LPC_GPIO_PORT_BASE); @@ -49,11 +51,13 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); switch (direction) { - case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break; - case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break; + case PIN_INPUT : + *obj->reg_dir &= ~obj->mask; + break; + case PIN_OUTPUT: + *obj->reg_dir |= obj->mask; + break; } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h index f458edb9b5..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,9 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,8 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c index f55ec37505..14a04f27e8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c @@ -15,11 +15,12 @@ * * Ported to NXP LPC43XX by Micromint USA */ +#include #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - if (pin == (uint32_t)NC) return; + assert(pin != (PinName)NC); __IO uint32_t *reg = (__IO uint32_t*) MBED_SCU_REG(pin); @@ -28,9 +29,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) { return; } - - if (mode == OpenDrain) error("OpenDrain not supported on LPC43XX"); + assert((pin != (PinName)NC) && (mode == OpenDrain)); __IO uint32_t *reg = (__IO uint32_t*) MBED_SCU_REG(pin); uint32_t tmp = *reg; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c index 7abd786d68..06e311fe5e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" @@ -40,10 +41,10 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_set = &LPC_GPIO_PORT->SET0; @@ -57,9 +58,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h index 0688da0ab9..e6bb82e4d4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -31,9 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,9 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; - + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c index d8ac966d46..0a3c9be761 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" @@ -30,8 +31,8 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) { return; } - + assert(pin != (PinName)NC); + if ((pin == 10) || (pin == 11)) { // True open-drain pins can be configured for different I2C-bus speeds return; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c index 24bd4d7866..bcaf274239 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h index 627efff9d0..9a5b49c92a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,9 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -60,8 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c index 3f2812695e..cfe5388bdb 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "device.h" #include "pinmap.h" #include "error.h" @@ -66,8 +67,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t otype = STM_PIN_OTYPE(data); @@ -104,15 +104,14 @@ void pin_function(PinName pin, int data) { //} //if ((pin == PA_15) || (pin == PB_3) || (pin == PB_4)) { // - //} + //} } /** * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; - + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -122,7 +121,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c index a58e4faf6f..72ca82b0de 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN_FLOATING, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_Out_PP, 0)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h index e784f466b4..f338e08ae9 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c index e82f85b1cc..3cc0ca7db5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "device.h" #include "pinmap.h" #include "error.h" @@ -75,8 +76,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (input, output, alternate function or analog) + output speed + AF */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t afnum = STM_PIN_AFNUM(data); @@ -111,17 +111,16 @@ void pin_function(PinName pin, int data) { } if ((pin == PA_15) || (pin == PB_3) || (pin == PB_4)) { GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE); - } + } } /** * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { + assert(pin != (PinName)NC); GPIO_InitTypeDef GPIO_InitStructure; - if (pin == NC) return; - uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -131,32 +130,31 @@ void pin_mode(PinName pin, PinMode mode) { // Configure open-drain and pull-up/down switch (mode) { - case PullNone: - return; - case PullUp: - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; - break; - case PullDown: - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD; - break; - case OpenDrain: - if (pin_index < 8) { - if ((gpio->CRL & (0x03 << (pin_index * 4))) > 0) { // MODE bits = Output mode - gpio->CRL |= (0x04 << (pin_index * 4)); // Set open-drain + case PullNone: + return; + case PullUp: + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; + break; + case PullDown: + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD; + break; + case OpenDrain: + if (pin_index < 8) { + if ((gpio->CRL & (0x03 << (pin_index * 4))) > 0) { // MODE bits = Output mode + gpio->CRL |= (0x04 << (pin_index * 4)); // Set open-drain + } + } else { + if ((gpio->CRH & (0x03 << ((pin_index % 8) * 4))) > 0) { // MODE bits = Output mode + gpio->CRH |= (0x04 << ((pin_index % 8) * 4)); // Set open-drain + } } - } - else { - if ((gpio->CRH & (0x03 << ((pin_index % 8) * 4))) > 0) { // MODE bits = Output mode - gpio->CRH |= (0x04 << ((pin_index % 8) * 4)); // Set open-drain - } - } - return; - default: - break; + return; + default: + break; } // Configure GPIO GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_Init(gpio, &GPIO_InitStructure); + GPIO_Init(gpio, &GPIO_InitStructure); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c index 18ca26de89..7b80aecca5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h index 15515cfeac..65d1f43622 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,9 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -59,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c index 65addc0801..5dca9319e5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "device.h" #include "pinmap.h" #include "error.h" @@ -71,7 +72,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -108,14 +109,14 @@ void pin_function(PinName pin, int data) { //} //if ((pin == PA_15) || (pin == PB_3) || (pin == PB_4)) { // - //} + //} } /** * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -126,7 +127,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c index 1b4497ecc7..cd9a69092e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,14 +36,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; uint32_t port_index = STM_PORT(pin); @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRRL; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h index c8cf0aa398..8b3f175963 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,8 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -59,8 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c index b88ddeda79..1627bc6aaa 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "device.h" #include "pinmap.h" #include "error.h" @@ -74,7 +75,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { break; default: error("Pinmap error: wrong port number."); - break; + break; } return gpio_add; } @@ -83,8 +84,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t pupd = STM_PIN_PUPD(data); @@ -113,15 +113,14 @@ void pin_function(PinName pin, int data) { //} //if ((pin == PA_15) || (pin == PB_3) || (pin == PB_4)) { // - //} + //} } /** * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; - + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -131,7 +130,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c index 24bd4d7866..1810771f82 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h index fde4b94296..9a5b49c92a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,8 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -59,8 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c index c4f21316b1..dae9a3bfc7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -66,7 +67,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -104,14 +105,14 @@ void pin_function(PinName pin, int data) { //} //if ((pin == PA_15) || (pin == PB_3) || (pin == PB_4)) { // - //} + //} } /** * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c index 2babb7a67f..9c388a98f8 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN_FLOATING, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_Out_PP, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h index 4bad4fcb3f..c92e88ec3d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,8 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c index 58b6de14f3..edb828259d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -77,8 +78,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (input, output, alternate function or analog) + output speed + AF */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t afnum = STM_PIN_AFNUM(data); @@ -120,10 +120,9 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { + assert(pin != (PinName)NC); GPIO_InitTypeDef GPIO_InitStructure; - if (pin == NC) return; - uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c index 18ca26de89..7b80aecca5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h index 15515cfeac..65d1f43622 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,9 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -59,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c index 3cd9a2103a..05720d7568 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -67,8 +68,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t otype = STM_PIN_OTYPE(data); @@ -111,8 +111,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; - + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -122,7 +121,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c index 2f44517db2..606f35d293 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRRL; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h index 8a258bee05..26e9150df1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,8 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c index 53fe5ab305..280b5d2757 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -82,8 +83,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t pupd = STM_PIN_PUPD(data); @@ -119,8 +119,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; - + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -130,7 +129,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c index ceb238d89d..87eb705842 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -52,7 +53,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -64,6 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h index 15515cfeac..65d1f43622 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,9 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -59,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c index 5024f4ba7a..b58c7ceb61 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -82,8 +83,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; - + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t pupd = STM_PIN_PUPD(data); @@ -119,8 +119,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; - + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -130,7 +129,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPD0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c index 059cc68b97..d106d3cc23 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,14 +35,14 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; uint32_t port_index = STM_PORT(pin); @@ -51,7 +52,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRRL; @@ -63,6 +63,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h index c1cb3a8b88..0e41836794 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,8 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c index 715f165286..3d1e396579 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -66,7 +67,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -110,7 +111,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -121,7 +122,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c index 9a3a6705c6..6ed13d35b0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -34,8 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - if (pin == (PinName)NC) - return 0; + assert(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); @@ -43,6 +43,7 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; @@ -53,7 +54,6 @@ void gpio_init(gpio_t *obj, PinName pin) { GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use - obj->pin = pin; obj->mask = gpio_set(pin); obj->reg_in = &gpio->IDR; obj->reg_set = &gpio->BSRR; @@ -65,6 +65,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h index 504b3c012b..65d1f43622 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h @@ -30,6 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -48,8 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,8 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c index d446e5f2c5..841b3a5517 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -71,7 +72,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - if (pin == NC) return; + assert(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -115,7 +116,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - if (pin == NC) return; + assert(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); @@ -126,7 +127,8 @@ void pin_mode(PinName pin, PinMode mode) { // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; - if (pupd > 2) pupd = 0; // Open-drain = No pull-up/No pull-down + if (pupd > 2) + pupd = 0; // Open-drain = No pull-up/No pull-down gpio->PUPDR &= (uint32_t)(~(GPIO_PUPDR_PUPDR0 << (pin_index * 2))); gpio->PUPDR |= (uint32_t)(pupd << (pin_index * 2)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c index 768e9e7bba..6d33fc4ec3 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); uint32_t port_index = (uint32_t) pin >> 4; // Enable GPIO peripheral clock @@ -27,10 +29,10 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin) { + obj->pin = pin; if (pin == (PinName)NC) return; - obj->pin = pin; obj->mask = gpio_set(pin); uint32_t port_index = (uint32_t) pin >> 4; @@ -47,6 +49,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : pin_function(obj->pin, STM_PIN_DATA(0, 0)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h index 23c6ad8e51..4b7855ecd6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h @@ -16,6 +16,8 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -32,8 +34,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; + assert(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,8 +42,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c index fce1147797..e7c7fe25f6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pinmap.h" #include "error.h" @@ -20,7 +21,7 @@ * Set the pin into input, output, alternate function or analog mode */ void pin_function(PinName pin, int data) { - if (pin == (uint32_t)NC) return; + assert(pin != (PinName)NC); int mode = STM_PIN_MODE(data); int func = STM_PIN_FUNC(data); @@ -53,7 +54,7 @@ void pin_function(PinName pin, int data) { } void pin_mode(PinName pin, PinMode mode) { - if (pin == (uint32_t)NC) { return; } + assert(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; int port_index = pin_number >> 4; From fb90157c9ad7f54c4012354d63bb8bebe259abb1 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Fri, 16 May 2014 15:45:12 +0100 Subject: [PATCH 03/13] All targets except STM - asserts for checking presumptions (function parameters) --- .../TARGET_K20D5M/analogin_api.c | 5 +- .../TARGET_Freescale/TARGET_K20D5M/i2c_api.c | 5 +- .../TARGET_K20D5M/pwmout_api.c | 5 +- .../TARGET_K20D5M/serial_api.c | 5 +- .../TARGET_Freescale/TARGET_K20D5M/spi_api.c | 6 +- .../TARGET_KLXX/analogin_api.c | 6 +- .../TARGET_KLXX/analogout_api.c | 7 +-- .../TARGET_Freescale/TARGET_KLXX/i2c_api.c | 6 +- .../TARGET_Freescale/TARGET_KLXX/pwmout_api.c | 11 ++-- .../TARGET_Freescale/TARGET_KLXX/serial_api.c | 8 +-- .../TARGET_K64F/analogin_api.c | 7 +-- .../TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c | 6 +- .../TARGET_K64F/pwmout_api.c | 7 +-- .../TARGET_K64F/serial_api.c | 6 +- .../TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c | 8 +-- .../TARGET_NRF51822/analogin_api.c | 10 ++-- .../TARGET_NORDIC/TARGET_NRF51822/i2c_api.c | 44 +++++++------- .../TARGET_NRF51822/pwmout_api.c | 58 +++++++++---------- .../TARGET_NRF51822/serial_api.c | 29 +++++----- .../TARGET_NORDIC/TARGET_NRF51822/spi_api.c | 39 ++++++------- .../TARGET_NXP/TARGET_LPC11U6X/analogin_api.c | 7 +-- .../hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c | 8 +-- .../TARGET_NXP/TARGET_LPC11U6X/serial_api.c | 24 +++----- .../hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c | 11 +--- .../TARGET_NXP/TARGET_LPC11UXX/analogin_api.c | 5 +- .../hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c | 9 ++- .../TARGET_NXP/TARGET_LPC11UXX/serial_api.c | 23 +++----- .../hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c | 15 ++--- .../TARGET_LPC11XX_11CXX/analogin_api.c | 6 +- .../TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c | 6 +- .../TARGET_LPC11XX_11CXX/pwmout_api.c | 7 +-- .../TARGET_LPC11XX_11CXX/serial_api.c | 22 +++---- .../TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c | 11 +--- .../TARGET_NXP/TARGET_LPC13XX/analogin_api.c | 5 +- .../hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c | 6 +- .../TARGET_NXP/TARGET_LPC13XX/pwmout_api.c | 9 +-- .../TARGET_NXP/TARGET_LPC13XX/serial_api.c | 22 +++---- .../hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c | 11 +--- .../TARGET_NXP/TARGET_LPC15XX/analogin_api.c | 8 +-- .../TARGET_NXP/TARGET_LPC15XX/analogout_api.c | 6 +- .../hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC15XX/pwmout_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC15XX/serial_api.c | 19 +++--- .../hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c | 6 +- .../TARGET_NXP/TARGET_LPC176X/analogin_api.c | 6 +- .../TARGET_NXP/TARGET_LPC176X/analogout_api.c | 6 +- .../hal/TARGET_NXP/TARGET_LPC176X/can_api.c | 6 +- .../hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC176X/pwmout_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC176X/serial_api.c | 25 +++----- .../hal/TARGET_NXP/TARGET_LPC176X/spi_api.c | 9 +-- .../TARGET_NXP/TARGET_LPC23XX/analogin_api.c | 6 +- .../TARGET_NXP/TARGET_LPC23XX/analogout_api.c | 6 +- .../hal/TARGET_NXP/TARGET_LPC23XX/can_api.c | 6 +- .../hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c | 6 +- .../TARGET_NXP/TARGET_LPC23XX/pwmout_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC23XX/serial_api.c | 25 +++----- .../hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c | 10 +--- .../TARGET_NXP/TARGET_LPC408X/analogin_api.c | 5 +- .../TARGET_NXP/TARGET_LPC408X/analogout_api.c | 6 +- .../hal/TARGET_NXP/TARGET_LPC408X/can_api.c | 5 +- .../hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c | 6 +- .../TARGET_NXP/TARGET_LPC408X/pwmout_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC408X/serial_api.c | 20 ++----- .../hal/TARGET_NXP/TARGET_LPC408X/spi_api.c | 9 +-- .../TARGET_NXP/TARGET_LPC43XX/analogin_api.c | 7 +-- .../TARGET_NXP/TARGET_LPC43XX/analogout_api.c | 6 +- .../TARGET_NXP/TARGET_LPC43XX/serial_api.c | 16 ++--- .../hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c | 10 +--- .../hal/TARGET_NXP/TARGET_LPC81X/spi_api.c | 7 +-- 71 files changed, 289 insertions(+), 492 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c index def4d5129b..25a92d8c42 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" static const PinMap PinMap_ADC[] = { @@ -38,8 +38,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) - error("ADC pin mapping failed"); + assert(obj->adc != (ADCName)NC); SIM->SCGC6 |= SIM_SCGC6_ADC0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c index d6d476d6f0..3b966a25bc 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" static const PinMap PinMap_I2C_SDA[] = { @@ -54,8 +54,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_Type*)pinmap_merge(i2c_sda, i2c_scl); - if ((int)obj->i2c == NC) - error("I2C pin mapping failed"); + assert((int)obj->i2c != NC); SIM->SCGC4 |= SIM_SCGC4_I2C0_MASK; SIM->SCGC5 |= SIM_SCGC5_PORTB_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c index 35b8901149..7de84ad758 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_PWM[] = { // LEDs @@ -53,8 +53,7 @@ static float pwm_clock = 0; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) - error("PwmOut pin mapping failed"); + assert(pwm != (PWMName)NC); uint32_t clkdiv = 0; float clkval = SystemCoreClock / 1000000.0f; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index 7d61305f2f..9e8e782421 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "serial_api.h" // math.h required for floating point operations for baud rate calculation @@ -22,7 +23,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_UART_TX[] = { {PTB17, UART_0, 3}, @@ -47,8 +47,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) - error("Serial pinout mapping failed"); + assert((int)uart != NC); obj->uart = (UART_Type *)uart; // enable clk diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c index 3075a33a49..8f4f2e62e9 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "spi_api.h" #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" static const PinMap PinMap_SPI_SCLK[] = { @@ -56,9 +56,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); SIM->SCGC5 |= SIM_SCGC5_PORTC_MASK | SIM_SCGC5_PORTD_MASK; SIM->SCGC6 |= SIM_SCGC6_SPI0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c index e4146cca27..fb472adb92 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" #include "PeripheralPins.h" @@ -27,9 +27,7 @@ void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); SIM->SCGC6 |= SIM_SCGC6_ADC0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c index 31252fe8ac..c15dcd6a42 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c @@ -13,21 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "PeripheralPins.h" #define RANGE_12BIT 0xFFF - void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); SIM->SCGC6 |= SIM_SCGC6_DAC0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c index b0d80da6f9..0c1504c123 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" #include "PeripheralPins.h" @@ -43,9 +43,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_Type*)pinmap_merge(i2c_sda, i2c_scl); - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (PinName)NC); // enable power switch ((int)obj->i2c) { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c index 2101758480..ff80c95ccc 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" #include "PeripheralPins.h" @@ -26,9 +26,8 @@ static float pwm_clock; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (PWMName)NC); + uint32_t clkdiv = 0; float clkval; if (mcgpllfll_frequency()) { @@ -37,11 +36,11 @@ void pwmout_init(pwmout_t* obj, PinName pin) { } else { SIM->SOPT2 |= SIM_SOPT2_TPMSRC(2); // Clock source: ExtOsc clkval = extosc_frequency() / 1000000.0f; - } + } while (clkval > 1) { clkdiv++; - clkval /= 2.0; + clkval /= 2.0; if (clkdiv == 7) break; } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c index feaeb9f031..1114260890 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "serial_api.h" // math.h required for floating point operations for baud rate calculation @@ -22,7 +23,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" #include "PeripheralPins.h" @@ -61,9 +61,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart != NC); obj->uart = (UARTLP_Type *)uart; // enable clk @@ -290,7 +288,7 @@ void serial_pinout_tx(PinName tx) { } void serial_break_set(serial_t *obj) { - obj->uart->C2 |= UARTLP_C2_SBK_MASK; + obj->uart->C2 |= UARTLP_C2_SBK_MASK; } void serial_break_clear(serial_t *obj) { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c index 215deb6182..0404e0e2cf 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "PeripheralNames.h" #include "fsl_adc_hal.h" #include "fsl_clock_manager.h" @@ -49,9 +49,8 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); + uint32_t instance = obj->adc >> ADC_INSTANCE_SHIFT; clock_manager_set_gate(kClockModuleADC, instance, true); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c index 9203de63c8..3dbdbf8228 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "fsl_clock_manager.h" #include "fsl_i2c_hal.h" #include "fsl_port_hal.h" @@ -50,9 +50,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { uint32_t i2c_sda = pinmap_peripheral(sda, PinMap_I2C_SDA); uint32_t i2c_scl = pinmap_peripheral(scl, PinMap_I2C_SCL); obj->instance = pinmap_merge(i2c_sda, i2c_scl); - if ((int)obj->instance == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->instance != NC); clock_manager_set_gate(kClockModuleI2C, obj->instance, true); clock_manager_set_gate(kClockModulePORT, sda >> GPIO_PORT_SHIFT, true); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c index 6d7244cfe2..21777c91f1 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "fsl_ftm_hal.h" #include "fsl_mcg_hal.h" #include "fsl_clock_manager.h" @@ -73,9 +73,8 @@ static float pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) { - error("PwmOut pin mapping failed"); - } + assert(pwm != (PWMName)NC); + obj->pwm_name = pwm; uint32_t pwm_base_clock; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c index 2be80cc4af..7a4cacda79 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c @@ -17,12 +17,12 @@ // math.h required for floating point operations for baud rate calculation #include +#include #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "fsl_uart_hal.h" #include "fsl_clock_manager.h" #include "fsl_uart_features.h" @@ -85,9 +85,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { uint32_t uart_tx = pinmap_peripheral(tx, PinMap_UART_TX); uint32_t uart_rx = pinmap_peripheral(rx, PinMap_UART_RX); obj->index = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)obj->index == NC) { - error("Serial pinout mapping failed"); - } + assert((int)obj->index != NC); uart_config_t uart_config; uart_config.baudRate = 9600; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c index 78a94f47e1..8998af6a73 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "spi_api.h" - #include +#include +#include "spi_api.h" #include "cmsis.h" #include "pinmap.h" #include "error.h" @@ -93,9 +93,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel uint32_t spi_cntl = pinmap_merge(spi_sclk, spi_ssel); obj->instance = pinmap_merge(spi_data, spi_cntl); - if ((int)obj->instance == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->instance != NC); // enable power and clocking clock_manager_set_gate(kClockModuleSPI, obj->instance, true); diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c index 74c848d4e2..77aefb7ad8 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define ANALOGIN_MEDIAN_FILTER 1 #define ADC_10BIT_RANGE 0x3FF @@ -37,9 +37,7 @@ void analogin_init(analogin_t *obj, PinName pin) { const PinMap *map = PinMap_ADC; obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); //(NRF_ADC_Type *) - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); while (map->pin != NC) { if (map->pin == pin){ @@ -49,12 +47,12 @@ void analogin_init(analogin_t *obj, PinName pin) { map++; } - NRF_ADC->ENABLE = ADC_ENABLE_ENABLE_Enabled; + NRF_ADC->ENABLE = ADC_ENABLE_ENABLE_Enabled; NRF_ADC->CONFIG = (ADC_CONFIG_RES_10bit << ADC_CONFIG_RES_Pos) | (ADC_CONFIG_INPSEL_AnalogInputOneThirdPrescaling<< ADC_CONFIG_INPSEL_Pos) | (ADC_CONFIG_REFSEL_SupplyOneThirdPrescaling << ADC_CONFIG_REFSEL_Pos) | (analogInputPin << ADC_CONFIG_PSEL_Pos) | - (ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos); + (ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos); } uint16_t analogin_read_u16(analogin_t *obj) { diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c index c8a2a05ba4..9de494a563 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" - - static const PinMap PinMap_I2C_SDA[] = { {p22, I2C_0, 1}, @@ -52,7 +50,7 @@ void twi_master_init(i2c_t *obj, PinName sda, PinName scl, int frequency) { (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)); obj->i2c->PSELSCL = scl; - obj->i2c->PSELSDA = sda; + obj->i2c->PSELSDA = sda; // set default frequency at 100k i2c_frequency(obj, frequency); i2c_interface_enable(obj); @@ -64,30 +62,28 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c = (I2CName)pinmap_merge(i2c_sda,i2c_scl); obj->i2c = (NRF_TWI_Type *)i2c; - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); obj->scl=scl; obj->sda=sda; obj->i2c->EVENTS_ERROR = 0; - obj->i2c->ENABLE = TWI_ENABLE_ENABLE_Disabled << TWI_ENABLE_ENABLE_Pos; - obj->i2c->POWER = 0; + obj->i2c->ENABLE = TWI_ENABLE_ENABLE_Disabled << TWI_ENABLE_ENABLE_Pos; + obj->i2c->POWER = 0; for(int i=0;i<100;i++){ } - obj->i2c->POWER = 1; + obj->i2c->POWER = 1; twi_master_init(obj,sda,scl,100000); } void i2c_reset(i2c_t *obj) { obj->i2c->EVENTS_ERROR = 0; - obj->i2c->ENABLE = TWI_ENABLE_ENABLE_Disabled << TWI_ENABLE_ENABLE_Pos; - obj->i2c->POWER = 0; + obj->i2c->ENABLE = TWI_ENABLE_ENABLE_Disabled << TWI_ENABLE_ENABLE_Pos; + obj->i2c->POWER = 0; for(int i=0;i<100;i++){ } - obj->i2c->POWER = 1; + obj->i2c->POWER = 1; twi_master_init(obj,obj->sda,obj->scl,obj->freq); } @@ -107,7 +103,7 @@ int i2c_stop(i2c_t *obj) { timeOut--; if(timeOut<0) return 1; - } + } addrSet = 0; i2c_reset(obj); return 0; @@ -122,7 +118,7 @@ int i2c_do_write(i2c_t *obj, int value) { if(timeOut<0) return 1; } - obj->i2c->EVENTS_TXDSENT = 0; + obj->i2c->EVENTS_TXDSENT = 0; return 0; } @@ -166,17 +162,17 @@ void i2c_frequency(i2c_t *obj, int hz) { } int checkError(i2c_t *obj){ - if (obj->i2c->EVENTS_ERROR == 1){ - if (obj->i2c->ERRORSRC & TWI_ERRORSRC_ANACK_Msk){ + if (obj->i2c->EVENTS_ERROR == 1){ + if (obj->i2c->ERRORSRC & TWI_ERRORSRC_ANACK_Msk){ obj->i2c->EVENTS_ERROR = 0; - obj->i2c->TASKS_STOP = 1; + obj->i2c->TASKS_STOP = 1; return I2C_ERROR_BUS_BUSY; } obj->i2c->EVENTS_ERROR = 0; obj->i2c->TASKS_STOP = 1; - return I2C_ERROR_NO_SLAVE; - } + return I2C_ERROR_NO_SLAVE; + } return 0; } @@ -190,7 +186,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { // Read in all except last byte for (count = 0; count < (length - 1); count++) { status = i2c_do_read(obj,&data[count], 0); - if (status) { + if (status) { errorResult = checkError(obj); i2c_reset(obj); if(errorResult<0){ @@ -211,7 +207,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { while(!obj->i2c->EVENTS_STOPPED){ } obj->i2c->EVENTS_STOPPED = 0; - } + } return length; } @@ -219,7 +215,7 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) { int status, errorResult; obj->i2c->ADDRESS = (address>>1); obj->i2c->SHORTS = 0; - obj->i2c->TASKS_STARTTX = 1; + obj->i2c->TASKS_STARTTX = 1; for (int i=0; ii2c->TASKS_STARTRX = 1; } else{ - obj->i2c->TASKS_STARTTX = 1; + obj->i2c->TASKS_STARTTX = 1; } } else{ diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c index e0a672fd8b..3a692d2585 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -43,8 +44,8 @@ static const PinMap PinMap_PWM[] = { {p19, PWM_1, 1}, {p20, PWM_1, 1}, {p21, PWM_1, 1}, - {p22, PWM_1, 1}, - {p23, PWM_1, 1}, + {p22, PWM_1, 1}, + {p23, PWM_1, 1}, {p24, PWM_1, 1}, {p25, PWM_1, 1}, {p28, PWM_1, 1}, @@ -54,7 +55,7 @@ static const PinMap PinMap_PWM[] = { }; static NRF_TIMER_Type *Timers[1] = { - NRF_TIMER2 + NRF_TIMER2 }; uint8_t PWM_taken[NO_PWMS] = {0,0}; @@ -67,34 +68,34 @@ uint16_t ACTUAL_PULSE[NO_PWMS] = {0,0}; */ #ifdef __cplusplus extern "C" { -#endif +#endif void TIMER2_IRQHandler(void) { static uint16_t CCVal1 = 2501; static uint16_t CCVal2 = 2501; - if ((NRF_TIMER2->EVENTS_COMPARE[1] != 0) && + if ((NRF_TIMER2->EVENTS_COMPARE[1] != 0) && ((NRF_TIMER2->INTENSET & TIMER_INTENSET_COMPARE1_Msk) != 0)){ - NRF_TIMER2->CC[0] = CCVal1; + NRF_TIMER2->CC[0] = CCVal1; NRF_TIMER2->EVENTS_COMPARE[1] = 0; NRF_TIMER2->CC[1] = (NRF_TIMER2->CC[1] + PERIOD[0]); - CCVal1 = NRF_TIMER2->CC[1] + PULSE_WIDTH[0]; + CCVal1 = NRF_TIMER2->CC[1] + PULSE_WIDTH[0]; } - if ((NRF_TIMER2->EVENTS_COMPARE[3] != 0) && + if ((NRF_TIMER2->EVENTS_COMPARE[3] != 0) && ((NRF_TIMER2->INTENSET & TIMER_INTENSET_COMPARE3_Msk) != 0)){ NRF_TIMER2->CC[2] = CCVal2; NRF_TIMER2->EVENTS_COMPARE[3] = 0; NRF_TIMER2->CC[3] = (NRF_TIMER2->CC[3] + PERIOD[1]); - CCVal2 = NRF_TIMER2->CC[3] + PULSE_WIDTH[1]; - } + CCVal2 = NRF_TIMER2->CC[3] + PULSE_WIDTH[1]; + } } #ifdef __cplusplus } -#endif +#endif /** @brief Function for initializing the Timer peripherals. */ void timer_init(uint8_t pwmChoice) @@ -102,10 +103,10 @@ void timer_init(uint8_t pwmChoice) NRF_TIMER_Type *timer = Timers[pwmChoice/2]; if(!(pwmChoice%2)){ timer->POWER = 0; - timer->POWER = 1; - timer->MODE = TIMER_MODE_MODE_Timer; + timer->POWER = 1; + timer->MODE = TIMER_MODE_MODE_Timer; timer->BITMODE = TIMER_BITMODE_BITMODE_16Bit << TIMER_BITMODE_BITMODE_Pos; - timer->PRESCALER = 7;//8us ticks + timer->PRESCALER = 7;//8us ticks } if(pwmChoice%2){ @@ -148,11 +149,11 @@ void gpiote_init(PinName pin,uint8_t channel_number) /* Three NOPs are required to make sure configuration is written before setting tasks or getting events */ __NOP(); __NOP(); - __NOP(); + __NOP(); /* Launch the task to take the GPIOTE channel output to the desired level */ NRF_GPIOTE->TASKS_OUT[channel_number] = 1; - /* Finally configure the channel as the caller expects. If OUTINIT works, the channel is configured properly. + /* Finally configure the channel as the caller expects. If OUTINIT works, the channel is configured properly. If it does not, the channel output inheritance sets the proper level. */ NRF_GPIOTE->CONFIG[channel_number] = (GPIOTE_CONFIG_MODE_Task << GPIOTE_CONFIG_MODE_Pos) | ((uint32_t)pin << GPIOTE_CONFIG_PSEL_Pos) | @@ -162,7 +163,7 @@ void gpiote_init(PinName pin,uint8_t channel_number) /* Three NOPs are required to make sure configuration is written before setting tasks or getting events */ __NOP(); __NOP(); - __NOP(); + __NOP(); } /** @brief Function for initializing the Programmable Peripheral Interconnect peripheral. */ @@ -175,8 +176,8 @@ static void ppi_init(uint8_t pwm) // Configure PPI channel 0 to toggle ADVERTISING_LED_PIN_NO on every TIMER1 COMPARE[0] match NRF_PPI->CH[channel_number].TEP = (uint32_t)&NRF_GPIOTE->TASKS_OUT[pwm]; NRF_PPI->CH[channel_number+1].TEP = (uint32_t)&NRF_GPIOTE->TASKS_OUT[pwm]; - NRF_PPI->CH[channel_number].EEP = (uint32_t)&timer->EVENTS_COMPARE[channel_number-(4*(channel_number/4))]; - NRF_PPI->CH[channel_number+1].EEP = (uint32_t)&timer->EVENTS_COMPARE[channel_number+1-(4*(channel_number/4))]; + NRF_PPI->CH[channel_number].EEP = (uint32_t)&timer->EVENTS_COMPARE[channel_number-(4*(channel_number/4))]; + NRF_PPI->CH[channel_number+1].EEP = (uint32_t)&timer->EVENTS_COMPARE[channel_number+1-(4*(channel_number/4))]; // Enable PPI channels. NRF_PPI->CHEN |= (1 << channel_number) @@ -213,10 +214,9 @@ void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel uint8_t pwmOutSuccess = 0; PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (pwm == (PWMName)NC){ - error("PwmOut pin mapping failed"); - } + + assert(pwm != (PWMName)NC); + if(PWM_taken[(uint8_t)pwm]){ for(uint8_t i = 1; !pwmOutSuccess && (i 1.0f) { value = 1.0; - } + } oldPulseWidth = ACTUAL_PULSE[obj->pwm]; ACTUAL_PULSE[obj->pwm] = PULSE_WIDTH[obj->pwm] = value* PERIOD[obj->pwm]; if(PULSE_WIDTH[obj->pwm] == 0){ PULSE_WIDTH[obj->pwm] = 1; - setModulation(obj,0,0); + setModulation(obj,0,0); } else if(PULSE_WIDTH[obj->pwm] == PERIOD[obj->pwm]){ PULSE_WIDTH[obj->pwm] = PERIOD[obj->pwm]-1; @@ -280,7 +280,7 @@ void pwmout_write(pwmout_t* obj, float value) { } else if( (oldPulseWidth == 0) || (oldPulseWidth == PERIOD[obj->pwm]) ){ setModulation(obj,1,oldPulseWidth == PERIOD[obj->pwm]); - } + } } float pwmout_read(pwmout_t* obj) { @@ -308,7 +308,7 @@ void pwmout_period_us(pwmout_t* obj, int us) { } else{ PERIOD[obj->pwm] =periodInTicks; - } + } } void pwmout_pulsewidth(pwmout_t* obj, float seconds) { @@ -327,7 +327,7 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) { if(PULSE_WIDTH[obj->pwm] == 0){ PULSE_WIDTH[obj->pwm] = 1; - setModulation(obj,0,0); + setModulation(obj,0,0); } else if(PULSE_WIDTH[obj->pwm] == PERIOD[obj->pwm]){ PULSE_WIDTH[obj->pwm] = PERIOD[obj->pwm]-1; @@ -335,5 +335,5 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) { } else if( (oldPulseWidth == 0) || (oldPulseWidth == PERIOD[obj->pwm]) ){ setModulation(obj,1,oldPulseWidth == PERIOD[obj->pwm]); - } + } } diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c index c4c6f26ef3..cde0c5c59a 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c @@ -16,11 +16,12 @@ // math.h required for floating point operations for baud rate calculation //#include #include +#include #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" + /****************************************************************************** * INITIALIZATION ******************************************************************************/ @@ -65,14 +66,12 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart != NC); obj->uart = (NRF_UART_Type *)uart; - //pin configurations -- - //outputs + //pin configurations -- + //outputs NRF_GPIO->DIR |= (1<DIR |= (1<uart->BAUDRATE = UART_BAUDRATE_BAUDRATE_Baud1200; return; - } + } - for(int i=1;i<16;i++){ + for(int i=1;i<16;i++){ if(baudrateuart->BAUDRATE = acceptedSpeeds[i-1][1]; return; @@ -133,7 +132,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b // 0: 1 stop bits, 1: 2 stop bits // int parity_enable, parity_select; switch (parity) { - case ParityNone: + case ParityNone: obj->uart->CONFIG = 0; break; default: @@ -149,11 +148,11 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b static inline void uart_irq(uint32_t iir, uint32_t index) { SerialIrq irq_type; switch (iir) { - case 1: - irq_type = TxIrq; + case 1: + irq_type = TxIrq; break; - case 2: - irq_type = RxIrq; + case 2: + irq_type = RxIrq; break; default: return; @@ -165,7 +164,7 @@ static inline void uart_irq(uint32_t iir, uint32_t index) { } #ifdef __cplusplus extern "C" { -#endif +#endif void UART0_IRQHandler() { uint32_t irtype =0; @@ -180,7 +179,7 @@ void UART0_IRQHandler() } #ifdef __cplusplus } -#endif +#endif void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) { irq_handler = handler; serial_irq_ids[obj->index] = id; diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c index b403aa4aa5..2d3c47b0ce 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ //#include +#include #include "spi_api.h" #include "cmsis.h" #include "pinmap.h" @@ -22,7 +23,7 @@ static const PinMap PinMap_SPI_SCLK[] = { {SPI_PSELSCK0 , SPI_0, 0x01}, {SPI_PSELSCK1, SPI_1, 0x02}, - {SPIS_PSELSCK, SPIS, 0x03}, + {SPIS_PSELSCK, SPIS, 0x03}, {NC , NC , 0} }; @@ -59,20 +60,18 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); SPIName spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - //SPIName + //SPIName if(ssel==NC){ obj->spi = (NRF_SPI_Type*)spi; obj->spis = (NRF_SPIS_Type*)NC; } else{ obj->spi = (NRF_SPI_Type*)NC; - obj->spis = (NRF_SPIS_Type*)spi; + obj->spis = (NRF_SPIS_Type*)spi; } - - if ((int)obj->spi == NC && (int)obj->spis == NC) { - error("SPI pinout mapping failed"); - } - // pin out the spi pins + assert((int)obj->spi != NC && (int)obj->spis != NC); + + // pin out the spi pins if (ssel != NC) {//slave obj->spis->POWER=0; obj->spis->POWER=1; @@ -108,7 +107,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel obj->spis->MAXRX=SPIS_MESSAGE_SIZE; obj->spis->MAXTX=SPIS_MESSAGE_SIZE; obj->spis->TXDPTR = (uint32_t)&m_tx_buf[0]; - obj->spis->RXDPTR = (uint32_t)&m_rx_buf[0]; + obj->spis->RXDPTR = (uint32_t)&m_rx_buf[0]; obj->spis->SHORTS = (SPIS_SHORTS_END_ACQUIRE_Enabled<spi->POWER=0; obj->spi->POWER=1; - //NRF_GPIO->DIR |= (1<DIR |= (1<PIN_CNF[mosi] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) @@ -141,10 +140,10 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel obj->spi->PSELMISO = miso; - obj->spi->EVENTS_READY = 0U; + obj->spi->EVENTS_READY = 0U; spi_format(obj, 8, 0, 0); // 8 bits, mode 0, master - spi_frequency(obj, 1000000); + spi_frequency(obj, 1000000); } } @@ -197,10 +196,10 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { } //default to msb first if(slave){ - obj->spis->CONFIG = (config_mode | (SPI_CONFIG_ORDER_MsbFirst << SPI_CONFIG_ORDER_Pos) ); + obj->spis->CONFIG = (config_mode | (SPI_CONFIG_ORDER_MsbFirst << SPI_CONFIG_ORDER_Pos) ); } else{ - obj->spi->CONFIG = (config_mode | (SPI_CONFIG_ORDER_MsbFirst << SPI_CONFIG_ORDER_Pos) ); + obj->spi->CONFIG = (config_mode | (SPI_CONFIG_ORDER_MsbFirst << SPI_CONFIG_ORDER_Pos) ); } spi_enable(obj,slave); @@ -212,7 +211,7 @@ void spi_frequency(spi_t *obj, int hz) { spi_disable(obj,0); if(hz<250000) { //125Kbps - obj->spi->FREQUENCY = (uint32_t) SPI_FREQUENCY_FREQUENCY_K125; + obj->spi->FREQUENCY = (uint32_t) SPI_FREQUENCY_FREQUENCY_K125; } else if(hz<500000){//250Kbps obj->spi->FREQUENCY = (uint32_t) SPI_FREQUENCY_FREQUENCY_K250; @@ -230,7 +229,7 @@ void spi_frequency(spi_t *obj, int hz) { obj->spi->FREQUENCY = (uint32_t) SPI_FREQUENCY_FREQUENCY_M4; } else{//8Mbps - obj->spi->FREQUENCY = (uint32_t) SPI_FREQUENCY_FREQUENCY_M8; + obj->spi->FREQUENCY = (uint32_t) SPI_FREQUENCY_FREQUENCY_M8; } spi_enable(obj,0); @@ -260,7 +259,7 @@ int spi_master_write(spi_t *obj, int value) { return spi_read(obj); } -//static inline int spis_writeable(spi_t *obj) { +//static inline int spis_writeable(spi_t *obj) { // return (obj->spis->EVENTS_ACQUIRED==1); //} @@ -268,12 +267,12 @@ int spi_slave_receive(spi_t *obj) { return obj->spis->EVENTS_END; }; -int spi_slave_read(spi_t *obj) { +int spi_slave_read(spi_t *obj) { return m_rx_buf[0]; } -void spi_slave_write(spi_t *obj, int value) { - m_tx_buf[0]= value & 0xFF; +void spi_slave_write(spi_t *obj, int value) { + m_tx_buf[0]= value & 0xFF; obj->spis->TASKS_RELEASE=1; obj->spis->EVENTS_ACQUIRED=0; obj->spis->EVENTS_END=0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c index 88641ddeb5..2c642a49c7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -50,9 +50,8 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { volatile uint32_t tmp; obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (uint32_t)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); + pinmap_pinout(pin, PinMap_ADC); // ADC Powered diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c index d1e771d334..29b2d137a2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #if DEVICE_I2C @@ -96,10 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C0_Type *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c index a2ac8fe1c5..4854c3bac7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include #include @@ -21,7 +22,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #if DEVICE_SERIAL #warning "[TODO] support from UART_1 to UART_4" @@ -68,10 +68,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } - + assert((int)uart != NC); + obj->uart = (LPC_USART0_Type *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= ((1<<12) | (1<<20) | (1<<21) | (1<<22)); @@ -205,16 +203,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -225,8 +218,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c index 4c01e37cfa..6bc0c81eea 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" @@ -68,10 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP0_Type*)pinmap_merge(spi_data, spi_cntl); - - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi == NC); // enable power and clocking switch ((int)obj->spi) { @@ -111,10 +109,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c index 9078d2c002..bea83258a4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -46,9 +47,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Power up ADC LPC_SYSCON->PDRUNCFG &= ~ (1 << 4); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c index 374751c331..e1ea6fcd5d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_I2C_SDA[] = { {P0_5, I2C_0, 1}, @@ -87,10 +87,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_Type *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c index 29ebdbe000..932f16d1a8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 @@ -69,9 +69,8 @@ static LPC_CTxxBx_Type *Timers[4] = { void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (PWMName)NC); + obj->pwm = pwm; // Timer registers @@ -143,7 +142,7 @@ void pwmout_period_us(pwmout_t* obj, int us) { // for 16bit timer, set prescaler to avoid overflow if (timer == LPC_CT16B0 || timer == LPC_CT16B1) { - uint16_t high_period_ticks = period_ticks >> 16; + uint16_t high_period_ticks = period_ticks >> 16; timer->PR = high_period_ticks; period_ticks /= (high_period_ticks + 1); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c index 123dd6af0d..24afea0403 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c @@ -21,7 +21,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" /****************************************************************************** * INITIALIZATION @@ -55,10 +54,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } - + assert((int)uart != NC); + obj->uart = (LPC_USART_Type *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= (1<<12); @@ -188,16 +185,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -208,8 +200,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c index 1018d9c543..d08902c751 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" #include "cmsis.h" @@ -62,10 +63,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSPx_Type*)pinmap_merge(spi_data, spi_cntl); - - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -104,12 +102,10 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + ssp_disable(obj); - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; @@ -157,7 +153,8 @@ void spi_frequency(spi_t *obj, int hz) { // divider obj->spi->CR0 &= ~(0xFFFF << 8); - obj->spi->CR0 |= (divider - 1) << 8; + obj->spi->CR0 |= (divider - 1) << 8 + ; ssp_enable(obj); return; } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c index 1d8610a420..2f1ccd0d3c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -43,10 +44,7 @@ static inline int div_round_up(int x, int y) { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (uint32_t)NC) { - error("ADC pin mapping failed"); - return; - } + assert(obj->adc != (uint32_t)NC); // Power up ADC LPC_SYSCON->PDRUNCFG &= ~ (1 << 4); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c index 9a58c8e93a..da0e9ed7d8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -87,10 +88,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c index 6fff9b67c1..ad84b2103b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 @@ -64,9 +64,8 @@ static LPC_TMR_TypeDef *Timers[3] = { void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (uint32_t)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (uint32_t)NC); + obj->pwm = pwm; // Timer registers diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c index 55bfc1a5a8..09c2c86f92 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include #include @@ -21,7 +22,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" /****************************************************************************** * INITIALIZATION @@ -57,9 +57,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= (1<<12); @@ -183,16 +181,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -203,8 +196,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c index f7380b4ac0..efe45b341d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" #include "cmsis.h" @@ -58,10 +59,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -100,12 +98,9 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c index 43a7a237a8..bea83258a4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -46,9 +47,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (uint32_t)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Power up ADC LPC_SYSCON->PDRUNCFG &= ~ (1 << 4); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c index 374751c331..7c4c2b24c6 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -87,10 +88,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_Type *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c index 6019056f21..a77c39724d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 @@ -73,9 +71,8 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (uint32_t)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (uint32_t)NC); + obj->pwm = pwm; // Timer registers diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c index 3b405a2c68..32a68f7607 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include #include @@ -21,7 +22,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" /****************************************************************************** * INITIALIZATION @@ -55,9 +55,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart != NC); obj->uart = (LPC_USART_Type *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= (1<<12); @@ -186,16 +184,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -206,8 +199,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c index 1018d9c543..0382a13f3e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" #include "cmsis.h" @@ -62,10 +63,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSPx_Type*)pinmap_merge(spi_data, spi_cntl); - - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -105,10 +103,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c index d5059fd5a0..6408ccae88 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define ANALOGIN_MEDIAN_FILTER 1 @@ -55,9 +54,8 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (uint32_t)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); + uint32_t port = (pin >> 5); // enable clock for GPIOx LPC_SYSCON->SYSAHBCLKCTRL0 |= (1UL << (14 + port)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c index e2c6acf9ef..143a37b4c4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" void analogout_init(dac_t *obj, PinName pin) { - if (pin != P0_12) { - error("DAC pin mapping failed"); - } + assert(pin == P0_12); LPC_SYSCON->SYSAHBCLKCTRL0 |= (1 << 29); LPC_SYSCON->PDRUNCFG &= ~(1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c index 09d7ec6b55..afecd74670 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static uint8_t repeated_start = 0; @@ -42,9 +41,7 @@ static inline void i2c_interface_enable(i2c_t *obj) { } void i2c_init(i2c_t *obj, PinName sda, PinName scl) { - if ((sda != P0_23) | (scl != P0_22)) { - error("I2C pin mapping failed"); - } + assert((sda == P0_23) || (scl == P0_22)); // Enables clock for I2C0 LPC_SYSCON->SYSAHBCLKCTRL1 |= (1 << 13); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c index 2ebcf155ba..a24db78b65 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -38,9 +38,8 @@ static int get_available_sct(void) { } void pwmout_init(pwmout_t* obj, PinName pin) { - if (pin == (uint32_t)NC) - error("PwmOut pin mapping failed"); - + assert(pin != (uint32_t)NC); + int sct_n = get_available_sct(); if (sct_n == -1) { error("No available SCT"); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c index 462b765f63..e4e2bc3166 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include @@ -91,7 +92,7 @@ static void switch_pin(const SWM_Map *swm, PinName pn) for (int n = 0; n < sizeof(LPC_SWM->PINASSIGN)/sizeof(*LPC_SWM->PINASSIGN); n ++) { regVal = LPC_SWM->PINASSIGN[n]; for (int j = 0; j <= 24; j += 8) { - if (((regVal >> j) & 0xFF) == pn) + if (((regVal >> j) & 0xFF) == pn) regVal |= (0xFF << j); } LPC_SWM->PINASSIGN[n] = regVal; @@ -195,16 +196,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 6) || (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits + assert(parity < (ParityEven + 1)); + stop_bits -= 1; - - // 0: 7 data bits ... 2: 9 data bits - if (data_bits < 7 || data_bits > 9) { - error("Invalid number of bits (%d) in serial format, should be 7..9", data_bits); - } data_bits -= 7; int paritysel; @@ -213,8 +209,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityEven: paritysel = 2; break; case ParityOdd : paritysel = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->CFG = (data_bits << 2) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c index 9d38588e43..81455d5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" @@ -126,10 +127,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { spi_disable(obj); - - if (!(bits >= 1 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } + assert((bits >= 1 && bits <= 16) || (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c index 982845b2c2..32e1ab4dd1 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define ANALOGIN_MEDIAN_FILTER 1 @@ -44,9 +44,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // ensure power is turned on LPC_SC->PCONP |= (1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c index 103b644f17..4804db09d3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_DAC[] = { {P0_26, DAC_0, 2}, @@ -26,9 +26,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac == (DACName)NC); // power is on by default, set DAC clk divider is /4 LPC_SC->PCLKSEL0 &= ~(0x3 << 22); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c index 35b62ba241..d68e1f62a7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "can_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include #include @@ -258,9 +258,7 @@ void can_init(can_t *obj, PinName rd, PinName td) { CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD); CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD); obj->dev = (LPC_CAN_TypeDef *)pinmap_merge(can_rd, can_td); - if ((int)obj->dev == NC) { - error("CAN pin mapping failed"); - } + assert((int)obj->dev != NC); switch ((int)obj->dev) { case CAN_1: LPC_SC->PCONP |= 1 << 13; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c index 3a405016be..ceb6abd089 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_I2C_SDA[] = { {P0_0 , I2C_1, 3}, @@ -96,10 +96,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c index b4e8bc6acf..83d5bc9d69 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 @@ -57,9 +57,8 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (PWMName)NC); + obj->pwm = pwm; obj->MR = PWM_MATCH[pwm]; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c index c9bbee6bf0..5f6f7fbec7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include #include @@ -21,7 +22,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "gpio_api.h" /****************************************************************************** @@ -89,9 +89,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power @@ -150,6 +148,7 @@ void serial_free(serial_t *obj) { // serial_baud // set the baud rate, taking in to account the current SystemFrequency void serial_baud(serial_t *obj, int baudrate) { + assert((int)obj->uart <= UART_3); // The LPC2300 and LPC1700 have a divider and a fractional divider to control the // baud rate. The formula is: // @@ -165,7 +164,7 @@ void serial_baud(serial_t *obj, int baudrate) { case UART_1: LPC_SC->PCLKSEL0 &= ~(0x3 << 8); LPC_SC->PCLKSEL0 |= (0x1 << 8); break; case UART_2: LPC_SC->PCLKSEL1 &= ~(0x3 << 16); LPC_SC->PCLKSEL1 |= (0x1 << 16); break; case UART_3: LPC_SC->PCLKSEL1 &= ~(0x3 << 18); LPC_SC->PCLKSEL1 |= (0x1 << 18); break; - default: error("serial_baud"); break; + default: break; } uint32_t PCLK = SystemCoreClock; @@ -245,16 +244,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -265,8 +259,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c index f45254657c..66ec890c18 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" @@ -64,9 +65,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -98,9 +97,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c index 0958fbaf7a..823a3e91e3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define ANALOGIN_MEDIAN_FILTER 1 @@ -42,9 +42,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // ensure power is turned on LPC_SC->PCONP |= (1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c index 1cb557cead..79464f2b74 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_DAC[] = { {P0_26, DAC_0, 2}, @@ -25,9 +25,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); // power is on by default, set DAC clk divider is /4 LPC_SC->PCLKSEL0 &= ~(0x3 << 22); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c index f7ddf5278d..dba2c4f20e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "can_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include #include @@ -161,9 +161,7 @@ void can_init(can_t *obj, PinName rd, PinName td) { CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD); CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD); obj->dev = (LPC_CAN_TypeDef *)pinmap_merge(can_rd, can_td); - if ((int)obj->dev == NC) { - error("CAN pin mapping failed"); - } + assert((int)obj->dev != NC); switch ((int)obj->dev) { case CAN_1: LPC_SC->PCONP |= 1 << 13; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c index ecb6fb8756..2a53303a6d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c @@ -16,7 +16,6 @@ #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_I2C_SDA[] = { {P0_0 , I2C_1, 3}, @@ -96,10 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c index c6da85102d..edec24405d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 @@ -57,9 +57,8 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (PWMName)NC); + obj->pwm = pwm; obj->MR = PWM_MATCH[pwm]; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c index a4a4b311fb..2076a1ccd8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include #include @@ -21,7 +22,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" /****************************************************************************** * INITIALIZATION @@ -65,9 +65,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart == NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power @@ -123,6 +121,7 @@ void serial_free(serial_t *obj) { // serial_baud // set the baud rate, taking in to account the current SystemFrequency void serial_baud(serial_t *obj, int baudrate) { + assert((int)obj->uart <= UART_3); // The LPC2300 and LPC1700 have a divider and a fractional divider to control the // baud rate. The formula is: // @@ -138,7 +137,7 @@ void serial_baud(serial_t *obj, int baudrate) { case UART_1: LPC_SC->PCLKSEL0 &= ~(0x3 << 8); LPC_SC->PCLKSEL0 |= (0x1 << 8); break; case UART_2: LPC_SC->PCLKSEL1 &= ~(0x3 << 16); LPC_SC->PCLKSEL1 |= (0x1 << 16); break; case UART_3: LPC_SC->PCLKSEL1 &= ~(0x3 << 18); LPC_SC->PCLKSEL1 |= (0x1 << 18); break; - default: error("serial_baud"); break; + default: break; } uint32_t PCLK = SystemCoreClock; @@ -218,16 +217,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -238,8 +232,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c index 82fef6a885..63c703c474 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c @@ -64,10 +64,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -98,12 +95,9 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c index 04e28939c5..f48d428576 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -43,9 +44,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // ensure power is turned on LPC_SC->PCONP |= (1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c index e43cc25982..c4b885249e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_DAC[] = { {P0_26, DAC_0, 2}, @@ -25,9 +25,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); // DAC enable bit must be set LPC_IOCON->P0_26 |= (1 << 16); // DACEN diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c index 0ff86f93bf..1a86766df0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c @@ -17,7 +17,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include #include @@ -244,9 +243,7 @@ void can_init(can_t *obj, PinName rd, PinName td) { CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD); CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD); obj->dev = (LPC_CAN_TypeDef *)pinmap_merge(can_rd, can_td); - if ((int)obj->dev == NC) { - error("CAN pin mapping failed"); - } + assert((int)obj->dev != NC); switch ((int)obj->dev) { case CAN_1: LPC_SC->PCONP |= 1 << 13; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c index 5619a51435..73f3105c17 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_I2C_SDA[] = { {P0_0 , I2C_1, 3}, @@ -108,9 +108,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c index 296eef80f6..08463d0b6d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define TCR_CNT_EN 0x00000001 #define TCR_RESET 0x00000002 @@ -66,9 +66,8 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - if (pwm == (PWMName)NC) - error("PwmOut pin mapping failed"); - + assert(pwm != (PWMName)NC); + obj->channel = pwm; obj->pwm = LPC_PWM0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c index 26d01224b7..a7b299c474 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c @@ -72,9 +72,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - if ((int)uart == NC) { - error("Serial pinout mapping failed"); - } + assert((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power @@ -209,16 +207,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -229,8 +222,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c index 1dd93555d9..9ee4fe5479 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c @@ -84,9 +84,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -118,12 +116,9 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c index 045c0e7c9a..d49f0195e9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c @@ -15,10 +15,10 @@ * * Ported to NXP LPC43XX by Micromint USA */ +#include #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define ANALOGIN_MEDIAN_FILTER 1 @@ -41,10 +41,7 @@ void analogin_init(analogin_t *obj, PinName pin) { uint8_t num, chan; obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (uint32_t)NC) { - error("ADC pin mapping failed"); - } - + assert(obj->adc != (ADCName)NC); // Configure the pin as GPIO input if (pin < SFP_AIO0) { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c index 9a2dedaf00..69b7d5cc84 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c @@ -15,10 +15,10 @@ * * Ported to NXP LPC43XX by Micromint USA */ +#include #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_DAC[] = { {P_DAC0 , DAC_0, 0x0}, @@ -27,9 +27,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); // Configure the pin as GPIO input pin_function(pin, (SCU_PINIO_PULLNONE | 0x0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c index 6efec95413..c965cd9517 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c @@ -192,16 +192,11 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert(parity < (ParityForced0 + 1)); + stop_bits -= 1; - - // 0: 5 data bits ... 3: 8 data bits - if (data_bits < 5 || data_bits > 8) { - error("Invalid number of bits (%d) in serial format, should be 5..8", data_bits); - } data_bits -= 5; int parity_enable, parity_select; @@ -212,8 +207,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityForced1: parity_enable = 1; parity_select = 2; break; case ParityForced0: parity_enable = 1; parity_select = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->LCR = data_bits << 0 diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c index 9db8e12a31..0cee578fe7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c @@ -15,6 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ +#include #include #include "spi_api.h" @@ -59,9 +60,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_T*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // set default format and frequency if (ssel == NC) { @@ -86,12 +85,9 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); - if (!(bits >= 4 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c index 41eb3538e6..9c3de9534f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include #include "spi_api.h" @@ -115,13 +116,9 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits >= 1 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); - if (!(bits >= 1 && bits <= 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; From d843d56c08c39a19fe9ef50b81e544cca288ad78 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Mon, 19 May 2014 17:09:04 +0100 Subject: [PATCH 04/13] [ALL TARGETS] error replaced by assert for preconditions --- libraries/mbed/common/retarget.cpp | 4 +- .../TARGET_K20D5M/serial_api.c | 16 +++---- .../TARGET_Freescale/TARGET_K20D5M/spi_api.c | 9 +--- .../TARGET_KLXX/TARGET_KL05Z/spi_api.c | 14 ++---- .../TARGET_KLXX/TARGET_KL25Z/spi_api.c | 14 ++---- .../TARGET_KLXX/TARGET_KL46Z/spi_api.c | 15 ++----- .../TARGET_Freescale/TARGET_KLXX/i2c_api.c | 2 +- .../TARGET_Freescale/TARGET_KLXX/serial_api.c | 16 +++---- .../hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c | 2 +- .../TARGET_DISCO_F051R8/analogin_api.c | 9 ++-- .../TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c | 25 +++++------ .../TARGET_DISCO_F051R8/serial_api.c | 23 +++++----- .../TARGET_STM/TARGET_DISCO_F051R8/spi_api.c | 43 +++++++++---------- .../TARGET_DISCO_F100RB/analogin_api.c | 9 ++-- .../TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c | 27 ++++++------ .../TARGET_DISCO_F100RB/pwmout_api.c | 7 +-- .../TARGET_DISCO_F100RB/serial_api.c | 21 ++++----- .../TARGET_STM/TARGET_DISCO_F100RB/spi_api.c | 33 +++++++------- .../TARGET_DISCO_F303VC/analogin_api.c | 9 ++-- .../TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c | 25 +++++------ .../TARGET_DISCO_F303VC/pwmout_api.c | 15 +++---- .../TARGET_DISCO_F303VC/serial_api.c | 25 +++++------ .../TARGET_STM/TARGET_DISCO_F303VC/spi_api.c | 37 ++++++++-------- .../TARGET_DISCO_F407VG/analogin_api.c | 22 ++++------ .../TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c | 31 ++++++------- .../TARGET_DISCO_F407VG/pwmout_api.c | 8 ++-- .../TARGET_DISCO_F407VG/serial_api.c | 20 ++++----- .../TARGET_STM/TARGET_DISCO_F407VG/spi_api.c | 16 +++---- .../TARGET_NUCLEO_F030R8/analogin_api.c | 8 ++-- .../TARGET_NUCLEO_F030R8/gpio_api.c | 2 +- .../TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c | 25 +++++------ .../TARGET_NUCLEO_F030R8/pwmout_api.c | 7 +-- .../TARGET_NUCLEO_F030R8/serial_api.c | 25 +++++------ .../TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c | 37 ++++++++-------- .../TARGET_NUCLEO_F103RB/analogin_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c | 15 +++---- .../TARGET_NUCLEO_F103RB/pwmout_api.c | 7 +-- .../TARGET_NUCLEO_F103RB/serial_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c | 7 +-- .../TARGET_NUCLEO_F302R8/analogin_api.c | 7 +-- .../TARGET_NUCLEO_F302R8/analogout_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c | 9 ++-- .../TARGET_NUCLEO_F302R8/serial_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c | 7 +-- .../TARGET_NUCLEO_F401RE/analogin_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c | 28 ++++++------ .../TARGET_NUCLEO_F401RE/serial_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c | 7 +-- .../TARGET_NUCLEO_L053R8/analogin_api.c | 7 +-- .../TARGET_NUCLEO_L053R8/analogout_api.c | 6 +-- .../TARGET_NUCLEO_L053R8/gpio_api.c | 2 +- .../TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c | 8 ++-- .../TARGET_NUCLEO_L053R8/serial_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c | 7 +-- .../TARGET_NUCLEO_L152RE/analogin_api.c | 7 +-- .../TARGET_NUCLEO_L152RE/analogout_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c | 8 ++-- .../TARGET_NUCLEO_L152RE/pwmout_api.c | 7 +-- .../TARGET_NUCLEO_L152RE/serial_api.c | 7 +-- .../TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c | 7 +-- .../TARGET_STM32F3XX/analogin_api.c | 7 +-- .../TARGET_STM32F3XX/analogout_api.c | 7 +-- .../hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c | 9 ++-- .../TARGET_STM/TARGET_STM32F3XX/pwmout_api.c | 7 +-- .../TARGET_STM/TARGET_STM32F3XX/serial_api.c | 7 +-- .../hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c | 6 +-- .../TARGET_STM32F4XX/analogin_api.c | 5 +-- .../hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c | 6 +-- .../hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c | 14 ++---- 69 files changed, 333 insertions(+), 545 deletions(-) diff --git a/libraries/mbed/common/retarget.cpp b/libraries/mbed/common/retarget.cpp index cfc3f1d274..bbd9b1a413 100644 --- a/libraries/mbed/common/retarget.cpp +++ b/libraries/mbed/common/retarget.cpp @@ -397,11 +397,13 @@ extern "C" WEAK void __cxa_pure_virtual(void) { #endif #include "mbed_interface.h" - +// mbed abort invokes only mbed die. The abort function is called from failing assert for example. +namespace std { extern "C" void abort(void) { mbed_die(); while(1); } +} // **************************************************************************** // mbed_main is a function that is called before main() diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index 9e8e782421..ec6d59ea38 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -116,6 +116,10 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { + assert((stop_bits == 1) || (stop_bits == 2)); + assert(parity < (ParityEven + 1)); + assert((data_bits == 8) || (data_bits == 9)); + assert((data_bits == 2) && (obj->index != 0)); // save C2 state uint32_t c2_state = (obj->uart->C2 & (UART_C2_RE_MASK | UART_C2_TE_MASK)); @@ -124,9 +128,6 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b obj->uart->C2 &= ~(UART_C2_RE_MASK | UART_C2_TE_MASK); // 8 data bits = 0 ... 9 data bits = 1 - if ((data_bits < 8) || (data_bits > 9)) - error("Invalid number of bits (%d) in serial format, should be 8..9", data_bits); - data_bits -= 8; uint32_t parity_enable, parity_select; @@ -135,22 +136,15 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityOdd : parity_enable = 1; parity_select = 1; data_bits++; break; case ParityEven: parity_enable = 1; parity_select = 0; data_bits++; break; default: - error("Invalid serial parity setting"); - return; + break; } - // 1 stop bits = 0, 2 stop bits = 1 - if ((stop_bits != 1) && (stop_bits != 2)) - error("Invalid stop bits specified"); stop_bits -= 1; uint32_t m10 = 0; // 9 data bits + parity if (data_bits == 2) { - // only uart0 supports 10 bit communication - if (obj->index != 0) - error("Invalid number of bits (9) to be used with parity"); data_bits = 0; m10 = 1; } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c index 8f4f2e62e9..6d99905305 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c @@ -91,13 +91,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - if ((bits != 8) && (bits != 16)) { - error("Only 8/16 bits SPI supported"); - } - - if ((mode < 0) || (mode > 3)) { - error("SPI mode unsupported"); - } + assert((bits == 8) || (bits == 16)); + assert((mode > -1) && (mode < 4)); uint32_t polarity = (mode & 0x2) ? 1 : 0; uint32_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c index f3e583bd8a..9fc33672d3 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c @@ -19,7 +19,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_SCLK[] = { {PTB0, SPI_0, 3}, @@ -51,9 +50,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -87,13 +84,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - if (bits != 8) { - error("Only 8bits SPI supported"); - } - - if ((mode < 0) || (mode > 3)) { - error("SPI mode unsupported"); - } + assert(bits == 8); + assert((mode > -1) && (mode < 4)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c index 67685819a2..d4b4301852 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c @@ -19,7 +19,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "clk_freqs.h" #include "PeripheralPins.h" @@ -33,9 +32,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -67,13 +64,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - if (bits != 8) { - error("Only 8bits SPI supported"); - } - - if ((mode < 0) || (mode > 3)) { - error("SPI mode unsupported"); - } + assert(bits == 8); + assert((mode > -1) && (mode < 4)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c index ea09ebc9f6..b14ddabc52 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "spi_api.h" #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_SCLK[] = { {PTA15, SPI_0, 2}, @@ -90,9 +90,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -125,13 +123,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - if ((bits != 8) && (bits != 16)) { - error("Only 8/16 bits SPI supported"); - } - - if ((mode < 0) || (mode > 3)) { - error("SPI mode unsupported"); - } + assert((bits == 8) || (bits == 16)); + assert((mode > -1) && (mode < 4)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c index 0c1504c123..ef194ac866 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c @@ -43,7 +43,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_Type*)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (PinName)NC); + assert((int)obj->i2c != NC); // enable power switch ((int)obj->i2c) { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c index 1114260890..f5c7d012a8 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c @@ -148,17 +148,16 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - + assert((stop_bits == 1) || (stop_bits == 2)); + assert(parity < (ParityEven + 1)); + assert(data_bits == 8); // TODO: Support other number of data bits (also in the write method!) + // save C2 state uint8_t c2_state = (obj->uart->C2 & (UARTLP_C2_RE_MASK | UARTLP_C2_TE_MASK)); // Disable UART before changing registers obj->uart->C2 &= ~(UARTLP_C2_RE_MASK | UARTLP_C2_TE_MASK); - // TODO: Support other number of data bits (also in the write method!) - if ((data_bits < 8) || (data_bits > 8)) { - error("Invalid number of bits (%d) in serial format, should be 8", data_bits); - } uint8_t parity_enable, parity_select; switch (parity) { @@ -166,14 +165,9 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityOdd : parity_enable = 1; parity_select = 1; data_bits++; break; case ParityEven: parity_enable = 1; parity_select = 0; data_bits++; break; default: - error("Invalid serial parity setting"); - return; + break; } - // 1 stop bits = 0, 2 stop bits = 1 - if ((stop_bits != 1) && (stop_bits != 2)) { - error("Invalid stop bits specified"); - } stop_bits -= 1; // data bits, parity and parity mode diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c index 94479a4359..4875038efa 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c @@ -43,7 +43,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(pin != (PinName)NC); + assert(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c index 82700338f4..4ada460e3c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #include "wait_api.h" @@ -32,7 +33,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // ADC_IN0 @@ -53,10 +53,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); @@ -76,7 +73,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Configure ADC ADC_InitStructure.ADC_Resolution = ADC_Resolution_12b; - ADC_InitStructure.ADC_ContinuousConvMode = DISABLE; + ADC_InitStructure.ADC_ContinuousConvMode = DISABLE; ADC_InitStructure.ADC_ExternalTrigConvEdge = ADC_ExternalTrigConvEdge_None; ADC_InitStructure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_TRGO; ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c index 73b7f1ba68..6799955951 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c @@ -27,17 +27,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are - not based on accurate values, they just guarantee that the application will - not remain stuck if the I2C communication is corrupted. */ + not based on accurate values, they just guarantee that the application will + not remain stuck if the I2C communication is corrupted. */ #define FLAG_TIMEOUT ((int)0x1000) #define LONG_TIMEOUT ((int)0x8000) @@ -51,19 +51,16 @@ static const PinMap PinMap_I2C_SCL[] = { {NC, NC, 0} }; -void i2c_init(i2c_t *obj, PinName sda, PinName scl) { +void i2c_init(i2c_t *obj, PinName sda, PinName scl) { // Determine the I2C to use I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphClockCmd(RCC_APB1Periph_I2C1, ENABLE); } //if (obj->i2c == I2C_2) { @@ -80,10 +77,11 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { i2c_reset(obj); // I2C configuration - i2c_frequency(obj, 100000); // 100 kHz per default + i2c_frequency(obj, 100000); // 100 kHz per default } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz == 100000) || (hz == 200000) || (hz == 400000)); //"Only 100kHz, 200kHz and 400kHz I2C frequencies are supported." I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim = 0; @@ -101,7 +99,6 @@ void i2c_frequency(i2c_t *obj, int hz) { tim = 0x0010020A; // Fast mode break; default: - error("Only 100kHz, 200kHz and 400kHz I2C frequencies are supported."); break; } @@ -212,7 +209,7 @@ int i2c_byte_read(i2c_t *obj, int last) { int timeout; // Wait until the byte is received - timeout = FLAG_TIMEOUT; + timeout = FLAG_TIMEOUT; while (I2C_GetFlagStatus(i2c, I2C_ISR_RXNE) == RESET) { timeout--; if (timeout == 0) { @@ -244,13 +241,13 @@ int i2c_byte_write(i2c_t *obj, int data) { } void i2c_reset(i2c_t *obj) { - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, ENABLE); RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, DISABLE); } //if (obj->i2c == I2C_2) { // RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, ENABLE); - // RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE); + // RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE); //} } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c index c1b6da02e0..1cfc4ba0c5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c @@ -27,10 +27,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -71,24 +71,21 @@ static void init_usart(serial_t *obj) { USART_Cmd(usart, ENABLE); } -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) { // Determine the UART to use (UART_1, UART_2, ...) UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); } if (obj->uart == UART_2) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); } // Configure the UART pins @@ -101,7 +98,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { obj->baudrate = 9600; obj->databits = USART_WordLength_8b; obj->stopbits = USART_StopBits_1; - obj->parity = USART_Parity_No; + obj->parity = USART_Parity_No; init_usart(obj); @@ -140,7 +137,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b obj->parity = USART_Parity_Odd; break; case ParityEven: - case ParityForced1: + case ParityForced1: obj->parity = USART_Parity_Even; break; default: // ParityNone @@ -206,7 +203,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { } else { // TxIrq USART_ITConfig(usart, USART_IT_TC, ENABLE); - } + } NVIC_SetVector(irq_n, vector); NVIC_EnableIRQ(irq_n); @@ -223,12 +220,12 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { else { // TxIrq USART_ITConfig(usart, USART_IT_TXE, DISABLE); // Check if RxIrq is disabled too - if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; + if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; } if (all_disabled) NVIC_DisableIRQ(irq_n); - } + } } /****************************************************************************** diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c index 42cbc4c897..b3e8e126c8 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_NOPULL, GPIO_AF_0)}, @@ -64,11 +64,11 @@ static void init_spi(spi_t *obj) { SPI_Cmd(spi, DISABLE); SPI_InitStructure.SPI_Mode = obj->mode; - SPI_InitStructure.SPI_NSS = obj->nss; - SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; + SPI_InitStructure.SPI_NSS = obj->nss; + SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; SPI_InitStructure.SPI_DataSize = obj->bits; SPI_InitStructure.SPI_CPOL = obj->cpol; - SPI_InitStructure.SPI_CPHA = obj->cpha; + SPI_InitStructure.SPI_CPHA = obj->cpha; SPI_InitStructure.SPI_BaudRatePrescaler = obj->br_presc; SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; SPI_InitStructure.SPI_CRCPolynomial = 7; @@ -90,17 +90,14 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE); } if (obj->spi == SPI_2) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); } // Configure the SPI pins @@ -132,7 +129,7 @@ void spi_free(spi_t *obj) { SPI_I2S_DeInit(spi); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) { // Save new values if (bits == 8) { obj->bits = SPI_DataSize_8b; @@ -152,11 +149,11 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { break; case 2: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_1Edge; + obj->cpha = SPI_CPHA_1Edge; break; default: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_2Edge; + obj->cpha = SPI_CPHA_2Edge; break; } @@ -166,7 +163,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { } else { obj->mode = SPI_Mode_Slave; - obj->nss = SPI_NSS_Hard; + obj->nss = SPI_NSS_Hard; } init_spi(obj); @@ -201,7 +198,7 @@ static inline int ssp_readable(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); // Check if data is received status = ((SPI_I2S_GetFlagStatus(spi, SPI_I2S_FLAG_RXNE) != RESET) ? 1 : 0); - return status; + return status; } static inline int ssp_writeable(spi_t *obj) { @@ -213,7 +210,7 @@ static inline int ssp_writeable(spi_t *obj) { } static inline void ssp_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); if(obj->bits == SPI_DataSize_8b) // 8 bit mode SPI_SendData8(spi, (uint8_t)value); @@ -222,12 +219,12 @@ static inline void ssp_write(spi_t *obj, int value) { } static inline int ssp_read(spi_t *obj) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); if(obj->bits == SPI_DataSize_8b) // 8 bit mode return (int)SPI_ReceiveData8(spi); else // 16 bit mode - return (int)SPI_I2S_ReceiveData16(spi); + return (int)SPI_I2S_ReceiveData16(spi); } static inline int ssp_busy(spi_t *obj) { @@ -250,16 +247,16 @@ int spi_slave_read(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); if(obj->bits == SPI_DataSize_8b) // 8 bit mode return (int)SPI_ReceiveData8(spi); - else - return (int)SPI_I2S_ReceiveData16(spi); + else + return (int)SPI_I2S_ReceiveData16(spi); } void spi_slave_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); - while (!ssp_writeable(obj)); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + while (!ssp_writeable(obj)); if(obj->bits == SPI_DataSize_8b) // 8 bit mode SPI_SendData8(spi, (uint8_t)value); - else + else SPI_I2S_SendData16(spi, (uint16_t)value); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c index 538a89fd24..1eef5ea9b0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #include "wait_api.h" @@ -32,7 +33,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(GPIO_Mode_AIN, 0)}, @@ -53,10 +53,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); @@ -91,7 +88,7 @@ void analogin_init(analogin_t *obj, PinName pin) { ADC_ResetCalibration(adc); while(ADC_GetResetCalibrationStatus(adc)); ADC_StartCalibration(adc); - while(ADC_GetCalibrationStatus(adc)); + while(ADC_GetCalibrationStatus(adc)); } } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c index 9e12e30ce4..639ef9fc07 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c @@ -27,17 +27,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are - not based on accurate values, they just guarantee that the application will - not remain stuck if the I2C communication is corrupted. */ + not based on accurate values, they just guarantee that the application will + not remain stuck if the I2C communication is corrupted. */ #define FLAG_TIMEOUT ((int)0x1000) #define LONG_TIMEOUT ((int)0x8000) @@ -51,19 +51,16 @@ static const PinMap PinMap_I2C_SCL[] = { {NC, NC, 0} }; -void i2c_init(i2c_t *obj, PinName sda, PinName scl) { +void i2c_init(i2c_t *obj, PinName sda, PinName scl) { // Determine the I2C to use I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphClockCmd(RCC_APB1Periph_I2C1, ENABLE); } if (obj->i2c == I2C_2) { @@ -80,7 +77,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { i2c_reset(obj); // I2C configuration - i2c_frequency(obj, 100000); // 100 kHz per default + i2c_frequency(obj, 100000); // 100 kHz per default } void i2c_frequency(i2c_t *obj, int hz) { @@ -110,7 +107,7 @@ inline int i2c_start(i2c_t *obj) { I2C_ClearFlag(i2c, I2C_FLAG_AF); // Clear Acknowledge failure flag // Generate the START condition - I2C_GenerateSTART(i2c, ENABLE); + I2C_GenerateSTART(i2c, ENABLE); // Wait the START condition has been correctly sent timeout = FLAG_TIMEOUT; @@ -155,7 +152,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { i2c_start(obj); // Send slave address for read - I2C_Send7bitAddress(i2c, address, I2C_Direction_Receiver); + I2C_Send7bitAddress(i2c, address, I2C_Direction_Receiver); // Wait address is acknowledged timeout = FLAG_TIMEOUT; @@ -264,7 +261,7 @@ int i2c_byte_write(i2c_t *obj, int data) { I2C_SendData(i2c, (uint8_t)data); // Wait until the byte is transmitted - timeout = FLAG_TIMEOUT; + timeout = FLAG_TIMEOUT; //while (I2C_CheckEvent(i2c, I2C_EVENT_MASTER_BYTE_TRANSMITTED) == ERROR) { while ((I2C_GetFlagStatus(i2c, I2C_FLAG_TXE) == RESET) && (I2C_GetFlagStatus(i2c, I2C_FLAG_BTF) == RESET)) { @@ -278,13 +275,13 @@ int i2c_byte_write(i2c_t *obj, int data) { } void i2c_reset(i2c_t *obj) { - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, ENABLE); RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, DISABLE); } if (obj->i2c == I2C_2) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, ENABLE); - RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE); + RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE); } } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c index c009314f60..4033501c32 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c @@ -27,11 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_PWM[] = { // TIM2 full remap @@ -46,10 +46,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM pinout mapping failed"); - } + assert(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_2) RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c index 45f774f0d6..abfdeac106 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c @@ -27,10 +27,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -73,21 +73,18 @@ static void init_usart(serial_t *obj) { USART_Cmd(usart, ENABLE); } -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) { // Determine the UART to use (UART_1, UART_2, ...) UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); } else if (obj->uart == UART_2 ) { RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); } else if (obj->uart == UART_3 ) { @@ -102,7 +99,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { obj->baudrate = 9600; obj->databits = USART_WordLength_8b; obj->stopbits = USART_StopBits_1; - obj->parity = USART_Parity_No; + obj->parity = USART_Parity_No; init_usart(obj); @@ -142,7 +139,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b obj->parity = USART_Parity_Odd; break; case ParityEven: - case ParityForced1: + case ParityForced1: obj->parity = USART_Parity_Even; break; default: // ParityNone @@ -214,7 +211,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { } else { // TxIrq USART_ITConfig(usart, USART_IT_TC, ENABLE); - } + } NVIC_SetVector(irq_n, vector); NVIC_EnableIRQ(irq_n); @@ -231,12 +228,12 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { else { // TxIrq USART_ITConfig(usart, USART_IT_TXE, DISABLE); // Check if RxIrq is disabled too - if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; + if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; } if (all_disabled) NVIC_DisableIRQ(irq_n); - } + } } /****************************************************************************** diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c index 735a895158..e2e4458f84 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(GPIO_Mode_AF_PP, 0)}, @@ -67,11 +67,11 @@ static void init_spi(spi_t *obj) { SPI_Cmd(spi, DISABLE); SPI_InitStructure.SPI_Mode = obj->mode; - SPI_InitStructure.SPI_NSS = obj->nss; - SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; + SPI_InitStructure.SPI_NSS = obj->nss; + SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; SPI_InitStructure.SPI_DataSize = obj->bits; SPI_InitStructure.SPI_CPOL = obj->cpol; - SPI_InitStructure.SPI_CPHA = obj->cpha; + SPI_InitStructure.SPI_CPHA = obj->cpha; SPI_InitStructure.SPI_BaudRatePrescaler = obj->br_presc; SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; SPI_InitStructure.SPI_CRCPolynomial = 7; @@ -91,14 +91,11 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE); } // Configure the SPI pins @@ -130,7 +127,7 @@ void spi_free(spi_t *obj) { SPI_I2S_DeInit(spi); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) { // Save new values if (bits == 8) { obj->bits = SPI_DataSize_8b; @@ -150,11 +147,11 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { break; case 2: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_1Edge; + obj->cpha = SPI_CPHA_1Edge; break; default: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_2Edge; + obj->cpha = SPI_CPHA_2Edge; break; } @@ -164,7 +161,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { } else { obj->mode = SPI_Mode_Slave; - obj->nss = SPI_NSS_Hard; + obj->nss = SPI_NSS_Hard; } init_spi(obj); @@ -196,7 +193,7 @@ static inline int ssp_readable(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); // Check if data is received status = ((SPI_I2S_GetFlagStatus(spi, SPI_I2S_FLAG_RXNE) != RESET) ? 1 : 0); - return status; + return status; } static inline int ssp_writeable(spi_t *obj) { @@ -208,13 +205,13 @@ static inline int ssp_writeable(spi_t *obj) { } static inline void ssp_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); SPI_I2S_SendData(spi, (uint16_t)value); } static inline int ssp_read(spi_t *obj) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); return (int)SPI_I2S_ReceiveData(spi); } @@ -241,8 +238,8 @@ int spi_slave_read(spi_t *obj) { } void spi_slave_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); - while (!ssp_writeable(obj)); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + while (!ssp_writeable(obj)); SPI_I2S_SendData(spi, (uint16_t)value); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c index 071960ef8d..1ed4c790fc 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #include "wait_api.h" @@ -32,7 +33,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // ADC_IN1 @@ -63,10 +63,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); @@ -168,7 +165,7 @@ static inline uint16_t adc_read(analogin_t *obj) { break; case PA_7: channel = ADC_Channel_15; - break; + break; default: return 0; } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c index 2df1c5140e..15eb9c5653 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c @@ -27,17 +27,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are - not based on accurate values, they just guarantee that the application will - not remain stuck if the I2C communication is corrupted. */ + not based on accurate values, they just guarantee that the application will + not remain stuck if the I2C communication is corrupted. */ #define FLAG_TIMEOUT ((int)0x1000) #define LONG_TIMEOUT ((int)0x8000) @@ -62,19 +62,16 @@ static const PinMap PinMap_I2C_SCL[] = { {NC, NC, 0} }; -void i2c_init(i2c_t *obj, PinName sda, PinName scl) { +void i2c_init(i2c_t *obj, PinName sda, PinName scl) { // Determine the I2C to use I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphClockCmd(RCC_APB1Periph_I2C1, ENABLE); } if (obj->i2c == I2C_2) { @@ -94,10 +91,11 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { i2c_reset(obj); // I2C configuration - i2c_frequency(obj, 100000); // 100 kHz per default + i2c_frequency(obj, 100000); // 100 kHz per default } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim; @@ -140,7 +138,6 @@ void i2c_frequency(i2c_t *obj, int hz) { } break; default: - error("Only 100kHz, 200kHz, 400kHz and 1MHz I2C frequencies are supported."); break; } @@ -252,7 +249,7 @@ int i2c_byte_read(i2c_t *obj, int last) { int timeout; // Wait until the byte is received - timeout = FLAG_TIMEOUT; + timeout = FLAG_TIMEOUT; while (I2C_GetFlagStatus(i2c, I2C_ISR_RXNE) == RESET) { timeout--; if (timeout == 0) { @@ -284,7 +281,7 @@ int i2c_byte_write(i2c_t *obj, int data) { } void i2c_reset(i2c_t *obj) { - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, ENABLE); RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, DISABLE); } @@ -294,7 +291,7 @@ void i2c_reset(i2c_t *obj) { } if (obj->i2c == I2C_3) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C3, ENABLE); - RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C3, DISABLE); + RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C3, DISABLE); } } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c index 11cf12d417..0280860ebd 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c @@ -27,11 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" // TIM2 cannot be used because already used by the us_ticker static const PinMap PinMap_PWM[] = { @@ -85,13 +85,10 @@ static const PinMap PinMap_PWM[] = { {NC, NC, 0} }; -void pwmout_init(pwmout_t* obj, PinName pin) { +void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM pinout mapping failed"); - } + assert(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); @@ -126,7 +123,7 @@ void pwmout_write(pwmout_t* obj, float value) { obj->pulse = (uint32_t)((float)obj->period * value); - // Configure channels + // Configure channels TIM_OCInitStructure.TIM_OCMode = TIM_OCMode_PWM1; TIM_OCInitStructure.TIM_Pulse = obj->pulse; TIM_OCInitStructure.TIM_OCPolarity = TIM_OCPolarity_High; @@ -215,7 +212,7 @@ void pwmout_write(pwmout_t* obj, float value) { break; default: return; - } + } } float pwmout_read(pwmout_t* obj) { @@ -239,7 +236,7 @@ void pwmout_period_us(pwmout_t* obj, int us) { TIM_TimeBaseInitTypeDef TIM_TimeBaseStructure; float dc = pwmout_read(obj); - TIM_Cmd(tim, DISABLE); + TIM_Cmd(tim, DISABLE); obj->period = us; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c index 2a7b487ca7..021bc87a5a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c @@ -27,10 +27,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -85,27 +85,24 @@ static void init_usart(serial_t *obj) { USART_Cmd(usart, ENABLE); } -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) { // Determine the UART to use UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); // Get the peripheral name from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); } if (obj->uart == UART_2) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); } if (obj->uart == UART_3) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART3, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART3, ENABLE); } // Configure the UART pins @@ -118,7 +115,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { obj->baudrate = 9600; obj->databits = USART_WordLength_8b; obj->stopbits = USART_StopBits_1; - obj->parity = USART_Parity_No; + obj->parity = USART_Parity_No; init_usart(obj); @@ -157,7 +154,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b obj->parity = USART_Parity_Odd; break; case ParityEven: - case ParityForced1: + case ParityForced1: obj->parity = USART_Parity_Even; break; default: // ParityNone @@ -233,7 +230,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { USART_ITConfig(usart, USART_IT_RXNE, ENABLE); } else { // TxIrq USART_ITConfig(usart, USART_IT_TC, ENABLE); - } + } NVIC_SetVector(irq_n, vector); NVIC_EnableIRQ(irq_n); @@ -249,12 +246,12 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { } else { // TxIrq USART_ITConfig(usart, USART_IT_TXE, DISABLE); // Check if RxIrq is disabled too - if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; + if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; } if (all_disabled) NVIC_DisableIRQ(irq_n); - } + } } /****************************************************************************** diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c index 9ed17343eb..2dc1517af6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_11, SPI_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_DOWN, GPIO_AF_5)}, @@ -75,17 +75,17 @@ static void init_spi(spi_t *obj) { SPI_Cmd(spi, DISABLE); SPI_InitStructure.SPI_Mode = obj->mode; - SPI_InitStructure.SPI_NSS = obj->nss; - SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; + SPI_InitStructure.SPI_NSS = obj->nss; + SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; SPI_InitStructure.SPI_DataSize = obj->bits; SPI_InitStructure.SPI_CPOL = obj->cpol; - SPI_InitStructure.SPI_CPHA = obj->cpha; + SPI_InitStructure.SPI_CPHA = obj->cpha; SPI_InitStructure.SPI_BaudRatePrescaler = obj->br_presc; SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; SPI_InitStructure.SPI_CRCPolynomial = 7; SPI_Init(spi, &SPI_InitStructure); - SPI_RxFIFOThresholdConfig(spi, SPI_RxFIFOThreshold_QF); + SPI_RxFIFOThresholdConfig(spi, SPI_RxFIFOThreshold_QF); SPI_Cmd(spi, ENABLE); } @@ -101,17 +101,14 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_2) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); } if (obj->spi == SPI_3) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI3, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI3, ENABLE); } // Configure the SPI pins @@ -142,7 +139,7 @@ void spi_free(spi_t *obj) { SPI_I2S_DeInit(spi); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) { // Save new values if (bits == 8) { obj->bits = SPI_DataSize_8b; @@ -161,11 +158,11 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { break; case 2: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_1Edge; + obj->cpha = SPI_CPHA_1Edge; break; default: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_2Edge; + obj->cpha = SPI_CPHA_2Edge; break; } @@ -174,7 +171,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { obj->nss = SPI_NSS_Soft; } else { obj->mode = SPI_Mode_Slave; - obj->nss = SPI_NSS_Hard; + obj->nss = SPI_NSS_Hard; } init_spi(obj); @@ -207,7 +204,7 @@ static inline int ssp_readable(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); // Check if data is received status = ((SPI_I2S_GetFlagStatus(spi, SPI_I2S_FLAG_RXNE) != RESET) ? 1 : 0); - return status; + return status; } static inline int ssp_writeable(spi_t *obj) { @@ -219,7 +216,7 @@ static inline int ssp_writeable(spi_t *obj) { } static inline void ssp_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); if (obj->bits == SPI_DataSize_8b) { SPI_SendData8(spi, (uint8_t)value); @@ -229,7 +226,7 @@ static inline void ssp_write(spi_t *obj, int value) { } static inline int ssp_read(spi_t *obj) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); if (obj->bits == SPI_DataSize_8b) { return (int)SPI_ReceiveData8(spi); @@ -264,8 +261,8 @@ int spi_slave_read(spi_t *obj) { } void spi_slave_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); - while (!ssp_writeable(obj)); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + while (!ssp_writeable(obj)); if (obj->bits == SPI_DataSize_8b) { SPI_SendData8(spi, (uint8_t)value); } else { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c index 7273585439..872b0ccbfa 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c @@ -32,7 +32,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "stm32f4xx_hal.h" static const PinMap PinMap_ADC[] = { @@ -59,13 +58,10 @@ ADC_HandleTypeDef AdcHandle; int adc_inited = 0; -void analogin_init(analogin_t *obj, PinName pin) { +void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC error: pinout mapping failed."); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); @@ -93,8 +89,8 @@ void analogin_init(analogin_t *obj, PinName pin) { AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT; AdcHandle.Init.NbrOfConversion = 1; AdcHandle.Init.DMAContinuousRequests = DISABLE; - AdcHandle.Init.EOCSelection = DISABLE; - HAL_ADC_Init(&AdcHandle); + AdcHandle.Init.EOCSelection = DISABLE; + HAL_ADC_Init(&AdcHandle); } } @@ -120,7 +116,7 @@ static inline uint16_t adc_read(analogin_t *obj) { break; case PA_3: sConfig.Channel = ADC_CHANNEL_3; - break; + break; case PA_4: sConfig.Channel = ADC_CHANNEL_4; break; @@ -132,13 +128,13 @@ static inline uint16_t adc_read(analogin_t *obj) { break; case PA_7: sConfig.Channel = ADC_CHANNEL_7; - break; + break; case PB_0: sConfig.Channel = ADC_CHANNEL_8; break; case PB_1: sConfig.Channel = ADC_CHANNEL_9; - break; + break; case PC_0: sConfig.Channel = ADC_CHANNEL_10; break; @@ -156,7 +152,7 @@ static inline uint16_t adc_read(analogin_t *obj) { break; case PC_5: sConfig.Channel = ADC_CHANNEL_15; - break; + break; default: return 0; } @@ -168,7 +164,7 @@ static inline uint16_t adc_read(analogin_t *obj) { HAL_ADC_PollForConversion(&AdcHandle, 10); // Wait end of conversion if (HAL_ADC_GetState(&AdcHandle) == HAL_ADC_STATE_EOC_REG) - { + { return(HAL_ADC_GetValue(&AdcHandle)); // Get conversion value } else diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c index c478dc5552..493479d750 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c @@ -27,18 +27,18 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "stm32f4xx_hal.h" /* Timeout values for flags and events waiting loops. These timeouts are - not based on accurate values, they just guarantee that the application will - not remain stuck if the I2C communication is corrupted. */ + not based on accurate values, they just guarantee that the application will + not remain stuck if the I2C communication is corrupted. */ #define FLAG_TIMEOUT ((int)0x1000) #define LONG_TIMEOUT ((int)0x8000) @@ -65,19 +65,16 @@ static const PinMap PinMap_I2C_SCL[] = { I2C_HandleTypeDef I2cHandle; -void i2c_init(i2c_t *obj, PinName sda, PinName scl) { +void i2c_init(i2c_t *obj, PinName sda, PinName scl) { // Determine the I2C to use I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C error: pinout mapping failed."); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { __I2C1_CLK_ENABLE(); } if (obj->i2c == I2C_2) { @@ -97,14 +94,15 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { i2c_reset(obj); // I2C configuration - i2c_frequency(obj, 100000); // 100 kHz per default + i2c_frequency(obj, 100000); // 100 kHz per default } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz != 0) && (hz <= 400000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); if ((hz != 0) && (hz <= 400000)) { - // I2C configuration + // I2C configuration I2cHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; I2cHandle.Init.ClockSpeed = hz; I2cHandle.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; @@ -113,10 +111,7 @@ void i2c_frequency(i2c_t *obj, int hz) { I2cHandle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; I2cHandle.Init.OwnAddress1 = 0; I2cHandle.Init.OwnAddress2 = 0; - HAL_I2C_Init(&I2cHandle); - } - else { - error("I2C error: frequency setting failed (max 400kHz)."); + HAL_I2C_Init(&I2cHandle); } } @@ -152,7 +147,7 @@ inline int i2c_stop(i2c_t *obj) { return 0; } -int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { +int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) { if (length == 0) return 0; I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); @@ -208,7 +203,7 @@ int i2c_byte_write(i2c_t *obj, int data) { i2c->DR = (uint8_t)data; // Wait until the byte is transmitted - timeout = FLAG_TIMEOUT; + timeout = FLAG_TIMEOUT; while ((__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_TXE) == RESET) && (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BTF) == RESET)) { if ((timeout--) == 0) { @@ -220,7 +215,7 @@ int i2c_byte_write(i2c_t *obj, int data) { } void i2c_reset(i2c_t *obj) { - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { __I2C1_FORCE_RESET(); __I2C1_RELEASE_RESET(); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c index 7ebc9d4c51..b5ae78d924 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #include "cmsis.h" @@ -87,11 +88,8 @@ static TIM_HandleTypeDef TimHandle; void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM error: pinout mapping failed."); - } - + assert(obj->pwm != (PWMName)NC); + // Enable TIM clock if (obj->pwm == PWM_1) __TIM1_CLK_ENABLE(); if (obj->pwm == PWM_2) __TIM2_CLK_ENABLE(); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c index 4495626de3..a2570031ed 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c @@ -30,7 +30,6 @@ #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include #include "stm32f4xx_hal.h" @@ -73,20 +72,17 @@ static void init_uart(serial_t *obj) { UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE; UartHandle.Init.Mode = UART_MODE_TX_RX; - HAL_UART_Init(&UartHandle); + HAL_UART_Init(&UartHandle); } -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) { // Determine the UART to use (UART_1, UART_2, ...) UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial error: pinout mapping failed."); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { @@ -109,7 +105,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { obj->baudrate = 9600; obj->databits = UART_WORDLENGTH_8B; obj->stopbits = UART_STOPBITS_1; - obj->parity = UART_PARITY_NONE; + obj->parity = UART_PARITY_NONE; init_uart(obj); @@ -149,7 +145,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b obj->parity = UART_PARITY_ODD; break; case ParityEven: - case ParityForced1: + case ParityForced1: obj->parity = UART_PARITY_EVEN; break; default: // ParityNone @@ -225,7 +221,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { } else { // TxIrq __HAL_UART_ENABLE_IT(&UartHandle, UART_IT_TC); - } + } NVIC_SetVector(irq_n, vector); NVIC_EnableIRQ(irq_n); @@ -242,12 +238,12 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { else { // TxIrq __HAL_UART_DISABLE_IT(&UartHandle, UART_IT_TXE); // Check if RxIrq is disabled too - if ((UartHandle.Instance->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; + if ((UartHandle.Instance->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; } if (all_disabled) NVIC_DisableIRQ(irq_n); - } + } } /****************************************************************************** diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c index 345ca66935..7723eb95a9 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c @@ -34,7 +34,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "stm32f4xx_hal.h" static const PinMap PinMap_SPI_MOSI[] = { @@ -112,10 +111,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI error: pinout mapping failed."); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { @@ -157,7 +153,7 @@ void spi_free(spi_t *obj) { HAL_SPI_DeInit(&SpiHandle); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) { // Save new values if (bits == 8) { obj->bits = SPI_DATASIZE_8BIT; @@ -177,11 +173,11 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { break; case 2: obj->cpol = SPI_POLARITY_HIGH; - obj->cpha = SPI_PHASE_1EDGE; + obj->cpha = SPI_PHASE_1EDGE; break; default: obj->cpol = SPI_POLARITY_HIGH; - obj->cpha = SPI_PHASE_2EDGE; + obj->cpha = SPI_PHASE_2EDGE; break; } @@ -191,7 +187,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { } else { obj->mode = SPI_MODE_SLAVE; - obj->nss = SPI_NSS_HARD_INPUT; + obj->nss = SPI_NSS_HARD_INPUT; } init_spi(obj); @@ -231,7 +227,7 @@ static inline int ssp_readable(spi_t *obj) { SpiHandle.Instance = (SPI_TypeDef *)(obj->spi); // Check if data is received status = ((__HAL_SPI_GET_FLAG(&SpiHandle, SPI_FLAG_RXNE) != RESET) ? 1 : 0); - return status; + return status; } static inline int ssp_writeable(spi_t *obj) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c index 7283390b16..90e1fa217b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -63,10 +64,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); @@ -86,7 +84,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Configure ADC ADC_InitStructure.ADC_Resolution = ADC_Resolution_12b; - ADC_InitStructure.ADC_ContinuousConvMode = DISABLE; + ADC_InitStructure.ADC_ContinuousConvMode = DISABLE; ADC_InitStructure.ADC_ExternalTrigConvEdge = ADC_ExternalTrigConvEdge_None; ADC_InitStructure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_TRGO; ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c index 1810771f82..bcaf274239 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(pin != (PinName)NC); + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c index 82f7a4c1a2..0add1b5c5e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c @@ -27,17 +27,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are - not based on accurate values, they just guarantee that the application will - not remain stuck if the I2C communication is corrupted. */ + not based on accurate values, they just guarantee that the application will + not remain stuck if the I2C communication is corrupted. */ #define FLAG_TIMEOUT ((int)0x1000) #define LONG_TIMEOUT ((int)0x8000) @@ -55,19 +55,16 @@ static const PinMap PinMap_I2C_SCL[] = { {NC, NC, 0} }; -void i2c_init(i2c_t *obj, PinName sda, PinName scl) { +void i2c_init(i2c_t *obj, PinName sda, PinName scl) { // Determine the I2C to use I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphClockCmd(RCC_APB1Periph_I2C1, ENABLE); RCC_I2CCLKConfig(RCC_I2C1CLK_SYSCLK); } @@ -85,10 +82,11 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { i2c_reset(obj); // I2C configuration - i2c_frequency(obj, 100000); // 100 kHz per default + i2c_frequency(obj, 100000); // 100 kHz per default } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim = 0; @@ -131,7 +129,6 @@ void i2c_frequency(i2c_t *obj, int hz) { } break; default: - error("Only 100kHz, 200kHz, 400kHz and 1MHz I2C frequencies are supported."); break; } @@ -227,7 +224,7 @@ int i2c_byte_read(i2c_t *obj, int last) { int timeout; // Wait until the byte is received - timeout = FLAG_TIMEOUT; + timeout = FLAG_TIMEOUT; while (I2C_GetFlagStatus(i2c, I2C_ISR_RXNE) == RESET) { timeout--; if (timeout == 0) { @@ -259,13 +256,13 @@ int i2c_byte_write(i2c_t *obj, int data) { } void i2c_reset(i2c_t *obj) { - if (obj->i2c == I2C_1) { + if (obj->i2c == I2C_1) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, ENABLE); RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, DISABLE); } if (obj->i2c == I2C_2) { RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, ENABLE); - RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE); + RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE); } } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c index 0c85334b1f..80038355fe 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #if DEVICE_PWMOUT #include "cmsis.h" #include "pinmap.h" -#include "error.h" // TIM1 cannot be used because already used by the us_ticker static const PinMap PinMap_PWM[] = { @@ -65,10 +65,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM pinout mapping failed"); - } + assert(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == TIM_3) RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c index 63027e8c04..1fdf4bb114 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #if DEVICE_SERIAL #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -44,7 +44,7 @@ static const PinMap PinMap_UART_TX[] = { }; static const PinMap PinMap_UART_RX[] = { - {PA_3, UART_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, + {PA_3, UART_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, {PA_10, UART_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, {PA_15, UART_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, {PB_7, UART_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_0)}, @@ -77,24 +77,21 @@ static void init_usart(serial_t *obj) { USART_Cmd(usart, ENABLE); } -void serial_init(serial_t *obj, PinName tx, PinName rx) { +void serial_init(serial_t *obj, PinName tx, PinName rx) { // Determine the UART to use (UART_1, UART_2, ...) UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); } if (obj->uart == UART_2) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); } // Configure the UART pins @@ -107,7 +104,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { obj->baudrate = 9600; obj->databits = USART_WordLength_8b; obj->stopbits = USART_StopBits_1; - obj->parity = USART_Parity_No; + obj->parity = USART_Parity_No; init_usart(obj); @@ -146,7 +143,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b obj->parity = USART_Parity_Odd; break; case ParityEven: - case ParityForced1: + case ParityForced1: obj->parity = USART_Parity_Even; break; default: // ParityNone @@ -212,7 +209,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { } else { // TxIrq USART_ITConfig(usart, USART_IT_TC, ENABLE); - } + } NVIC_SetVector(irq_n, vector); NVIC_EnableIRQ(irq_n); @@ -229,12 +226,12 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) { else { // TxIrq USART_ITConfig(usart, USART_IT_TXE, DISABLE); // Check if RxIrq is disabled too - if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; + if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1; } if (all_disabled) NVIC_DisableIRQ(irq_n); - } + } } /****************************************************************************** diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c index 35cb465b9d..7a86a1eef4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_NOPULL, GPIO_AF_0)}, @@ -72,11 +72,11 @@ static void init_spi(spi_t *obj) { SPI_Cmd(spi, DISABLE); SPI_InitStructure.SPI_Mode = obj->mode; - SPI_InitStructure.SPI_NSS = obj->nss; - SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; + SPI_InitStructure.SPI_NSS = obj->nss; + SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; SPI_InitStructure.SPI_DataSize = obj->bits; SPI_InitStructure.SPI_CPOL = obj->cpol; - SPI_InitStructure.SPI_CPHA = obj->cpha; + SPI_InitStructure.SPI_CPHA = obj->cpha; SPI_InitStructure.SPI_BaudRatePrescaler = obj->br_presc; SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; SPI_InitStructure.SPI_CRCPolynomial = 7; @@ -98,17 +98,14 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } - + assert(obj->spi != (SPIName)NC); + // Enable SPI clock if (obj->spi == SPI_1) { - RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE); } if (obj->spi == SPI_2) { - RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); } // Configure the SPI pins @@ -140,7 +137,7 @@ void spi_free(spi_t *obj) { SPI_I2S_DeInit(spi); } -void spi_format(spi_t *obj, int bits, int mode, int slave) { +void spi_format(spi_t *obj, int bits, int mode, int slave) { // Save new values if (bits == 8) { obj->bits = SPI_DataSize_8b; @@ -160,11 +157,11 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { break; case 2: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_1Edge; + obj->cpha = SPI_CPHA_1Edge; break; default: obj->cpol = SPI_CPOL_High; - obj->cpha = SPI_CPHA_2Edge; + obj->cpha = SPI_CPHA_2Edge; break; } @@ -174,7 +171,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) { } else { obj->mode = SPI_Mode_Slave; - obj->nss = SPI_NSS_Hard; + obj->nss = SPI_NSS_Hard; } init_spi(obj); @@ -214,7 +211,7 @@ static inline int ssp_readable(spi_t *obj) { SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); // Check if data is received status = ((SPI_I2S_GetFlagStatus(spi, SPI_I2S_FLAG_RXNE) != RESET) ? 1 : 0); - return status; + return status; } static inline int ssp_writeable(spi_t *obj) { @@ -226,7 +223,7 @@ static inline int ssp_writeable(spi_t *obj) { } static inline void ssp_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_writeable(obj)); if (obj->bits == SPI_DataSize_8b) { SPI_SendData8(spi, (uint8_t)value); @@ -237,7 +234,7 @@ static inline void ssp_write(spi_t *obj, int value) { } static inline int ssp_read(spi_t *obj) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); while (!ssp_readable(obj)); if (obj->bits == SPI_DataSize_8b) { return (int)SPI_ReceiveData8(spi); @@ -274,8 +271,8 @@ int spi_slave_read(spi_t *obj) { } void spi_slave_write(spi_t *obj, int value) { - SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); - while (!ssp_writeable(obj)); + SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi); + while (!ssp_writeable(obj)); if (obj->bits == SPI_DataSize_8b) { SPI_SendData8(spi, (uint8_t)value); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c index 6eb3ad2b70..56187133fe 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c @@ -25,13 +25,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "wait_api.h" static const PinMap PinMap_ADC[] = { @@ -62,10 +62,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c index 68c032d323..5a87f92533 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are not based on accurate values, they just guarantee that the application will @@ -61,10 +61,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -245,7 +242,7 @@ int i2c_byte_write(i2c_t *obj, int data) { I2C_SendData(i2c, (uint8_t)data); // Wait until the byte is transmitted - timeout = FLAG_TIMEOUT; + timeout = FLAG_TIMEOUT; while ((I2C_GetFlagStatus(i2c, I2C_FLAG_TXE) == RESET) && (I2C_GetFlagStatus(i2c, I2C_FLAG_BTF) == RESET)) { timeout--; @@ -317,7 +314,7 @@ int i2c_slave_receive(i2c_t *obj) { break; } - // clear ADDR + // clear ADDR if((retValue == WriteAddressed) || (retValue == ReadAddressed)){ // read SR to clear ADDR flag i2c->SR1; @@ -327,12 +324,12 @@ int i2c_slave_receive(i2c_t *obj) { if(I2C_GetFlagStatus(i2c, I2C_FLAG_STOPF) == SET) { // read SR1 and write CR1 to clear STOP flag i2c->SR1; - I2C_Cmd(i2c, ENABLE); + I2C_Cmd(i2c, ENABLE); } // clear AF if(I2C_GetFlagStatus(i2c, I2C_FLAG_AF) == SET) { I2C_ClearFlag(i2c, I2C_FLAG_AF); - } + } } return(retValue); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c index e12688196b..22c8c17dc4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #if DEVICE_PWMOUT #include "cmsis.h" #include "pinmap.h" -#include "error.h" // TIM4 cannot be used because already used by the us_ticker static const PinMap PinMap_PWM[] = { @@ -76,10 +76,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM pinout mapping failed"); - } + assert(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c index e810885042..66f898ec89 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #if DEVICE_SERIAL #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -87,10 +87,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c index d7f40e9902..f130a2e86b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(GPIO_Mode_AF_PP, 0)}, @@ -95,10 +95,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c index f0467de01f..2e91f761ac 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -32,7 +33,6 @@ #include "wait_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // ADC_IN1 @@ -63,10 +63,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c index cb34f694e6..5c5b843a20 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c @@ -25,13 +25,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogout_api.h" #if DEVICE_ANALOGOUT #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define DAC_RANGE (0xFFF) // 12 bits @@ -46,10 +46,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); dac = (DAC_TypeDef *)(obj->dac); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c index 7a2c93962d..e74a2eaf8b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are not based on accurate values, they just guarantee that the application will @@ -68,10 +68,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -98,6 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim = 0; @@ -140,7 +138,6 @@ void i2c_frequency(i2c_t *obj, int hz) { } break; default: - error("Only 100kHz, 200kHz, 400kHz and 1MHz I2C frequencies are supported."); break; } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c index 89907255f5..0ff6edbd92 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #if DEVICE_SERIAL #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -95,10 +95,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c index 67d890ccbe..d496998de5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_11, SPI_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_DOWN, GPIO_AF_5)}, @@ -101,10 +101,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_2) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c index 9be09ab146..30f5b4823d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -32,7 +33,6 @@ #include "wait_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN0 @@ -61,10 +61,7 @@ int adc_inited = 0; void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC error: pinout mapping failed."); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c index 2531c9c522..36aa471089 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are not based on accurate values, they just guarantee that the application will @@ -66,10 +66,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C error: pinout mapping failed."); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -99,6 +96,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz != 0) && (hz <= 400000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); if ((hz != 0) && (hz <= 400000)) { @@ -111,13 +109,11 @@ void i2c_frequency(i2c_t *obj, int hz) { I2cHandle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; I2cHandle.Init.OwnAddress1 = 0; I2cHandle.Init.OwnAddress2 = 0; - HAL_I2C_Init(&I2cHandle); + HAL_I2C_Init(&I2cHandle); if(obj->slave) { /* Enable Address Acknowledge */ I2cHandle.Instance->CR1 |= I2C_CR1_ACK; - } - } else { - error("I2C error: frequency setting failed (max 400kHz)."); + } } } @@ -344,12 +340,12 @@ int i2c_slave_receive(i2c_t *obj) { if(__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_BUSY) == 1) { if(__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_ADDR) == 1) { if(__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_TRA) == 1) - retValue = ReadAddressed; + retValue = ReadAddressed; else - retValue = WriteAddressed; + retValue = WriteAddressed; __HAL_I2C_CLEAR_FLAG(&I2cHandle, I2C_FLAG_ADDR); - } + } } return(retValue); @@ -372,7 +368,7 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) { if (Timeout == 0) { return 0; } - } + } /* Read data from DR */ (*data++) = I2cHandle.Instance->DR; @@ -394,7 +390,7 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) { if (Timeout == 0) { return 0; } - } + } /* Clear STOP flag */ __HAL_I2C_CLEAR_STOPFLAG(&I2cHandle); @@ -427,7 +423,7 @@ int i2c_slave_write(i2c_t *obj, const char *data, int length) { if (Timeout == 0) { return 0; } - } + } /* Write data to DR */ @@ -451,7 +447,7 @@ int i2c_slave_write(i2c_t *obj, const char *data, int length) { if (Timeout == 0) { return 0; } - } + } /* Clear AF flag */ diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c index 65732b0b05..dd560ba565 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #if DEVICE_SERIAL #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -85,10 +85,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial error: pinout mapping failed."); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c index 52c271499b..92239be5d6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, @@ -111,10 +111,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI error: pinout mapping failed."); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c index a24d97c689..f12f53f7b3 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -32,7 +33,6 @@ #include "wait_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN0 @@ -61,10 +61,7 @@ int adc_inited = 0; void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC error: pinout mapping failed."); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c index f1e9cede57..407519ffbd 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogout_api.h" #if DEVICE_ANALOGOUT @@ -49,10 +50,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_DAC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c index 87eb705842..b3648359e3 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(pin != (PinName)NC); + assert(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c index 4f21da18ad..19c8d3a007 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C @@ -65,10 +66,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C error: pinout mapping failed."); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -92,6 +90,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz == 100000) || (hz == 400000) || (hz == 1000000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); // Common settings: I2C clock = 32 MHz, Analog filter = ON, Digital filter coefficient = 0 @@ -106,7 +105,6 @@ void i2c_frequency(i2c_t *obj, int hz) { I2cHandle.Init.Timing = 0x0030040E; // Fast mode Plus with Rise Time = 60ns and Fall Time = 100ns break; default: - error("Only 100kHz, 400kHz and 1MHz I2C frequencies are supported."); break; } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c index c047c2604f..5f34f19bb1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #if DEVICE_SERIAL #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -98,10 +98,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial error: pinout mapping failed."); - } + assert(obj->uart != (UARTName)NC); // Enable UART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c index 1dbcf14c44..b59c426862 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, @@ -105,10 +105,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI error: pinout mapping failed."); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c index 9c6a4a6f33..c45b2a3521 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c @@ -25,13 +25,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include "wait_api.h" static const PinMap PinMap_ADC[] = { @@ -66,10 +66,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c index 7d579e6b59..cc2145a8a1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c @@ -25,13 +25,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogout_api.h" #if DEVICE_ANALOGOUT #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define RANGE_12BIT (0xFFF) @@ -46,10 +46,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac != (DACName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_DAC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c index aef949f047..2530e96f9e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c @@ -27,13 +27,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" + /* Timeout values for flags and events waiting loops. These timeouts are not based on accurate values, they just guarantee that the application will @@ -61,10 +62,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c index 5b8521e1cf..57c8231d8d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #if DEVICE_PWMOUT #include "cmsis.h" #include "pinmap.h" -#include "error.h" // TIM5 cannot be used because already used by the us_ticker static const PinMap PinMap_PWM[] = { @@ -77,10 +77,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM pinout mapping failed"); - } + assert(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_2) RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c index d4b0661c29..ed8532efd8 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #if DEVICE_SERIAL #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -91,10 +91,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c index 560447b0b6..140ee69de1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_7, SPI_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_SPI1)}, @@ -105,10 +105,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c index 1733895d99..5db72b622e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c @@ -25,6 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogin_api.h" #include "wait_api.h" @@ -32,7 +33,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_ADC[] = { {PA_0, ADC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // ADC_IN1 @@ -63,10 +63,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - - if (obj->adc == (ADCName)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc == (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c index cd768bc739..b491cba225 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c @@ -25,13 +25,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "analogout_api.h" #if DEVICE_ANALOGOUT #include "cmsis.h" #include "pinmap.h" -#include "error.h" #define RANGE_12BIT (0xFFF) @@ -46,10 +46,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - - if (obj->dac == (DACName)NC) { - error("DAC pin mapping failed"); - } + assert(obj->dac == (DACName)NC); dac = (DAC_TypeDef *)(obj->dac); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c index c6e24a6e91..56b2e6aede 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c @@ -27,13 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "i2c_api.h" #if DEVICE_I2C #include "cmsis.h" #include "pinmap.h" -#include "error.h" /* Timeout values for flags and events waiting loops. These timeouts are not based on accurate values, they just guarantee that the application will @@ -68,10 +68,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - - if (obj->i2c == (I2CName)NC) { - error("I2C pin mapping failed"); - } + assert(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -98,6 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { + assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim; @@ -140,7 +138,6 @@ void i2c_frequency(i2c_t *obj, int hz) { } break; default: - error("Only 100kHz, 200kHz, 400kHz and 1MHz I2C frequencies are supported."); break; } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c index 1d83cdb6e2..bb250b050f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c @@ -27,11 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" // TIM2 cannot be used because already used by the us_ticker static const PinMap PinMap_PWM[] = { @@ -88,10 +88,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - - if (obj->pwm == (PWMName)NC) { - error("PWM pinout mapping failed"); - } + assert(obj->pwm == (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c index b7a8181240..9ff2d5c5af 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c @@ -27,10 +27,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" #include static const PinMap PinMap_UART_TX[] = { @@ -92,10 +92,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - - if (obj->uart == (UARTName)NC) { - error("Serial pinout mapping failed"); - } + assert(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c index 67d890ccbe..c8a2c0faed 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -34,7 +35,6 @@ #include #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_MOSI[] = { {PA_11, SPI_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_DOWN, GPIO_AF_5)}, @@ -102,9 +102,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - if (obj->spi == (SPIName)NC) { - error("SPI pinout mapping failed"); - } + assert(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_2) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c index e35b893886..8bbda47324 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -48,9 +49,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - if (obj->adc == (uint32_t)NC) { - error("ADC pin mapping failed"); - } + assert(obj->adc != (uint32_t)NC); // ensure power is turned on RCC->AHB1ENR |= RCC_AHB1ENR_GPIOAEN | RCC_AHB1ENR_GPIOBEN | diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c index 2b930cf23e..ea79a8402c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "i2c_api.h" #if DEVICE_I2C @@ -124,10 +125,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - - if ((int)obj->i2c == NC) { - error("I2C pin mapping failed"); - } + assert((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c index 9b2a4ac425..f51a9be39f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include #include "spi_api.h" #if DEVICE_SPI @@ -20,7 +21,6 @@ #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const PinMap PinMap_SPI_SCLK[] = { {PA_5, SPI_1, STM_PIN_DATA(2, 5)}, @@ -57,7 +57,7 @@ static const PinMap PinMap_SPI_SSEL[] = { {PA_4, SPI_3, STM_PIN_DATA(2, 6)}, {PA_15, SPI_1, STM_PIN_DATA(2, 5)}, {PA_15, SPI_3, STM_PIN_DATA(2, 6)}, - {PB_9, SPI_2, STM_PIN_DATA(2, 5)}, + {PB_9, SPI_2, STM_PIN_DATA(2, 5)}, {PB_12, SPI_2, STM_PIN_DATA(2, 5)}, {NC, NC, 0} }; @@ -75,9 +75,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_TypeDef*)pinmap_merge(spi_data, spi_cntl); - if ((int)obj->spi == NC) { - error("SPI pinout mapping failed"); - } + assert((int)obj->spi != NC) // enable power and clocking switch ((int)obj->spi) { @@ -123,12 +121,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { + assert((bits == 8 || bits == 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); - - if (!(bits == 8 || bits == 16) || !(mode >= 0 && mode <= 3)) { - error("SPI format error"); - } - int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; From 60276a7cac0995568176ceafa318b285d7f53290 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Tue, 20 May 2014 16:41:30 +0100 Subject: [PATCH 05/13] __ASSERT_MSG macro for uvision, corrections in LPC targets - serial - assert --- .../targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c | 3 ++- .../targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c | 3 ++- .../hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c | 3 ++- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c | 3 ++- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c | 3 ++- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c | 3 ++- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c | 3 ++- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c | 3 ++- workspace_tools/export/uvision4.py | 2 +- workspace_tools/toolchains/arm.py | 6 ++++-- 11 files changed, 22 insertions(+), 12 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c index 4854c3bac7..e9274fe5f2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c @@ -205,7 +205,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c index 24afea0403..84ca644eb9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c @@ -187,7 +187,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c index 09c2c86f92..59b61d5268 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c @@ -183,7 +183,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c index 32a68f7607..a71811bc01 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c @@ -186,7 +186,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c index e4e2bc3166..0e1ee53ee4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c @@ -198,7 +198,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 6) || (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits - assert(parity < (ParityEven + 1)); + assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); stop_bits -= 1; data_bits -= 7; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c index 5f6f7fbec7..ec1af1b26e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c @@ -246,7 +246,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c index 2076a1ccd8..72a2c7281a 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c @@ -219,7 +219,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c index a7b299c474..08b0bc2e73 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c @@ -209,7 +209,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c index c965cd9517..6755328420 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c @@ -194,7 +194,8 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert(parity < (ParityForced0 + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; data_bits -= 5; diff --git a/workspace_tools/export/uvision4.py b/workspace_tools/export/uvision4.py index 1a6a838ad7..6a7033cd7c 100644 --- a/workspace_tools/export/uvision4.py +++ b/workspace_tools/export/uvision4.py @@ -103,7 +103,7 @@ class Uvision4(Exporter): 'scatter_file': self.resources.linker_script, 'object_files': self.resources.objects + self.resources.libraries, 'source_files': source_files.items(), - 'symbols': self.toolchain.get_symbols(), + 'symbols': self.toolchain.get_symbols() + ['__ASSERT_MSG'], 'hex_files' : self.resources.hex_files, 'flags' : self.get_flags(), } diff --git a/workspace_tools/toolchains/arm.py b/workspace_tools/toolchains/arm.py index 29947783db..8417d3c1d0 100644 --- a/workspace_tools/toolchains/arm.py +++ b/workspace_tools/toolchains/arm.py @@ -142,6 +142,8 @@ class ARM(mbedToolchain): class ARM_STD(ARM): def __init__(self, target, options=None, notify=None, macros=None): ARM.__init__(self, target, options, notify, macros) + self.cc += ["-D__ASSERT_MSG"] + self.cppc += ["-D__ASSERT_MSG"] self.ld.append("--libpath=%s" % ARM_LIB) @@ -153,8 +155,8 @@ class ARM_MICRO(ARM): # Compiler self.asm += ["-D__MICROLIB"] - self.cc += ["--library_type=microlib", "-D__MICROLIB"] - self.cppc += ["--library_type=microlib", "-D__MICROLIB"] + self.cc += ["--library_type=microlib", "-D__MICROLIB", "-D__ASSERT_MSG"] + self.cppc += ["--library_type=microlib", "-D__MICROLIB", "-D__ASSERT_MSG"] # Linker self.ld.append("--library_type=microlib") From 906a6745a932b85222e08ca59956fb11cb66d674 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Tue, 20 May 2014 16:55:59 +0100 Subject: [PATCH 06/13] assert - logic corrections --- .../TARGET_NXP/TARGET_LPC11U6X/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c | 2 +- .../TARGET_NXP/TARGET_LPC11UXX/serial_api.c | 2 +- .../TARGET_LPC11XX_11CXX/serial_api.c | 2 +- .../TARGET_NXP/TARGET_LPC13XX/serial_api.c | 2 +- .../TARGET_NXP/TARGET_LPC15XX/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c | 2 +- .../TARGET_NXP/TARGET_LPC176X/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC176X/spi_api.c | 2 +- .../TARGET_NXP/TARGET_LPC23XX/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c | 2 +- .../TARGET_NXP/TARGET_LPC408X/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC408X/spi_api.c | 2 +- .../TARGET_NXP/TARGET_LPC43XX/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC81X/i2c_api.c | 3 +-- .../hal/TARGET_NXP/TARGET_LPC81X/serial_api.c | 23 ++++++++----------- .../hal/TARGET_NXP/TARGET_LPC81X/spi_api.c | 2 +- .../hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c | 2 +- 19 files changed, 27 insertions(+), 33 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c index e9274fe5f2..d5c947666c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c @@ -204,7 +204,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c index 6bc0c81eea..d173a0dd57 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c @@ -69,7 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP0_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi == NC); + assert((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c index 84ca644eb9..0b0cbf0f2f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c @@ -186,7 +186,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c index 59b61d5268..32c4c84ce2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c @@ -182,7 +182,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c index a71811bc01..20ff232523 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c @@ -185,7 +185,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c index 0e1ee53ee4..2dd288883e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c @@ -197,7 +197,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 6) || (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits + assert((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c index 81455d5329..38ca0c53a8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c @@ -127,7 +127,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { spi_disable(obj); - assert((bits >= 1 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert((bits >= 1 && bits <= 16) && (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c index ec1af1b26e..e7c8902907 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c @@ -245,7 +245,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c index 66ec890c18..cd6f7ae713 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c @@ -97,7 +97,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert(((bits >= 4) && (bits <= 16)) && (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c index 72a2c7281a..1cf9b7ed17 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c @@ -218,7 +218,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c index 63c703c474..2aa2a9f5ce 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c @@ -95,7 +95,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert(((bits >= 4) && (bits <= 16)) && (((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c index 08b0bc2e73..bc4e0fba11 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c @@ -208,7 +208,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c index 9ee4fe5479..3be9df6bb4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c @@ -116,7 +116,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert(((bits >= 4) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c index 6755328420..434067d2f3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c @@ -193,7 +193,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c index 0cee578fe7..85d27e8064 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c @@ -85,7 +85,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/i2c_api.c index f6424724c8..c0de44279d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/i2c_api.c @@ -16,7 +16,6 @@ #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" -#include "error.h" static const SWM_Map SWM_I2C_SDA[] = { {7, 24}, @@ -50,7 +49,7 @@ static inline void i2c_interface_enable(i2c_t *obj) { } static inline void i2c_power_enable(i2c_t *obj) { - LPC_SYSCON->SYSAHBCLKCTRL |= (1<<5); + LPC_SYSCON->SYSAHBCLKCTRL |= (1<<5); LPC_SYSCON->PRESETCTRL &= ~(0x1<<6); LPC_SYSCON->PRESETCTRL |= (0x1<<6); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c index d71d91c52d..7d90377179 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c @@ -14,6 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation +#include #include #include @@ -180,15 +181,10 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { // 0: 1 stop bits, 1: 2 stop bits - if (stop_bits != 1 && stop_bits != 2) { - error("Invalid stop bits specified"); - } + assert((stop_bits == 1) || (stop_bits == 2)); + assert((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits + assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); stop_bits -= 1; - - // 0: 7 data bits ... 2: 9 data bits - if (data_bits < 7 || data_bits > 9) { - error("Invalid number of bits (%d) in serial format, should be 7..9", data_bits); - } data_bits -= 7; int paritysel; @@ -197,8 +193,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b case ParityEven: paritysel = 2; break; case ParityOdd : paritysel = 3; break; default: - error("Invalid serial parity setting"); - return; + break; } obj->uart->CFG = (data_bits << 2) @@ -296,7 +291,7 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi uint32_t regVal_rts, regVal_cts; swm_rts = &SWM_UART_RTS[obj->index]; - swm_cts = &SWM_UART_CTS[obj->index]; + swm_cts = &SWM_UART_CTS[obj->index]; regVal_rts = LPC_SWM->PINASSIGN[swm_rts->n] & ~(0xFF << swm_rts->offset); regVal_cts = LPC_SWM->PINASSIGN[swm_cts->n] & ~(0xFF << swm_cts->offset); @@ -310,15 +305,15 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (rxflow << swm_rts->offset); if (FlowControlRTS == type) { LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (0xFF << swm_cts->offset); - obj->uart->CFG &= ~CTSEN; + obj->uart->CFG &= ~CTSEN; } } if ((FlowControlCTS == type || FlowControlRTSCTS == type) && (txflow != NC)) { LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (txflow << swm_cts->offset); obj->uart->CFG |= CTSEN; if (FlowControlCTS == type) { - LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (0xFF << swm_rts->offset); + LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (0xFF << swm_rts->offset); } - } + } } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c index 9c3de9534f..63e6e07fae 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c @@ -116,7 +116,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits >= 1 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert(((bits >= 1) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c index f51a9be39f..c6c57a8feb 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c @@ -121,7 +121,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits == 8 || bits == 16) || (mode >= 0 && mode <= 3)); + assert(((bits == 8) || (bits == 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; From 0306d52fc5325fc531f2387c0a9529fb6d7fe383 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 21 May 2014 14:33:42 +0100 Subject: [PATCH 07/13] [K20, LCP1768, F100RB] asserts corrections --- .../hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c | 2 +- .../targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c | 2 +- .../hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index ec6d59ea38..42882d0df9 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -117,7 +117,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); - assert(parity < (ParityEven + 1)); + assert((parity == ParityEven) || (parity == ParityOdd) || (parity == ParityEven)); assert((data_bits == 8) || (data_bits == 9)); assert((data_bits == 2) && (obj->index != 0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c index 4804db09d3..7b005b84c5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c @@ -26,7 +26,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac == (DACName)NC); + assert(obj->dac != (DACName)NC); // power is on by default, set DAC clk divider is /4 LPC_SC->PCLKSEL0 &= ~(0x3 << 22); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h index f338e08ae9..ba450a6fc9 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h @@ -49,9 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - if (obj->pin == (PinName)NC) - return; - + assert(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -61,8 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - if (obj->pin == (PinName)NC) - return 0; + assert(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } From f9091a237c9e3bfa063efa35c14659563f2ccb70 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 28 May 2014 08:23:28 +0200 Subject: [PATCH 08/13] [Freescale targets] - spi, serial assers corrections - reverted gpio change in TARGET_LPC11U6X --- .../TARGET_Freescale/TARGET_K20D5M/serial_api.c | 2 +- .../hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c | 2 +- .../TARGET_KLXX/TARGET_KL05Z/spi_api.c | 2 +- .../TARGET_KLXX/TARGET_KL25Z/spi_api.c | 2 +- .../TARGET_KLXX/TARGET_KL46Z/spi_api.c | 2 +- .../hal/TARGET_Freescale/TARGET_KLXX/serial_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c | 14 ++++++++++++-- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index 42882d0df9..fec37874f6 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -117,7 +117,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); - assert((parity == ParityEven) || (parity == ParityOdd) || (parity == ParityEven)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); assert((data_bits == 8) || (data_bits == 9)); assert((data_bits == 2) && (obj->index != 0)); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c index 6d99905305..f7f99951fc 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c @@ -92,7 +92,7 @@ void spi_free(spi_t *obj) { } void spi_format(spi_t *obj, int bits, int mode, int slave) { assert((bits == 8) || (bits == 16)); - assert((mode > -1) && (mode < 4)); + assert((mode >= 0) && (mode <= 3)); uint32_t polarity = (mode & 0x2) ? 1 : 0; uint32_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c index 9fc33672d3..ac47fe0c33 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c @@ -85,7 +85,7 @@ void spi_free(spi_t *obj) { } void spi_format(spi_t *obj, int bits, int mode, int slave) { assert(bits == 8); - assert((mode > -1) && (mode < 4)); + assert((mode >= 0) && (mode <= 3)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c index d4b4301852..765db614f2 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c @@ -65,7 +65,7 @@ void spi_free(spi_t *obj) { } void spi_format(spi_t *obj, int bits, int mode, int slave) { assert(bits == 8); - assert((mode > -1) && (mode < 4)); + assert((mode >= 0) && (mode <= 3)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c index b14ddabc52..badc7c1a45 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c @@ -124,7 +124,7 @@ void spi_free(spi_t *obj) { } void spi_format(spi_t *obj, int bits, int mode, int slave) { assert((bits == 8) || (bits == 16)); - assert((mode > -1) && (mode < 4)); + assert((mode >= 0) && (mode <= 3)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c index f5c7d012a8..2d5d121e18 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c @@ -149,7 +149,7 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { assert((stop_bits == 1) || (stop_bits == 2)); - assert(parity < (ParityEven + 1)); + assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); assert(data_bits == 8); // TODO: Support other number of data bits (also in the write method!) // save C2 state diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c index 0361f2b99f..06cea18c0f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c @@ -17,10 +17,20 @@ #include "gpio_api.h" #include "pinmap.h" -uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); +static int gpio_enabled = 0; + +static void gpio_enable(void) { + gpio_enabled = 1; + /* Enable AHB clock to the GPIO and IOCON domain. */ LPC_SYSCON->SYSAHBCLKCTRL |= ((1 << 16) | (1 << 6)); +} + +uint32_t gpio_set(PinName pin) { + assert(pin != (PinName)NC); + if (!gpio_enabled) + gpio_enable(); + return (1UL << ((int)pin >> PIN_SHIFT & 0x1F)); } From 48cc27f405ce3986f85a00a1319bf2274b520e35 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 28 May 2014 10:35:50 +0200 Subject: [PATCH 09/13] [LPC targets + K20 + F407VG] spi,serial, i2c asserts logic corrections --- .../TARGET_K20D5M/serial_api.c | 4 ++-- .../hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c | 3 +-- .../hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c | 13 +++++++++- .../TARGET_NXP/TARGET_LPC23XX/serial_api.c | 2 +- .../TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c | 24 +++++++++---------- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index fec37874f6..3ff978bfd9 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -119,7 +119,6 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b assert((stop_bits == 1) || (stop_bits == 2)); assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); assert((data_bits == 8) || (data_bits == 9)); - assert((data_bits == 2) && (obj->index != 0)); // save C2 state uint32_t c2_state = (obj->uart->C2 & (UART_C2_RE_MASK | UART_C2_TE_MASK)); @@ -143,8 +142,9 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b uint32_t m10 = 0; - // 9 data bits + parity + // 9 data bits + parity - only uart0 support if (data_bits == 2) { + assert(obj->index == 0); data_bits = 0; m10 = 1; } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c index d173a0dd57..7988b1b5f1 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c @@ -109,7 +109,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + assert(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3))); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c index d08902c751..095908fdfa 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c @@ -153,8 +153,7 @@ void spi_frequency(spi_t *obj, int hz) { // divider obj->spi->CR0 &= ~(0xFFFF << 8); - obj->spi->CR0 |= (divider - 1) << 8 - ; + obj->spi->CR0 |= (divider - 1) << 8; ssp_enable(obj); return; } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c index 4875038efa..342ed50989 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c @@ -17,9 +17,20 @@ #include "gpio_api.h" #include "pinmap.h" +static int gpio_enabled = 0; + +static void gpio_enable(void) { + gpio_enabled = 1; + + /* Enable AHB clock to the GPIO0/1/2 and IOCON domain. */ + LPC_SYSCON->SYSAHBCLKCTRL0 |= (0xFUL << 13); +} + uint32_t gpio_set(PinName pin) { assert(pin != (PinName)NC); - LPC_SYSCON->SYSAHBCLKCTRL0 |= (0xFUL << 13); + if (!gpio_enabled) + gpio_enable(); + return (1UL << ((int)pin & 0x1f)); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c index 1cf9b7ed17..9d7af0d47d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c @@ -65,7 +65,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart == NC); + assert((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c index 493479d750..531b9d6688 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c @@ -101,18 +101,18 @@ void i2c_frequency(i2c_t *obj, int hz) { assert((hz != 0) && (hz <= 400000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); - if ((hz != 0) && (hz <= 400000)) { - // I2C configuration - I2cHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; - I2cHandle.Init.ClockSpeed = hz; - I2cHandle.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; - I2cHandle.Init.DutyCycle = I2C_DUTYCYCLE_2; - I2cHandle.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; - I2cHandle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; - I2cHandle.Init.OwnAddress1 = 0; - I2cHandle.Init.OwnAddress2 = 0; - HAL_I2C_Init(&I2cHandle); - } + + // I2C configuration + I2cHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; + I2cHandle.Init.ClockSpeed = hz; + I2cHandle.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; + I2cHandle.Init.DutyCycle = I2C_DUTYCYCLE_2; + I2cHandle.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; + I2cHandle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; + I2cHandle.Init.OwnAddress1 = 0; + I2cHandle.Init.OwnAddress2 = 0; + HAL_I2C_Init(&I2cHandle); + } inline int i2c_start(i2c_t *obj) { From be43ebc182f4f1e7d6f5b02a5962f201773ea69f Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 28 May 2014 15:29:12 +0200 Subject: [PATCH 10/13] MBED_ASSERT - mbed assert implementation --- libraries/mbed/api/assert.h | 35 +++++++++++++++++++ libraries/mbed/common/assert.c | 17 +++++++++ libraries/mbed/common/retarget.cpp | 9 ----- .../TARGET_K20D5M/analogin_api.c | 4 +-- .../TARGET_Freescale/TARGET_K20D5M/gpio_api.c | 6 ++-- .../TARGET_K20D5M/gpio_object.h | 6 ++-- .../TARGET_Freescale/TARGET_K20D5M/i2c_api.c | 4 +-- .../TARGET_Freescale/TARGET_K20D5M/pinmap.c | 6 ++-- .../TARGET_K20D5M/pwmout_api.c | 4 +-- .../TARGET_K20D5M/serial_api.c | 12 +++---- .../TARGET_Freescale/TARGET_K20D5M/spi_api.c | 8 ++--- .../TARGET_KLXX/TARGET_KL05Z/spi_api.c | 6 ++-- .../TARGET_KLXX/TARGET_KL25Z/spi_api.c | 6 ++-- .../TARGET_KLXX/TARGET_KL46Z/spi_api.c | 8 ++--- .../TARGET_KLXX/analogin_api.c | 4 +-- .../TARGET_KLXX/analogout_api.c | 4 +-- .../TARGET_Freescale/TARGET_KLXX/gpio_api.c | 6 ++-- .../TARGET_KLXX/gpio_object.h | 6 ++-- .../TARGET_Freescale/TARGET_KLXX/i2c_api.c | 4 +-- .../hal/TARGET_Freescale/TARGET_KLXX/pinmap.c | 6 ++-- .../TARGET_Freescale/TARGET_KLXX/pwmout_api.c | 4 +-- .../TARGET_Freescale/TARGET_KLXX/serial_api.c | 10 +++--- .../TARGET_K64F/analogin_api.c | 4 +-- .../TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c | 6 ++-- .../TARGET_K64F/gpio_object.h | 6 ++-- .../TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c | 4 +-- .../TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c | 6 ++-- .../TARGET_K64F/pwmout_api.c | 4 +-- .../TARGET_K64F/serial_api.c | 4 +-- .../TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c | 4 +-- .../TARGET_NRF51822/analogin_api.c | 4 +-- .../TARGET_NORDIC/TARGET_NRF51822/gpio_api.c | 4 +-- .../TARGET_NRF51822/gpio_object.h | 6 ++-- .../TARGET_NORDIC/TARGET_NRF51822/i2c_api.c | 4 +-- .../TARGET_NORDIC/TARGET_NRF51822/pinmap.c | 4 +-- .../TARGET_NRF51822/pwmout_api.c | 4 +-- .../TARGET_NRF51822/serial_api.c | 4 +-- .../TARGET_NORDIC/TARGET_NRF51822/spi_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC11U6X/analogin_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC11U6X/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC11U6X/serial_api.c | 10 +++--- .../hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC11UXX/analogin_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC11UXX/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC11UXX/serial_api.c | 8 ++--- .../hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c | 6 ++-- .../TARGET_LPC11XX_11CXX/analogin_api.c | 4 +-- .../TARGET_LPC11XX_11CXX/gpio_api.c | 6 ++-- .../TARGET_LPC11XX_11CXX/gpio_object.h | 6 ++-- .../TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c | 6 ++-- .../TARGET_LPC11XX_11CXX/pwmout_api.c | 4 +-- .../TARGET_LPC11XX_11CXX/serial_api.c | 10 +++--- .../TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC13XX/analogin_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC13XX/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC13XX/pwmout_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC13XX/serial_api.c | 10 +++--- .../hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC15XX/analogin_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC15XX/analogout_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC15XX/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c | 4 +-- .../TARGET_NXP/TARGET_LPC15XX/pwmout_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC15XX/serial_api.c | 8 ++--- .../hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC176X/analogin_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC176X/analogout_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC176X/can_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC176X/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC176X/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC176X/pwmout_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC176X/serial_api.c | 12 +++---- .../hal/TARGET_NXP/TARGET_LPC176X/spi_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC23XX/analogin_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC23XX/analogout_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC23XX/can_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c | 2 +- .../TARGET_NXP/TARGET_LPC23XX/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC23XX/pwmout_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC23XX/serial_api.c | 12 +++---- .../hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c | 5 +-- .../TARGET_NXP/TARGET_LPC408X/analogin_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC408X/analogout_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC408X/can_api.c | 2 +- .../hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC408X/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC408X/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC408X/pwmout_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC408X/serial_api.c | 8 ++--- .../hal/TARGET_NXP/TARGET_LPC408X/spi_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC43XX/analogin_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC43XX/analogout_api.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c | 6 ++-- .../TARGET_NXP/TARGET_LPC43XX/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c | 6 ++-- .../TARGET_NXP/TARGET_LPC43XX/serial_api.c | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c | 4 +-- .../TARGET_NXP/TARGET_LPC81X/gpio_object.h | 6 ++-- .../hal/TARGET_NXP/TARGET_LPC81X/pinmap.c | 4 +-- .../hal/TARGET_NXP/TARGET_LPC81X/serial_api.c | 8 ++--- .../hal/TARGET_NXP/TARGET_LPC81X/spi_api.c | 4 +-- .../TARGET_DISCO_F051R8/analogin_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c | 6 ++-- .../TARGET_DISCO_F051R8/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c | 6 ++-- .../TARGET_STM/TARGET_DISCO_F051R8/pinmap.c | 6 ++-- .../TARGET_DISCO_F051R8/serial_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F051R8/spi_api.c | 4 +-- .../TARGET_DISCO_F100RB/analogin_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c | 6 ++-- .../TARGET_DISCO_F100RB/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F100RB/pinmap.c | 6 ++-- .../TARGET_DISCO_F100RB/pwmout_api.c | 4 +-- .../TARGET_DISCO_F100RB/serial_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F100RB/spi_api.c | 4 +-- .../TARGET_DISCO_F303VC/analogin_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c | 6 ++-- .../TARGET_DISCO_F303VC/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c | 6 ++-- .../TARGET_STM/TARGET_DISCO_F303VC/pinmap.c | 6 ++-- .../TARGET_DISCO_F303VC/pwmout_api.c | 4 +-- .../TARGET_DISCO_F303VC/serial_api.c | 4 +-- .../TARGET_STM/TARGET_DISCO_F303VC/spi_api.c | 4 +-- .../TARGET_DISCO_F407VG/analogin_api.c | 2 +- .../TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c | 6 ++-- .../TARGET_DISCO_F407VG/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c | 6 ++-- .../TARGET_STM/TARGET_DISCO_F407VG/pinmap.c | 6 ++-- .../TARGET_DISCO_F407VG/pwmout_api.c | 4 +-- .../TARGET_DISCO_F407VG/serial_api.c | 2 +- .../TARGET_STM/TARGET_DISCO_F407VG/spi_api.c | 2 +- .../TARGET_NUCLEO_F030R8/analogin_api.c | 4 +-- .../TARGET_NUCLEO_F030R8/gpio_api.c | 6 ++-- .../TARGET_NUCLEO_F030R8/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c | 6 ++-- .../TARGET_NUCLEO_F030R8/pwmout_api.c | 4 +-- .../TARGET_NUCLEO_F030R8/serial_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c | 4 +-- .../TARGET_NUCLEO_F103RB/analogin_api.c | 4 +-- .../TARGET_NUCLEO_F103RB/gpio_api.c | 6 ++-- .../TARGET_NUCLEO_F103RB/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c | 6 ++-- .../TARGET_NUCLEO_F103RB/pwmout_api.c | 4 +-- .../TARGET_NUCLEO_F103RB/serial_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c | 4 +-- .../TARGET_NUCLEO_F302R8/analogin_api.c | 4 +-- .../TARGET_NUCLEO_F302R8/analogout_api.c | 4 +-- .../TARGET_NUCLEO_F302R8/gpio_api.c | 6 ++-- .../TARGET_NUCLEO_F302R8/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c | 6 ++-- .../TARGET_NUCLEO_F302R8/serial_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c | 4 +-- .../TARGET_NUCLEO_F401RE/analogin_api.c | 4 +-- .../TARGET_NUCLEO_F401RE/gpio_api.c | 6 ++-- .../TARGET_NUCLEO_F401RE/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c | 6 ++-- .../TARGET_NUCLEO_F401RE/serial_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c | 4 +-- .../TARGET_NUCLEO_L053R8/analogin_api.c | 4 +-- .../TARGET_NUCLEO_L053R8/analogout_api.c | 4 +-- .../TARGET_NUCLEO_L053R8/gpio_api.c | 6 ++-- .../TARGET_NUCLEO_L053R8/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c | 6 ++-- .../TARGET_NUCLEO_L053R8/serial_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c | 4 +-- .../TARGET_NUCLEO_L152RE/analogin_api.c | 4 +-- .../TARGET_NUCLEO_L152RE/analogout_api.c | 4 +-- .../TARGET_NUCLEO_L152RE/gpio_api.c | 6 ++-- .../TARGET_NUCLEO_L152RE/gpio_object.h | 6 ++-- .../TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c | 6 ++-- .../TARGET_NUCLEO_L152RE/pwmout_api.c | 4 +-- .../TARGET_NUCLEO_L152RE/serial_api.c | 4 +-- .../TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c | 4 +-- .../TARGET_STM32F3XX/analogin_api.c | 4 +-- .../TARGET_STM32F3XX/analogout_api.c | 4 +-- .../TARGET_STM/TARGET_STM32F3XX/gpio_api.c | 6 ++-- .../TARGET_STM/TARGET_STM32F3XX/gpio_object.h | 6 ++-- .../hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c | 6 ++-- .../hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c | 6 ++-- .../TARGET_STM/TARGET_STM32F3XX/pwmout_api.c | 4 +-- .../TARGET_STM/TARGET_STM32F3XX/serial_api.c | 4 +-- .../hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c | 4 +-- .../TARGET_STM32F4XX/analogin_api.c | 4 +-- .../TARGET_STM/TARGET_STM32F4XX/gpio_api.c | 6 ++-- .../TARGET_STM/TARGET_STM32F4XX/gpio_object.h | 6 ++-- .../hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c | 4 +-- .../hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c | 6 ++-- .../hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c | 6 ++-- 214 files changed, 594 insertions(+), 550 deletions(-) create mode 100644 libraries/mbed/api/assert.h create mode 100644 libraries/mbed/common/assert.c diff --git a/libraries/mbed/api/assert.h b/libraries/mbed/api/assert.h new file mode 100644 index 0000000000..9b6639197f --- /dev/null +++ b/libraries/mbed/api/assert.h @@ -0,0 +1,35 @@ +#ifndef ASSERT_H +#define ASSERT_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** This function is active only if NDEBUG is not defined prior to including this + * assert header file. + * Internal mbed assert function which is invoked when MBED_ASSERT macro failes. + * In case of MBED_ASSERT failing condition, the assertation message is printed + * to stderr and mbed_die() is called. + * @param expr Expresion to be checked. + * @param file File where assertation failed. + * @param line Failing assertation line number. + */ +void mbed_assert_internal(const char *expr, const char *file, int line); + +#ifdef __cplusplus +} +#endif + +#ifdef NDEBUG +#define MBED_ASSERT(expr) ((void)0) + +#else +#define MBED_ASSERT(expr) \ +do { \ + if (!expr) { \ + mbed_assert_internal(#expr, __FILE__, __LINE__); \ + } \ +} while (0) +#endif + +#endif diff --git a/libraries/mbed/common/assert.c b/libraries/mbed/common/assert.c new file mode 100644 index 0000000000..db9571495b --- /dev/null +++ b/libraries/mbed/common/assert.c @@ -0,0 +1,17 @@ +#include "assert.h" +#include "device.h" + +#if DEVICE_STDIO_MESSAGES +#include +#endif + +#include +#include "mbed_interface.h" + +void mbed_assert_internal(const char *expr, const char *file, int line) +{ +#if DEVICE_STDIO_MESSAGES + fprintf(stderr, "mbed assertation failed: %s, file: %s, line %d \n", expr, file, line); +#endif + mbed_die(); +} diff --git a/libraries/mbed/common/retarget.cpp b/libraries/mbed/common/retarget.cpp index bbd9b1a413..35a815916c 100644 --- a/libraries/mbed/common/retarget.cpp +++ b/libraries/mbed/common/retarget.cpp @@ -396,15 +396,6 @@ extern "C" WEAK void __cxa_pure_virtual(void) { #endif -#include "mbed_interface.h" -// mbed abort invokes only mbed die. The abort function is called from failing assert for example. -namespace std { -extern "C" void abort(void) { - mbed_die(); - while(1); -} -} - // **************************************************************************** // mbed_main is a function that is called before main() // mbed_sdk_init() is also a function that is called before main(), but unlike diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c index 25a92d8c42..5202b664e6 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" @@ -38,7 +38,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); SIM->SCGC6 |= SIM_SCGC6_ADC0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c index 70671ed002..d2d419f980 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, 1); return 1 << ((pin & 0x7F) >> 2); } @@ -44,7 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h index 35923ebd1f..b61ca7b6b4 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -42,7 +42,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c index 3b966a25bc..8ed5bb9e1f 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" @@ -54,7 +54,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_Type*)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); SIM->SCGC4 |= SIM_SCGC4_I2C0_MASK; SIM->SCGC5 |= SIM_SCGC5_PORTB_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c index a7a0be9297..18f145b60c 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_n = (uint32_t)pin >> PORT_SHIFT; uint32_t pin_n = (uint32_t)(pin & 0x7C) >> 2; @@ -30,7 +30,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); __IO uint32_t* pin_pcr = (__IO uint32_t*)(PORTA_BASE + pin); // pin pullup bits: [1:0] -> 11 = (0x3) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c index 7de84ad758..cee5004261 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -53,7 +53,7 @@ static float pwm_clock = 0; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); uint32_t clkdiv = 0; float clkval = SystemCoreClock / 1000000.0f; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index 3ff978bfd9..86f24f6297 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "serial_api.h" // math.h required for floating point operations for baud rate calculation @@ -47,7 +47,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (UART_Type *)uart; // enable clk @@ -116,9 +116,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); - assert((data_bits == 8) || (data_bits == 9)); + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); + MBED_ASSERT((data_bits == 8) || (data_bits == 9)); // save C2 state uint32_t c2_state = (obj->uart->C2 & (UART_C2_RE_MASK | UART_C2_TE_MASK)); @@ -144,7 +144,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b // 9 data bits + parity - only uart0 support if (data_bits == 2) { - assert(obj->index == 0); + MBED_ASSERT(obj->index == 0); data_bits = 0; m10 = 1; } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c index e53cbaa81a..6e04c5aece 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "spi_api.h" #include @@ -56,7 +56,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); SIM->SCGC5 |= SIM_SCGC5_PORTC_MASK | SIM_SCGC5_PORTD_MASK; SIM->SCGC6 |= SIM_SCGC6_SPI0_MASK; @@ -88,8 +88,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits > 4) || (bits < 16)); - assert((mode >= 0) && (mode <= 3)); + MBED_ASSERT((bits > 4) || (bits < 16)); + MBED_ASSERT((mode >= 0) && (mode <= 3)); uint32_t polarity = (mode & 0x2) ? 1 : 0; uint32_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c index ac47fe0c33..5f948a5d91 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/spi_api.c @@ -50,7 +50,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -84,8 +84,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(bits == 8); - assert((mode >= 0) && (mode <= 3)); + MBED_ASSERT(bits == 8); + MBED_ASSERT((mode >= 0) && (mode <= 3)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c index 765db614f2..e9f13ecbf1 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/spi_api.c @@ -32,7 +32,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -64,8 +64,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(bits == 8); - assert((mode >= 0) && (mode <= 3)); + MBED_ASSERT(bits == 8); + MBED_ASSERT((mode >= 0) && (mode <= 3)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c index badc7c1a45..4cd4e30b08 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "spi_api.h" #include @@ -90,7 +90,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -123,8 +123,8 @@ void spi_free(spi_t *obj) { // [TODO] } void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits == 8) || (bits == 16)); - assert((mode >= 0) && (mode <= 3)); + MBED_ASSERT((bits == 8) || (bits == 16)); + MBED_ASSERT((mode >= 0) && (mode <= 3)); uint8_t polarity = (mode & 0x2) ? 1 : 0; uint8_t phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c index fb472adb92..605606590c 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" @@ -27,7 +27,7 @@ void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); SIM->SCGC6 |= SIM_SCGC6_ADC0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c index c15dcd6a42..7e06304e0e 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogout_api.h" #include "cmsis.h" @@ -24,7 +24,7 @@ void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); SIM->SCGC6 |= SIM_SCGC6_DAC0_MASK; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c index add01e1216..da01baa5da 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, 1); return 1 << ((pin & 0x7F) >> 2); } @@ -44,7 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c index ef194ac866..e18428bed1 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" @@ -43,7 +43,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_Type*)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power switch ((int)obj->i2c) { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c index 36ff078d93..3d2fd73f32 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_n = (uint32_t)pin >> PORT_SHIFT; uint32_t pin_n = (uint32_t)(pin & 0x7C) >> 2; @@ -30,7 +30,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); __IO uint32_t* pin_pcr = (__IO uint32_t*)(PORTA_BASE + pin); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c index ff80c95ccc..13e1c287e4 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -26,7 +26,7 @@ static float pwm_clock; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); uint32_t clkdiv = 0; float clkval; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c index 2d5d121e18..2136fb6074 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "serial_api.h" // math.h required for floating point operations for baud rate calculation @@ -61,7 +61,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (UARTLP_Type *)uart; // enable clk @@ -148,9 +148,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); - assert(data_bits == 8); // TODO: Support other number of data bits (also in the write method!) + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven)); + MBED_ASSERT(data_bits == 8); // TODO: Support other number of data bits (also in the write method!) // save C2 state uint8_t c2_state = (obj->uart->C2 & (UARTLP_C2_RE_MASK | UARTLP_C2_TE_MASK)); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c index 0404e0e2cf..26773be524 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" @@ -49,7 +49,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); uint32_t instance = obj->adc >> ADC_INSTANCE_SHIFT; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c index 909bd6198d..00ed256f1d 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "fsl_port_hal.h" @@ -21,7 +21,7 @@ #include "fsl_sim_hal.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_num = pin & 0xFF; pin_function(pin, (int)kPortMuxAsGpio); @@ -44,7 +44,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pinName != (PinName)NC); + MBED_ASSERT(obj->pinName != (PinName)NC); uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin_num = obj->pinName & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h index 94db08ea1e..13e6c4c72c 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "fsl_gpio_hal.h" #ifdef __cplusplus @@ -28,7 +28,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pinName != (PinName)NC); + MBED_ASSERT(obj->pinName != (PinName)NC); uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin = obj->pinName & 0xFF; @@ -36,7 +36,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pinName != (PinName)NC); + MBED_ASSERT(obj->pinName != (PinName)NC); uint32_t port = obj->pinName >> GPIO_PORT_SHIFT; uint32_t pin = obj->pinName & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c index 3dec457fe6..bf232d08fb 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" @@ -50,7 +50,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { uint32_t i2c_sda = pinmap_peripheral(sda, PinMap_I2C_SDA); uint32_t i2c_scl = pinmap_peripheral(scl, PinMap_I2C_SCL); obj->instance = pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->instance != NC); + MBED_ASSERT((int)obj->instance != NC); clock_manager_set_gate(kClockModuleI2C, obj->instance, true); clock_manager_set_gate(kClockModulePORT, sda >> GPIO_PORT_SHIFT, true); diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c index db0b212baf..73e9ca72e5 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" #include "fsl_clock_manager.h" #include "fsl_port_hal.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); clock_manager_set_gate(kClockModulePORT, pin >> GPIO_PORT_SHIFT, true); port_hal_mux_control(pin >> GPIO_PORT_SHIFT, pin & 0xFF, (port_mux_t)function); } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t instance = pin >> GPIO_PORT_SHIFT; uint32_t pinName = pin & 0xFF; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c index 21777c91f1..f585c20d84 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -73,7 +73,7 @@ static float pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); obj->pwm_name = pwm; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c index cbca9ec240..568e340a04 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c @@ -17,7 +17,7 @@ // math.h required for floating point operations for baud rate calculation #include -#include +#include "assert.h" #include @@ -85,7 +85,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { uint32_t uart_tx = pinmap_peripheral(tx, PinMap_UART_TX); uint32_t uart_rx = pinmap_peripheral(rx, PinMap_UART_RX); obj->index = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)obj->index != NC); + MBED_ASSERT((int)obj->index != NC); uart_config_t uart_config; uart_config.baudRate = 9600; diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c index 8998af6a73..2b81dad0e8 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include +#include "assert.h" #include "spi_api.h" #include "cmsis.h" @@ -93,7 +93,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel uint32_t spi_cntl = pinmap_merge(spi_sclk, spi_ssel); obj->instance = pinmap_merge(spi_data, spi_cntl); - assert((int)obj->instance != NC); + MBED_ASSERT((int)obj->instance != NC); // enable power and clocking clock_manager_set_gate(kClockModuleSPI, obj->instance, true); diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c index 826ceb7fcf..a4e9ed1335 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -37,7 +37,7 @@ void analogin_init(analogin_t *obj, PinName pin) { const PinMap *map = PinMap_ADC; obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); //(NRF_ADC_Type *) - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); while (map->pin != NC) { if (map->pin == pin){ diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c index 82bece68fd..27f71c0c26 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" @@ -35,7 +35,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : NRF_GPIO->PIN_CNF[obj->pin] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c index 9de494a563..797552a22f 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -62,7 +62,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c = (I2CName)pinmap_merge(i2c_sda,i2c_scl); obj->i2c = (NRF_TWI_Type *)i2c; - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); obj->scl=scl; obj->sda=sda; diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c index 3a9eb37545..343260e39b 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" @@ -21,7 +21,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c index 3a692d2585..7c989acc66 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -215,7 +215,7 @@ void pwmout_init(pwmout_t* obj, PinName pin) { uint8_t pwmOutSuccess = 0; PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); if(PWM_taken[(uint8_t)pwm]){ diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c index cde0c5c59a..78e2ecc7a4 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c @@ -16,7 +16,7 @@ // math.h required for floating point operations for baud rate calculation //#include #include -#include +#include "assert.h" #include "serial_api.h" #include "cmsis.h" @@ -66,7 +66,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (NRF_UART_Type *)uart; diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c index 63a4de636c..66f49b26ec 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ //#include -#include +#include "assert.h" #include "spi_api.h" #include "cmsis.h" #include "pinmap.h" @@ -69,7 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel obj->spi = (NRF_SPI_Type*)NC; obj->spis = (NRF_SPIS_Type*)spi; } - assert((int)obj->spi != NC && (int)obj->spis != NC); + MBED_ASSERT((int)obj->spi != NC && (int)obj->spis != NC); // pin out the spi pins if (ssel != NC) {//slave diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c index 52f560bf0f..fef7115ab0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -50,7 +50,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { volatile uint32_t tmp; obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c index a6acd86813..fb5673eded 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" @@ -27,7 +27,7 @@ static void gpio_enable(void) { } uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); if (!gpio_enabled) gpio_enable(); @@ -60,7 +60,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c index 29b2d137a2..c1e3cebc95 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -95,7 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C0_Type *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c index 8142396fc0..f514d199ff 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); __IO uint32_t *reg = (__IO uint32_t*)(LPC_IOCON_BASE + (pin & 0x1FF)); // pin function bits: [2:0] -> 111 = (0x7) @@ -26,7 +26,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); if ((pin == P0_4) || (pin == P0_5)) { // The true open-drain pins PIO0_4 and PIO0_5 can be configured for different I2C-bus speeds. return; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c index d5c947666c..b8db6bc863 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include #include @@ -68,7 +68,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_USART0_Type *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= ((1<<12) | (1<<20) | (1<<21) | (1<<22)); @@ -203,9 +203,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c index 7988b1b5f1..d4ea564edb 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" @@ -69,7 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP0_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -109,7 +109,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - assert(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3))); + MBED_ASSERT(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3))); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c index bea83258a4..b9f6fbccc0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -47,7 +47,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Power up ADC LPC_SYSCON->PDRUNCFG &= ~ (1 << 4); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c index 2a0ae59088..09fcde0cfe 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); int f = ((pin == P0_0) || (pin == P0_10) || (pin == P0_11) || @@ -52,7 +52,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c index e1ea6fcd5d..1edeaccaa6 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -87,7 +87,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_Type *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c index c431a9a12e..49baef7037 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" @@ -21,7 +21,7 @@ #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60) void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); if (pin == (PinName)NC) return; uint32_t pin_number = (uint32_t)pin; @@ -35,7 +35,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c index 932f16d1a8..7d4d5b7268 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -69,7 +69,7 @@ static LPC_CTxxBx_Type *Timers[4] = { void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); obj->pwm = pwm; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c index 0b0cbf0f2f..96d66a16f0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c @@ -54,7 +54,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_USART_Type *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= (1<<12); @@ -185,9 +185,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c index 095908fdfa..1eae6f8f8f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" #include "cmsis.h" @@ -63,7 +63,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSPx_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -102,7 +102,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + MBED_ASSERT((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c index 2f1ccd0d3c..56b1f09315 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -44,7 +44,7 @@ static inline int div_round_up(int x, int y) { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (uint32_t)NC); + MBED_ASSERT(obj->adc != (uint32_t)NC); // Power up ADC LPC_SYSCON->PDRUNCFG &= ~ (1 << 4); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c index b695978ea1..a30ec24666 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "reserved_pins.h" @@ -21,7 +21,7 @@ static const PinName reserved_pins[] = TARGET_RESERVED_PINS; uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // PIO default value of following ports are not same as others unsigned i; int f = 0; @@ -53,7 +53,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); int pin_number = ((obj->pin & 0x0F00) >> 8); switch (direction) { case PIN_INPUT : diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h index 71a8ce10e2..ba1b39ef3b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -30,7 +30,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); uint32_t pin_number = ((obj->pin & 0x0F00) >> 8); if (value) *obj->reg_write |= (1 << pin_number); @@ -39,7 +39,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_mask_read) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c index da0e9ed7d8..5a1e1d67ce 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -88,7 +88,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c index a20eba6e02..af8f285da5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t offset = (uint32_t)pin & 0xff; __IO uint32_t *reg = (__IO uint32_t*)(LPC_IOCON_BASE + offset); @@ -27,7 +27,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t offset = (uint32_t)pin & 0xff; uint32_t drain = ((uint32_t)mode & (uint32_t)OpenDrain) >> 2; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c index ad84b2103b..436801e51b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -64,7 +64,7 @@ static LPC_TMR_TypeDef *Timers[3] = { void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (uint32_t)NC); + MBED_ASSERT(pwm != (uint32_t)NC); obj->pwm = pwm; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c index 32c4c84ce2..52a8b856ac 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include #include @@ -57,7 +57,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= (1<<12); @@ -181,9 +181,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c index efe45b341d..438f5abd46 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" #include "cmsis.h" @@ -59,7 +59,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -98,7 +98,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + MBED_ASSERT((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c index bea83258a4..b9f6fbccc0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -47,7 +47,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Power up ADC LPC_SYSCON->PDRUNCFG &= ~ (1 << 4); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c index 09f67a6cb2..5b514276f8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); int f = ((pin == P0_11) || (pin == P0_12) || (pin == P0_13) || (pin == P0_14)) ? (1) : (0); pin_function(pin, f); @@ -46,7 +46,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c index 7c4c2b24c6..f1687a7753 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -88,7 +88,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_Type *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c index c28c675938..05de0627e4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" @@ -21,7 +21,7 @@ #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60) void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; @@ -34,7 +34,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c index a77c39724d..1396380ba4 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -71,7 +71,7 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (uint32_t)NC); + MBED_ASSERT(pwm != (uint32_t)NC); obj->pwm = pwm; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c index 20ff232523..a3d7f22976 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include #include @@ -55,7 +55,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_USART_Type *)uart; LPC_SYSCON->SYSAHBCLKCTRL |= (1<<12); @@ -184,9 +184,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c index 0382a13f3e..31c341874d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" #include "cmsis.h" @@ -63,7 +63,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSPx_Type*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -103,7 +103,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); + MBED_ASSERT((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c index b4a96bf75e..9dbc1dfca7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -54,7 +54,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); uint32_t port = (pin >> 5); // enable clock for GPIOx diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c index 143a37b4c4..74dff1c81d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" void analogout_init(dac_t *obj, PinName pin) { - assert(pin == P0_12); + MBED_ASSERT(pin == P0_12); LPC_SYSCON->SYSAHBCLKCTRL0 |= (1 << 29); LPC_SYSCON->PDRUNCFG &= ~(1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c index 342ed50989..bd6b104764 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" @@ -27,7 +27,7 @@ static void gpio_enable(void) { } uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); if (!gpio_enabled) gpio_enable(); @@ -54,7 +54,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h index b0eabec850..93287cd840 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; @@ -42,7 +42,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c index afecd74670..c3969aa0e8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -41,7 +41,7 @@ static inline void i2c_interface_enable(i2c_t *obj) { } void i2c_init(i2c_t *obj, PinName sda, PinName scl) { - assert((sda == P0_23) || (scl == P0_22)); + MBED_ASSERT((sda == P0_23) || (scl == P0_22)); // Enables clock for I2C0 LPC_SYSCON->SYSAHBCLKCTRL1 |= (1 << 13); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c index 5592282829..8b3f929e94 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" @@ -21,7 +21,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); if ((pin == P0_22) || (pin == P0_23)) { // The true open-drain pins PIO0_22 and PIO0_23 can be configured for different I2C-bus speeds. diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c index a24db78b65..24596e9e3b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -38,7 +38,7 @@ static int get_available_sct(void) { } void pwmout_init(pwmout_t* obj, PinName pin) { - assert(pin != (uint32_t)NC); + MBED_ASSERT(pin != (uint32_t)NC); int sct_n = get_available_sct(); if (sct_n == -1) { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c index 2dd288883e..ad4f762955 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include @@ -196,9 +196,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits - assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); stop_bits -= 1; data_bits -= 7; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c index 38ca0c53a8..bb819171ad 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" @@ -127,7 +127,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { spi_disable(obj); - assert((bits >= 1 && bits <= 16) && (mode >= 0 && mode <= 3)); + MBED_ASSERT((bits >= 1 && bits <= 16) && (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c index 32e1ab4dd1..a97e765ae5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" @@ -44,7 +44,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // ensure power is turned on LPC_SC->PCONP |= (1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c index 7b005b84c5..49dcd90305 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogout_api.h" #include "cmsis.h" @@ -26,7 +26,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); // power is on by default, set DAC clk divider is /4 LPC_SC->PCLKSEL0 &= ~(0x3 << 22); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c index d68e1f62a7..56db2cbe8b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "can_api.h" #include "cmsis.h" @@ -258,7 +258,7 @@ void can_init(can_t *obj, PinName rd, PinName td) { CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD); CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD); obj->dev = (LPC_CAN_TypeDef *)pinmap_merge(can_rd, can_td); - assert((int)obj->dev != NC); + MBED_ASSERT((int)obj->dev != NC); switch ((int)obj->dev) { case CAN_1: LPC_SC->PCONP |= 1 << 13; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c index dd34db71da..a74f4271cc 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, 0); return (1 << ((int)pin & 0x1F)); } @@ -41,7 +41,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c index ceb6abd089..94664f4162 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -96,7 +96,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c index 1600a5fe5d..56533540f9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 4; @@ -29,7 +29,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c index 83d5bc9d69..b3c7d09f05 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -57,7 +57,7 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); obj->pwm = pwm; obj->MR = PWM_MATCH[pwm]; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c index e7c8902907..59b233523a 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include #include @@ -89,7 +89,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power @@ -148,7 +148,7 @@ void serial_free(serial_t *obj) { // serial_baud // set the baud rate, taking in to account the current SystemFrequency void serial_baud(serial_t *obj, int baudrate) { - assert((int)obj->uart <= UART_3); + MBED_ASSERT((int)obj->uart <= UART_3); // The LPC2300 and LPC1700 have a divider and a fractional divider to control the // baud rate. The formula is: // @@ -244,9 +244,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c index cd6f7ae713..f226316bd5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" @@ -65,7 +65,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -97,7 +97,7 @@ void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { ssp_disable(obj); - assert(((bits >= 4) && (bits <= 16)) && (mode >= 0 && mode <= 3)); + MBED_ASSERT(((bits >= 4) && (bits <= 16)) && (mode >= 0 && mode <= 3)); int polarity = (mode & 0x2) ? 1 : 0; int phase = (mode & 0x1) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c index 823a3e91e3..3d5359011c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -42,7 +42,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // ensure power is turned on LPC_SC->PCONP |= (1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c index 79464f2b74..640e1b17a0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -25,7 +25,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); // power is on by default, set DAC clk divider is /4 LPC_SC->PCLKSEL0 &= ~(0x3 << 22); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c index dba2c4f20e..ee2632f47c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "can_api.h" #include "cmsis.h" #include "pinmap.h" @@ -161,7 +161,7 @@ void can_init(can_t *obj, PinName rd, PinName td) { CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD); CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD); obj->dev = (LPC_CAN_TypeDef *)pinmap_merge(can_rd, can_td); - assert((int)obj->dev != NC); + MBED_ASSERT((int)obj->dev != NC); switch ((int)obj->dev) { case CAN_1: LPC_SC->PCONP |= 1 << 13; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c index ada9c74615..d3477c4582 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c index 2a53303a6d..f4bceb4969 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/i2c_api.c @@ -95,7 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c index ef1ed3752c..317c73b3d3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 4; @@ -29,7 +29,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert((pin != (PinName)NC) && (mode != OpenDrain)); + MBED_ASSERT((pin != (PinName)NC) && (mode != OpenDrain)); uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0; int index = pin_number >> 5; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c index edec24405d..75e4bc07f8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -57,7 +57,7 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); obj->pwm = pwm; obj->MR = PWM_MATCH[pwm]; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c index 9d7af0d47d..ddadfc11b3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include #include @@ -65,7 +65,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power @@ -121,7 +121,7 @@ void serial_free(serial_t *obj) { // serial_baud // set the baud rate, taking in to account the current SystemFrequency void serial_baud(serial_t *obj, int baudrate) { - assert((int)obj->uart <= UART_3); + MBED_ASSERT((int)obj->uart <= UART_3); // The LPC2300 and LPC1700 have a divider and a fractional divider to control the // baud rate. The formula is: // @@ -217,9 +217,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c index 2aa2a9f5ce..2226b3f371 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "assert.h" #include #include "spi_api.h" @@ -64,7 +65,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -95,7 +96,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(((bits >= 4) && (bits <= 16)) && (((mode >= 0) && (mode <= 3))); + MBED_ASSERT(((bits >= 4) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c index f48d428576..8ac67fe8fa 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -44,7 +44,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // ensure power is turned on LPC_SC->PCONP |= (1 << 12); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c index c4b885249e..712c3c9209 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -25,7 +25,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); // DAC enable bit must be set LPC_IOCON->P0_26 |= (1 << 16); // DACEN diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c index 1a86766df0..49a2efa72c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/can_api.c @@ -243,7 +243,7 @@ void can_init(can_t *obj, PinName rd, PinName td) { CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD); CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD); obj->dev = (LPC_CAN_TypeDef *)pinmap_merge(can_rd, can_td); - assert((int)obj->dev != NC); + MBED_ASSERT((int)obj->dev != NC); switch ((int)obj->dev) { case CAN_1: LPC_SC->PCONP |= 1 << 13; break; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c index 012b5b256b..48078b6547 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, 0); return (1 << ((int)pin & 0x1F)); } @@ -43,7 +43,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c index 73f3105c17..93ee430e12 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" @@ -108,7 +108,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (LPC_I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c index 6b3a49defb..383e83a2ee 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); __IO uint32_t *reg = (__IO uint32_t*) (LPC_IOCON_BASE + 4 * pin); // pin function bits: [2:0] -> 111 = (0x7) @@ -26,7 +26,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c index 08463d0b6d..1d3ef30d20 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -66,7 +66,7 @@ static unsigned int pwm_clock_mhz; void pwmout_init(pwmout_t* obj, PinName pin) { // determine the channel PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(pwm != (PWMName)NC); + MBED_ASSERT(pwm != (PWMName)NC); obj->channel = pwm; obj->pwm = LPC_PWM0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c index bc4e0fba11..202df6d340 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c @@ -72,7 +72,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX); UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX); UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert((int)uart != NC); + MBED_ASSERT((int)uart != NC); obj->uart = (LPC_UART_TypeDef *)uart; // enable power @@ -207,9 +207,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c index 3be9df6bb4..3d790608a8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c @@ -84,7 +84,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_TypeDef*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // enable power and clocking switch ((int)obj->spi) { @@ -116,7 +116,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(((bits >= 4) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); + MBED_ASSERT(((bits >= 4) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c index d49f0195e9..06269db915 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include +#include "assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" @@ -41,7 +41,7 @@ void analogin_init(analogin_t *obj, PinName pin) { uint8_t num, chan; obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure the pin as GPIO input if (pin < SFP_AIO0) { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c index 69b7d5cc84..5851b36884 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include +#include "assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" @@ -27,7 +27,7 @@ static const PinMap PinMap_DAC[] = { void analogout_init(dac_t *obj, PinName pin) { obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); // Configure the pin as GPIO input pin_function(pin, (SCU_PINIO_PULLNONE | 0x0)); diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c index c2706befd9..e4068505b2 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c @@ -15,12 +15,12 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); int f = 0; unsigned int port = (unsigned int)MBED_GPIO_PORT(pin); @@ -51,7 +51,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c index 14a04f27e8..b620c8c63b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c @@ -15,12 +15,12 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" void pin_function(PinName pin, int function) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); __IO uint32_t *reg = (__IO uint32_t*) MBED_SCU_REG(pin); @@ -29,7 +29,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert((pin != (PinName)NC) && (mode == OpenDrain)); + MBED_ASSERT((pin != (PinName)NC) && (mode == OpenDrain)); __IO uint32_t *reg = (__IO uint32_t*) MBED_SCU_REG(pin); uint32_t tmp = *reg; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c index 434067d2f3..f9b39262d6 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c @@ -192,9 +192,9 @@ void serial_baud(serial_t *obj, int baudrate) { } void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { - assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits - assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits - assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits + MBED_ASSERT((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) || (parity == ParityForced1) || (parity == ParityForced0)); stop_bits -= 1; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c index 85d27e8064..c4e1f7b643 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include +#include "assert.h" #include #include "spi_api.h" @@ -60,7 +60,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (LPC_SSP_T*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC); + MBED_ASSERT((int)obj->spi != NC); // set default format and frequency if (ssel == NC) { @@ -85,7 +85,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3))); + MBED_ASSERT(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c index 06e311fe5e..d2c1e50901 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" @@ -58,7 +58,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : *obj->reg_dir &= ~obj->mask; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h index e6bb82e4d4..53e15a5329 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -41,7 +41,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c index 0a3c9be761..c8d9090ccf 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" @@ -31,7 +31,7 @@ void pin_function(PinName pin, int function) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); if ((pin == 10) || (pin == 11)) { // True open-drain pins can be configured for different I2C-bus speeds diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c index 7d90377179..dbb190ba6d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include +#include "assert.h" #include #include @@ -181,9 +181,9 @@ void serial_baud(serial_t *obj, int baudrate) { void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) { // 0: 1 stop bits, 1: 2 stop bits - assert((stop_bits == 1) || (stop_bits == 2)); - assert((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits - assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); + MBED_ASSERT((stop_bits == 1) || (stop_bits == 2)); + MBED_ASSERT((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits + MBED_ASSERT((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd)); stop_bits -= 1; data_bits -= 7; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c index 63e6e07fae..6357844467 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include #include "spi_api.h" @@ -116,7 +116,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(((bits >= 1) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); + MBED_ASSERT(((bits >= 1) && (bits <= 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c index 4ada460e3c..35aa3e44dd 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #include "wait_api.h" @@ -53,7 +53,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c index bcaf274239..89e1825780 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h index 9a5b49c92a..0f6ff3fd85 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -59,7 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c index 6799955951..004342c663 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -57,7 +57,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -81,7 +81,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz == 100000) || (hz == 200000) || (hz == 400000)); //"Only 100kHz, 200kHz and 400kHz I2C frequencies are supported." + MBED_ASSERT((hz == 100000) || (hz == 200000) || (hz == 400000)); //"Only 100kHz, 200kHz and 400kHz I2C frequencies are supported." I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim = 0; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c index cfe5388bdb..2821e9e31e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "device.h" #include "pinmap.h" #include "error.h" @@ -67,7 +67,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t otype = STM_PIN_OTYPE(data); @@ -111,7 +111,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c index 1cfc4ba0c5..a4d8b49c6d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" @@ -78,7 +78,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c index b3e8e126c8..618b73625d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -90,7 +90,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c index 1eef5ea9b0..db5d7c3b49 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #include "wait_api.h" @@ -53,7 +53,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c index 72ca82b0de..4810ee8fea 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN_FLOATING, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_Out_PP, 0)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h index ba450a6fc9..4dc8323d7e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -59,7 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c index 639ef9fc07..41b58c6f2a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -57,7 +57,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c index 3cc0ca7db5..97c851faa9 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "device.h" #include "pinmap.h" #include "error.h" @@ -76,7 +76,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (input, output, alternate function or analog) + output speed + AF */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t afnum = STM_PIN_AFNUM(data); @@ -118,7 +118,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); GPIO_InitTypeDef GPIO_InitStructure; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c index 4033501c32..c1c23b6336 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -46,7 +46,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm != (PWMName)NC); + MBED_ASSERT(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_2) RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c index abfdeac106..c29b9aa56c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" @@ -80,7 +80,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c index e2e4458f84..796b1dd369 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -91,7 +91,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c index 1ed4c790fc..ff2b16ea31 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #include "wait_api.h" @@ -63,7 +63,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c index 7b80aecca5..43a5e48243 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h index 65d1f43622..3d01191b4b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c index 15eb9c5653..3ffa6bd440 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -68,7 +68,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -95,7 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); + MBED_ASSERT((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c index 5dca9319e5..906a875338 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "device.h" #include "pinmap.h" #include "error.h" @@ -72,7 +72,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -116,7 +116,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c index 0280860ebd..e7747a37de 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -88,7 +88,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm != (PWMName)NC); + MBED_ASSERT(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c index 021bc87a5a..5840bdf28c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" @@ -92,7 +92,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c index 2dc1517af6..6e8a578594 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -101,7 +101,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_2) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c index 872b0ccbfa..2fb9135a07 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogin_api.c @@ -61,7 +61,7 @@ int adc_inited = 0; void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c index cd9a69092e..ed7bbe1789 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -36,7 +36,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h index 8b3f175963..2806d99bff 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } @@ -59,7 +59,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c index 531b9d6688..7dba174da8 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -71,7 +71,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -98,7 +98,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz != 0) && (hz <= 400000)); + MBED_ASSERT((hz != 0) && (hz <= 400000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c index 1627bc6aaa..3045641f6c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "device.h" #include "pinmap.h" #include "error.h" @@ -84,7 +84,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t pupd = STM_PIN_PUPD(data); @@ -120,7 +120,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c index b5ae78d924..406dd704e0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -88,7 +88,7 @@ static TIM_HandleTypeDef TimHandle; void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm != (PWMName)NC); + MBED_ASSERT(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) __TIM1_CLK_ENABLE(); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c index a2570031ed..1ffd46a9df 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/serial_api.c @@ -82,7 +82,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c index 7723eb95a9..4d0303338f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/spi_api.c @@ -111,7 +111,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c index f36c2f0a23..baa7993df7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -64,7 +64,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c index 7b80aecca5..43a5e48243 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h index 65d1f43622..3d01191b4b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c index 1b4dd5ca31..8507d9493f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -61,7 +61,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -86,7 +86,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); + MBED_ASSERT((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim = 0; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c index 0e9113a7ff..76aaa0a253 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -67,7 +67,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -112,7 +112,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c index 9c9f30cf44..3f6c1824e8 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #if DEVICE_PWMOUT @@ -65,7 +65,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm != (PWMName)NC); + MBED_ASSERT(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == TIM_3) RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c index 9a696bb1f7..2a02be4c4e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #if DEVICE_SERIAL @@ -84,7 +84,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c index 73ba28f87e..fc1202a574 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -98,7 +98,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c index 56187133fe..23fe27d05a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -62,7 +62,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c index 9c388a98f8..ad82dd17b0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN_FLOATING, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_Out_PP, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h index c92e88ec3d..74602cf866 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c index 0699342e40..735cfe84c0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -61,7 +61,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c index edb828259d..5833a677ba 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -78,7 +78,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (input, output, alternate function or analog) + output speed + AF */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t afnum = STM_PIN_AFNUM(data); @@ -120,7 +120,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); GPIO_InitTypeDef GPIO_InitStructure; uint32_t port_index = STM_PORT(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c index d94d4fb24f..ae06999c08 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #if DEVICE_PWMOUT @@ -76,7 +76,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm != (PWMName)NC); + MBED_ASSERT(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c index 1efdf254dd..46124b271d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #if DEVICE_SERIAL @@ -87,7 +87,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c index caeb89367e..a7178f555d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -95,7 +95,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c index 2e91f761ac..5a69c40add 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -63,7 +63,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c index 2703667274..c3c8fb9ad2 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT @@ -46,7 +46,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); dac = (DAC_TypeDef *)(obj->dac); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c index 7b80aecca5..43a5e48243 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h index 65d1f43622..3d01191b4b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c index 9c366768c0..4b6b7d8a42 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -69,7 +69,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c index 05720d7568..7fbc77c3b5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -68,7 +68,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t otype = STM_PIN_OTYPE(data); @@ -111,7 +111,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c index dba174596b..5a18664b63 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #if DEVICE_SERIAL @@ -95,7 +95,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c index c279ce507c..f580901d41 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -101,7 +101,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_2) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c index 30f5b4823d..1a724441bf 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -61,7 +61,7 @@ int adc_inited = 0; void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c index 606f35d293..638dc92748 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h index 26e9150df1..02764453d0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c index 814a130381..a26bf5b3b1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -66,7 +66,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -96,7 +96,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz != 0) && (hz <= 400000)); + MBED_ASSERT((hz != 0) && (hz <= 400000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); // I2C configuration diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c index 280b5d2757..14efe5cd2d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -83,7 +83,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t pupd = STM_PIN_PUPD(data); @@ -119,7 +119,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c index 1a9208fb2f..e35a8d108a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #if DEVICE_SERIAL @@ -85,7 +85,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c index bdd1441c49..0a85a13a39 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -111,7 +111,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c index f12f53f7b3..4ed03cb5fc 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -61,7 +61,7 @@ int adc_inited = 0; void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c index f859a8f6bb..cce692dc83 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT @@ -50,7 +50,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_DAC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c index b3648359e3..f12c5fb38e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -64,7 +64,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h index 65d1f43622..3d01191b4b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c index d7dda9befb..e157ca388d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -66,7 +66,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -91,7 +91,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz == 100000) || (hz == 400000) || (hz == 1000000)); + MBED_ASSERT((hz == 100000) || (hz == 400000) || (hz == 1000000)); I2cHandle.Instance = (I2C_TypeDef *)(obj->i2c); // Common settings: I2C clock = 32 MHz, Analog filter = ON, Digital filter coefficient = 0 diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c index b58c7ceb61..78ed4c396f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -83,7 +83,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); uint32_t pupd = STM_PIN_PUPD(data); @@ -119,7 +119,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c index df12181946..1777fd9b8c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #if DEVICE_SERIAL @@ -101,7 +101,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable UART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c index de4074a468..91915679e0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -105,7 +105,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c index c45b2a3521..a862d27e8a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -66,7 +66,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (ADCName)NC); + MBED_ASSERT(obj->adc != (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c index a5f23299e5..851676c92b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT @@ -46,7 +46,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac != (DACName)NC); + MBED_ASSERT(obj->dac != (DACName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_DAC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c index d106d3cc23..2c03901afc 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask @@ -63,7 +63,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h index 0e41836794..1b20c574cc 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c index 48a26dd7d5..9f6b9c22c7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -62,7 +62,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c index 3d1e396579..41e7c1ad7e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -67,7 +67,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -111,7 +111,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c index e55879d681..750da1b17b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #if DEVICE_PWMOUT @@ -77,7 +77,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm != (PWMName)NC); + MBED_ASSERT(obj->pwm != (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_2) RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c index 35d11ceeb7..52978920e0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #if DEVICE_SERIAL @@ -91,7 +91,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c index 52e5d16d29..e0b3d63536 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -105,7 +105,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c index 5db72b622e..234b88a12e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogin_api.h" #include "wait_api.h" @@ -63,7 +63,7 @@ void analogin_init(analogin_t *obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc == (ADCName)NC); + MBED_ASSERT(obj->adc == (ADCName)NC); // Configure GPIO pinmap_pinout(pin, PinMap_ADC); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c index b491cba225..758c366058 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT @@ -46,7 +46,7 @@ void analogout_init(dac_t *obj, PinName pin) { // Get the peripheral name (DAC_1, ...) from the pin and assign it to the object obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC); - assert(obj->dac == (DACName)NC); + MBED_ASSERT(obj->dac == (DACName)NC); dac = (DAC_TypeDef *)(obj->dac); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c index 6ed13d35b0..d0cd2f1a0c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" @@ -35,7 +35,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx); uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); pin_function(pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF)); @@ -65,7 +65,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (direction == PIN_OUTPUT) { pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)); } else { // PIN_INPUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h index 65d1f43622..3d01191b4b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" @@ -49,7 +49,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) { *obj->reg_set = obj->mask; } else { @@ -58,7 +58,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c index 56b2e6aede..cecdc24862 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -68,7 +68,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2CName)pinmap_merge(i2c_sda, i2c_scl); - assert(obj->i2c != (I2CName)NC); + MBED_ASSERT(obj->i2c != (I2CName)NC); // Enable I2C clock if (obj->i2c == I2C_1) { @@ -95,7 +95,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { } void i2c_frequency(i2c_t *obj, int hz) { - assert((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); + MBED_ASSERT((hz == 100000) || (hz == 200000) || (hz == 400000) || (hz == 1000000)); I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c); I2C_InitTypeDef I2C_InitStructure; uint32_t tim; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c index 841b3a5517..95939ab5be 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" @@ -72,7 +72,7 @@ uint32_t Set_GPIO_Clock(uint32_t port_idx) { * Configure pin (mode, speed, output type and pull-up/pull-down) */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); // Get the pin informations uint32_t mode = STM_PIN_MODE(data); @@ -116,7 +116,7 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = STM_PORT(pin); uint32_t pin_index = STM_PIN(pin); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c index bb250b050f..6a49b523e1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "pwmout_api.h" #include "cmsis.h" @@ -88,7 +88,7 @@ static const PinMap PinMap_PWM[] = { void pwmout_init(pwmout_t* obj, PinName pin) { // Get the peripheral name from the pin and assign it to the object obj->pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); - assert(obj->pwm == (PWMName)NC); + MBED_ASSERT(obj->pwm == (PWMName)NC); // Enable TIM clock if (obj->pwm == PWM_1) RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c index 9ff2d5c5af..c929f617fb 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" @@ -92,7 +92,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) { // Get the peripheral name from the pin and assign it to the object obj->uart = (UARTName)pinmap_merge(uart_tx, uart_rx); - assert(obj->uart != (UARTName)NC); + MBED_ASSERT(obj->uart != (UARTName)NC); // Enable USART clock if (obj->uart == UART_1) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c index c8a2c0faed..effd378dc4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -102,7 +102,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel obj->spi = (SPIName)pinmap_merge(spi_data, spi_cntl); - assert(obj->spi != (SPIName)NC); + MBED_ASSERT(obj->spi != (SPIName)NC); // Enable SPI clock if (obj->spi == SPI_2) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c index 8bbda47324..796b231016 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN @@ -49,7 +49,7 @@ static const PinMap PinMap_ADC[] = { void analogin_init(analogin_t *obj, PinName pin) { obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); - assert(obj->adc != (uint32_t)NC); + MBED_ASSERT(obj->adc != (uint32_t)NC); // ensure power is turned on RCC->AHB1ENR |= RCC_AHB1ENR_GPIOAEN | RCC_AHB1ENR_GPIOBEN | diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c index 6d33fc4ec3..f3178b4d33 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "gpio_api.h" #include "pinmap.h" uint32_t gpio_set(PinName pin) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t port_index = (uint32_t) pin >> 4; // Enable GPIO peripheral clock @@ -49,7 +49,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) { } void gpio_dir(gpio_t *obj, PinDirection direction) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); switch (direction) { case PIN_INPUT : pin_function(obj->pin, STM_PIN_DATA(0, 0)); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h index 4b7855ecd6..bf35cf2b91 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include +#include "assert.h" #ifdef __cplusplus extern "C" { @@ -34,7 +34,7 @@ typedef struct { } gpio_t; static inline void gpio_write(gpio_t *obj, int value) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); if (value) *obj->reg_set = obj->mask; else @@ -42,7 +42,7 @@ static inline void gpio_write(gpio_t *obj, int value) { } static inline int gpio_read(gpio_t *obj) { - assert(obj->pin != (PinName)NC); + MBED_ASSERT(obj->pin != (PinName)NC); return ((*obj->reg_in & obj->mask) ? 1 : 0); } diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c index ea79a8402c..d49907002f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "i2c_api.h" #if DEVICE_I2C @@ -125,7 +125,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) { I2CName i2c_sda = (I2CName)pinmap_peripheral(sda, PinMap_I2C_SDA); I2CName i2c_scl = (I2CName)pinmap_peripheral(scl, PinMap_I2C_SCL); obj->i2c = (I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); - assert((int)obj->i2c != NC); + MBED_ASSERT((int)obj->i2c != NC); // enable power i2c_power_enable(obj); diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c index e7c7fe25f6..560d599fe4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "pinmap.h" #include "error.h" @@ -21,7 +21,7 @@ * Set the pin into input, output, alternate function or analog mode */ void pin_function(PinName pin, int data) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); int mode = STM_PIN_MODE(data); int func = STM_PIN_FUNC(data); @@ -54,7 +54,7 @@ void pin_function(PinName pin, int data) { } void pin_mode(PinName pin, PinMode mode) { - assert(pin != (PinName)NC); + MBED_ASSERT(pin != (PinName)NC); uint32_t pin_number = (uint32_t)pin; int port_index = pin_number >> 4; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c index c6c57a8feb..091e97aadf 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "assert.h" #include "spi_api.h" #if DEVICE_SPI @@ -75,7 +75,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel SPIName spi_data = (SPIName)pinmap_merge(spi_mosi, spi_miso); SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel); obj->spi = (SPI_TypeDef*)pinmap_merge(spi_data, spi_cntl); - assert((int)obj->spi != NC) + MBED_ASSERT((int)obj->spi != NC) // enable power and clocking switch ((int)obj->spi) { @@ -121,7 +121,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel void spi_free(spi_t *obj) {} void spi_format(spi_t *obj, int bits, int mode, int slave) { - assert(((bits == 8) || (bits == 16)) && ((mode >= 0) && (mode <= 3))); + MBED_ASSERT(((bits == 8) || (bits == 16)) && ((mode >= 0) && (mode <= 3))); ssp_disable(obj); int polarity = (mode & 0x2) ? 1 : 0; From 324407b59a04be14417d58cd361bae56a0a83f34 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 28 May 2014 16:38:00 +0200 Subject: [PATCH 11/13] assert rename to mbed_assert header file --- libraries/mbed/api/{assert.h => mbed_assert.h} | 2 +- .../targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c | 2 +- .../targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c | 2 +- .../targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c | 2 +- .../targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c | 2 +- .../hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c | 2 +- .../targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c | 2 +- .../targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c | 2 +- .../TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c | 2 +- .../TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c | 2 +- .../TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h | 2 +- .../TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c | 2 +- .../hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c | 2 +- .../TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c | 2 +- .../TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c | 2 +- .../TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c | 2 +- .../targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c | 2 +- .../targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c | 2 +- .../targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c | 2 +- .../targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c | 2 +- .../targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c | 2 +- .../targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c | 2 +- libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c | 2 +- .../targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c | 2 +- libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c | 2 +- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c | 2 +- 201 files changed, 201 insertions(+), 201 deletions(-) rename libraries/mbed/api/{assert.h => mbed_assert.h} (93%) diff --git a/libraries/mbed/api/assert.h b/libraries/mbed/api/mbed_assert.h similarity index 93% rename from libraries/mbed/api/assert.h rename to libraries/mbed/api/mbed_assert.h index 9b6639197f..5e205d023f 100644 --- a/libraries/mbed/api/assert.h +++ b/libraries/mbed/api/mbed_assert.h @@ -26,7 +26,7 @@ void mbed_assert_internal(const char *expr, const char *file, int line); #else #define MBED_ASSERT(expr) \ do { \ - if (!expr) { \ + if (!(expr)) { \ mbed_assert_internal(#expr, __FILE__, __LINE__); \ } \ } while (0) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c index 5202b664e6..8ecbcb2770 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c index d2d419f980..77a8d21cbc 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h index b61ca7b6b4..ca2c0d64f8 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c index 8ed5bb9e1f..b2801bbd7c 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c index 18f145b60c..89f83c2cd9 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" void pin_function(PinName pin, int function) { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c index cee5004261..bc417ee900 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c index 86f24f6297..075b587308 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" // math.h required for floating point operations for baud rate calculation diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c index 6e04c5aece..974da330e9 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #include diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c index 4cd4e30b08..f4b699e8d7 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #include diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c index 605606590c..4e3f52c35c 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c index 7e06304e0e..f48c797d09 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c index da01baa5da..bb3556fe2c 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c index e18428bed1..44099d6b3d 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c index 3d2fd73f32..c67d237676 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" void pin_function(PinName pin, int function) { diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c index 13e1c287e4..3a7be521da 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c index 2136fb6074..4945b7683d 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" // math.h required for floating point operations for baud rate calculation diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c index 26773be524..2e11e90118 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c index 00ed256f1d..a789bb005b 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "fsl_port_hal.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h index 13e6c4c72c..723210e4ca 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "fsl_gpio_hal.h" #ifdef __cplusplus diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c index bf232d08fb..60b2f81cc2 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c index 73e9ca72e5..ecd34ee9eb 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" #include "fsl_clock_manager.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c index f585c20d84..a4d102ae7a 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c index 568e340a04..463b57bf1a 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c @@ -17,7 +17,7 @@ // math.h required for floating point operations for baud rate calculation #include -#include "assert.h" +#include "mbed_assert.h" #include diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c index 2b81dad0e8..1d7b88594f 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c index a4e9ed1335..c0802c9675 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c index 27f71c0c26..571b232ec5 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c index 797552a22f..f1c704272f 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c index 343260e39b..3e5f230741 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c index 7c989acc66..0b7f02909d 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c index 78e2ecc7a4..b6dd1b0516 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c @@ -16,7 +16,7 @@ // math.h required for floating point operations for baud rate calculation //#include #include -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c index 66f49b26ec..6a51a629c1 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ //#include -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c index fef7115ab0..5d7fe5b3d0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c index fb5673eded..97863afb3c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c index c1e3cebc95..718ef5ea0f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c index f514d199ff..366b2e8c8b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c index b8db6bc863..036f70c007 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c index d4ea564edb..e6afbf19f3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c index b9f6fbccc0..795f0dc476 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c index 09fcde0cfe..8a5a55a5e0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c index 1edeaccaa6..04175a8e0c 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c index 49baef7037..e3b52e866b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c index 7d4d5b7268..f69ff01b92 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c index 1eae6f8f8f..388d4b085a 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c index 56b1f09315..96602bbce8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c index a30ec24666..5875ca9e85 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "reserved_pins.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h index ba1b39ef3b..2d93b59850 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c index 5a1e1d67ce..71b1925c02 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c index af8f285da5..9c76cea99f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c index 436801e51b..4500af4610 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c index 52a8b856ac..815f918ac5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c index 438f5abd46..a98dc182a1 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c index b9f6fbccc0..795f0dc476 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c index 5b514276f8..9300b42d04 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c index f1687a7753..5b671a4eed 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c index 05de0627e4..70003372c3 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c index 1396380ba4..0d4fa92729 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c index a3d7f22976..1e8da47b82 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c index 31c341874d..cacd5a2a66 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c index 9dbc1dfca7..27964f4bfb 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c index 74dff1c81d..5c9d57a1b8 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c index bd6b104764..624a4d76b5 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h index 93287cd840..35ef92f18e 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c index c3969aa0e8..1ad7d05f60 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c index 8b3f929e94..abc15268ad 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c index 24596e9e3b..b64fdf6ec9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c index ad4f762955..944696e5d7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c index bb819171ad..c4f070b123 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c index a97e765ae5..2015c0d43d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c index 49dcd90305..ae64e8e179 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c index 56db2cbe8b..5aab445133 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "can_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c index a74f4271cc..6a133b67aa 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c index 94664f4162..c7eea7cee7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c index 56533540f9..c5619a86bb 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c index b3c7d09f05..b8e2050e1d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c index 59b233523a..6c056730cc 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c index f226316bd5..27e9f1cf84 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c index 3d5359011c..4c3770e836 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c index 640e1b17a0..66c77ceace 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c index ee2632f47c..a3170acc1d 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/can_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "can_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c index d3477c4582..10ac3664fc 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c index 317c73b3d3..1c82ad78cc 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c index 75e4bc07f8..3773d7e6b7 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c index ddadfc11b3..1e0faf79b0 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c index 2226b3f371..9247eedbda 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c index 8ac67fe8fa..7681e3f568 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c index 712c3c9209..e694c2fcfb 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c index 48078b6547..5f2f3d4c2b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c index 93ee430e12..eaa103a585 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c index 383e83a2ee..e10e0eb034 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c index 1d3ef30d20..3f34e397f9 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pwmout_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c index 06269db915..ecbb19d218 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c index 5851b36884..c1e5eed469 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogout_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c index e4068505b2..878087e6fe 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c index b620c8c63b..4f1b48a926 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c index c4e1f7b643..cb25a5a039 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c @@ -15,7 +15,7 @@ * * Ported to NXP LPC43XX by Micromint USA */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c index d2c1e50901..2059675243 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h index 53e15a5329..16af304736 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c index c8d9090ccf..b75dfbe990 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c index dbb190ba6d..e6d8da2f7f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c @@ -14,7 +14,7 @@ * limitations under the License. */ // math.h required for floating point operations for baud rate calculation -#include "assert.h" +#include "mbed_assert.h" #include #include diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c index 6357844467..6634c57ac6 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include #include "spi_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c index 35aa3e44dd..fe5ed1007e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "wait_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c index 89e1825780..1457290315 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h index 0f6ff3fd85..4f35e2d29b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c index 004342c663..41b4b9e123 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c index 2821e9e31e..6a417b3c0b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "device.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c index a4d8b49c6d..930180e3b6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c index 618b73625d..7ca0493e9f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c index db5d7c3b49..b9e0a58db7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "wait_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c index 4810ee8fea..e2751f3b67 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h index 4dc8323d7e..d3142d5c71 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c index 41b58c6f2a..48d9467ca1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c index 97c851faa9..57de90c400 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "device.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c index c1c23b6336..adfe65f386 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c index c29b9aa56c..7a9cbe8bd5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c index 796b1dd369..b2d53cd3e1 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c index ff2b16ea31..f95f160382 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "wait_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c index 43a5e48243..5b97612803 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h index 3d01191b4b..75013b4188 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c index 3ffa6bd440..30b1978e0d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c index 906a875338..e59aade4b0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "device.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c index e7747a37de..8a8a057d9a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c index 5840bdf28c..07be4d81e3 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c index 6e8a578594..4729a03b19 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c index ed7bbe1789..72fa34eebb 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h index 2806d99bff..53d67abccd 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c index 7dba174da8..3457b05344 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c index 3045641f6c..70deb55e4a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "device.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c index 406dd704e0..230e4c2bef 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c index baa7993df7..91701a8a5f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c index 43a5e48243..5b97612803 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h index 3d01191b4b..75013b4188 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c index 8507d9493f..fe432ee37f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c index 76aaa0a253..dca0305b81 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c index 3f6c1824e8..1c9e475e43 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #if DEVICE_PWMOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c index 2a02be4c4e..1d57bf0b32 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #if DEVICE_SERIAL diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c index fc1202a574..e529c2719c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c index 23fe27d05a..98a4e81038 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c index ad82dd17b0..6ec02db5ad 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h index 74602cf866..d731d97d05 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c index 735cfe84c0..f0ae80b59a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c index 5833a677ba..7beb6e92e5 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c index ae06999c08..f3fd6aab11 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #if DEVICE_PWMOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c index 46124b271d..9bee4cb5df 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #if DEVICE_SERIAL diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c index a7178f555d..5adc176bec 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c index 5a69c40add..a4a92683a9 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c index c3c8fb9ad2..8a61f5f774 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c index 43a5e48243..5b97612803 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h index 3d01191b4b..75013b4188 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c index 4b6b7d8a42..5d7b23acf6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c index 7fbc77c3b5..50c7792349 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c index 5a18664b63..a83d106849 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #if DEVICE_SERIAL diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c index f580901d41..d49b6b28cf 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c index 1a724441bf..94f4bc39b7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c index 638dc92748..316295d4da 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h index 02764453d0..a8c99da3b6 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c index a26bf5b3b1..085baa85fb 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c index 14efe5cd2d..dd55e6dcac 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c index e35a8d108a..d3bd6a3d48 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #if DEVICE_SERIAL diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c index 0a85a13a39..990c5899c7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c index 4ed03cb5fc..9e352048e4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c index cce692dc83..991acd2a63 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c index f12c5fb38e..de541d16d7 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h index 3d01191b4b..75013b4188 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c index e157ca388d..cda12adb35 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c index 78ed4c396f..66292a3da2 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c index 1777fd9b8c..e1a5b5d3c4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #if DEVICE_SERIAL diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c index 91915679e0..035d38555f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c index a862d27e8a..333edb19c9 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c index 851676c92b..c921f44526 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c index 2c03901afc..1183c2805c 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h index 1b20c574cc..ea803c0fbc 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c index 9f6b9c22c7..6bb78042bf 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c index 41e7c1ad7e..0bfc6811c4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c index 750da1b17b..50c4fca738 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #if DEVICE_PWMOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c index 52978920e0..6568fa503e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #if DEVICE_SERIAL diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c index e0b3d63536..b1304dc92b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c index 234b88a12e..80dee1e28d 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogin_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #include "wait_api.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c index 758c366058..9de3c92f51 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/analogout_api.c @@ -25,7 +25,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogout_api.h" #if DEVICE_ANALOGOUT diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c index d0cd2f1a0c..6743f91187 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h index 3d01191b4b..75013b4188 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_object.h @@ -30,7 +30,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #include "cmsis.h" #include "PortNames.h" #include "PeripheralNames.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c index cecdc24862..ee7acf1282 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/i2c_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c index 95939ab5be..b8989a93c0 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "PortNames.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c index 6a49b523e1..a37f7b3c82 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pwmout_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "pwmout_api.h" #include "cmsis.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c index c929f617fb..f8408aabbd 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/serial_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "serial_api.h" #include "cmsis.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c index effd378dc4..5bae376b15 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************* */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c index 796b231016..e2fdc6a513 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "analogin_api.h" #if DEVICE_ANALOGIN diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c index f3178b4d33..e35d1f2f68 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "gpio_api.h" #include "pinmap.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h index bf35cf2b91..fcf499289e 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/gpio_object.h @@ -16,7 +16,7 @@ #ifndef MBED_GPIO_OBJECT_H #define MBED_GPIO_OBJECT_H -#include "assert.h" +#include "mbed_assert.h" #ifdef __cplusplus extern "C" { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c index d49907002f..b9e619bedc 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "i2c_api.h" #if DEVICE_I2C diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c index 560d599fe4..33a08966f8 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "pinmap.h" #include "error.h" diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c index 091e97aadf..7617ead217 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "assert.h" +#include "mbed_assert.h" #include "spi_api.h" #if DEVICE_SPI From e70c8daf8511dc69afd239ed79d8f7774988d6fa Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Wed, 28 May 2014 16:41:29 +0200 Subject: [PATCH 12/13] mbed assert - guard macro correction --- libraries/mbed/api/mbed_assert.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/mbed/api/mbed_assert.h b/libraries/mbed/api/mbed_assert.h index 5e205d023f..de74992e14 100644 --- a/libraries/mbed/api/mbed_assert.h +++ b/libraries/mbed/api/mbed_assert.h @@ -1,5 +1,5 @@ -#ifndef ASSERT_H -#define ASSERT_H +#ifndef MBED_ASSERT_H +#define MBED_ASSERT_H #ifdef __cplusplus extern "C" { From 3ce40e2f75fbdc0039288b7708a230104a7b99eb Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Thu, 29 May 2014 08:57:21 +0200 Subject: [PATCH 13/13] License headers for new assert files. --- libraries/mbed/api/mbed_assert.h | 21 ++++++++++++++++++--- libraries/mbed/common/assert.c | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/libraries/mbed/api/mbed_assert.h b/libraries/mbed/api/mbed_assert.h index de74992e14..1bcfb092ba 100644 --- a/libraries/mbed/api/mbed_assert.h +++ b/libraries/mbed/api/mbed_assert.h @@ -1,3 +1,18 @@ +/* mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef MBED_ASSERT_H #define MBED_ASSERT_H @@ -5,9 +20,9 @@ extern "C" { #endif -/** This function is active only if NDEBUG is not defined prior to including this +/** Internal mbed assert function which is invoked when MBED_ASSERT macro failes. + * This function is active only if NDEBUG is not defined prior to including this * assert header file. - * Internal mbed assert function which is invoked when MBED_ASSERT macro failes. * In case of MBED_ASSERT failing condition, the assertation message is printed * to stderr and mbed_die() is called. * @param expr Expresion to be checked. @@ -26,7 +41,7 @@ void mbed_assert_internal(const char *expr, const char *file, int line); #else #define MBED_ASSERT(expr) \ do { \ - if (!(expr)) { \ + if (!(expr)) { \ mbed_assert_internal(#expr, __FILE__, __LINE__); \ } \ } while (0) diff --git a/libraries/mbed/common/assert.c b/libraries/mbed/common/assert.c index db9571495b..51394707b0 100644 --- a/libraries/mbed/common/assert.c +++ b/libraries/mbed/common/assert.c @@ -1,4 +1,19 @@ -#include "assert.h" +/* mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "mbed_assert.h" #include "device.h" #if DEVICE_STDIO_MESSAGES