From 4ad143ae959a9a49b0126bd1c1c7a0e4e15b189b Mon Sep 17 00:00:00 2001 From: bcostm Date: Sat, 1 Feb 2014 22:05:45 +0100 Subject: [PATCH] Typo corrections --- .../hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c | 4 +--- .../TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c | 1 - .../hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c | 11 +++-------- .../hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c | 6 ++---- .../hal/TARGET_STM/TARGET_NUCLEO_F030R8/sleep.c | 2 +- .../hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c | 6 ++---- .../TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c | 1 - .../hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c | 12 ++++-------- .../hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c | 6 ++---- .../hal/TARGET_STM/TARGET_NUCLEO_F103RB/sleep.c | 4 ++-- .../hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c | 4 +--- .../TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c | 1 - .../hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c | 11 +++-------- .../hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c | 6 ++---- .../hal/TARGET_STM/TARGET_NUCLEO_L152RE/sleep.c | 2 +- 15 files changed, 24 insertions(+), 53 deletions(-) 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 12e62e3b61..d4610ccaa1 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 @@ -42,15 +42,13 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) { - GPIO_TypeDef *gpio; - if (pin == NC) return; uint32_t port_index = STM_PORT(pin); // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use obj->pin = pin; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c index 59317882f5..6981316786 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c @@ -48,7 +48,6 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0}; static gpio_irq_handler irq_handler; static void handle_interrupt_in(uint32_t irq_index) { - // Retrieve the gpio and pin that generate the irq GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); 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 6b8c243c37..16f55fe88f 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 @@ -30,7 +30,6 @@ #include "pinmap.h" #include "error.h" -// Not an API function // Enable GPIO clock and return GPIO base address uint32_t Set_GPIO_Clock(uint32_t port_idx) { uint32_t gpio_add = 0; @@ -66,9 +65,6 @@ 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) { - GPIO_TypeDef *gpio; - GPIO_InitTypeDef GPIO_InitStructure; - if (pin == NC) return; // Get the pin informations @@ -82,7 +78,7 @@ void pin_function(PinName pin, int data) { // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Configure Alternate Function // Warning: Must be done before the GPIO is initialized @@ -91,6 +87,7 @@ void pin_function(PinName pin, int data) { } // Configure GPIO + GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_Level_3; @@ -113,8 +110,6 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - GPIO_TypeDef *gpio; - if (pin == NC) return; uint32_t port_index = STM_PORT(pin); @@ -122,7 +117,7 @@ void pin_mode(PinName pin, PinMode mode) { // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c index 7229e75f7c..7ac6b29095 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c @@ -43,13 +43,11 @@ PinName port_pin(PortName port, int pin_n) { } void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { - GPIO_TypeDef *gpio; - - uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...) + uint32_t port_index = (uint32_t)port; // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill PORT object structure for future use obj->port = port; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/sleep.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/sleep.c index 4179a6aaea..2399412e6f 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/sleep.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/sleep.c @@ -38,7 +38,7 @@ void sleep(void) SCB->SCR = 0; // Normal sleep mode for ARM core __WFI(); - // Re-ensable us_ticker update interrupt + // Re-enable us_ticker update interrupt TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE); } 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 6506e24651..4f52a19f2a 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 @@ -42,22 +42,20 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) { - GPIO_TypeDef *gpio; - if (pin == NC) return; uint32_t port_index = STM_PORT(pin); // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + 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; - obj->reg_clr = &gpio->BRR; + obj->reg_clr = &gpio->BRR; // Configure GPIO if (direction == PIN_OUTPUT) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c index 9461ed5357..150baf8454 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c @@ -48,7 +48,6 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0, 0}; static gpio_irq_handler irq_handler; static void handle_interrupt_in(uint32_t irq_index) { - // Retrieve the gpio and pin that generate the irq GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); 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 3868712f66..5d712cc319 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 @@ -43,7 +43,6 @@ static const uint32_t AF_mapping[] = { GPIO_Remap_I2C1 // 8 }; -// Not an API function // Enable GPIO clock and return GPIO base address uint32_t Set_GPIO_Clock(uint32_t port_idx) { uint32_t gpio_add = 0; @@ -75,9 +74,6 @@ 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) { - GPIO_TypeDef *gpio; - GPIO_InitTypeDef GPIO_InitStructure; - if (pin == NC) return; // Get the pin informations @@ -89,7 +85,7 @@ void pin_function(PinName pin, int data) { // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Enable AFIO clock RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); @@ -101,6 +97,7 @@ void pin_function(PinName pin, int data) { } // Configure GPIO + GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; @@ -120,9 +117,8 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - GPIO_TypeDef *gpio; GPIO_InitTypeDef GPIO_InitStructure; - + if (pin == NC) return; uint32_t port_index = STM_PORT(pin); @@ -130,7 +126,7 @@ void pin_mode(PinName pin, PinMode mode) { // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Configure open-drain and pull-up/down switch (mode) { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c index 97340e2dfa..ea453d23b4 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c @@ -43,13 +43,11 @@ PinName port_pin(PortName port, int pin_n) { } void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { - GPIO_TypeDef *gpio; - - uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...) + uint32_t port_index = (uint32_t)port; // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill PORT object structure for future use obj->port = port; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/sleep.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/sleep.c index 5fd25c4717..4cc5d17f4b 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/sleep.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/sleep.c @@ -38,7 +38,7 @@ void sleep(void) SCB->SCR = 0; // Normal sleep mode for ARM core __WFI(); - // Re-ensable us_ticker update interrupt + // Re-enable us_ticker update interrupt TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE); } @@ -53,6 +53,6 @@ void deepsleep(void) // Request to enter STOP mode with regulator in low power mode PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI); - // Re-ensable us_ticker update interrupt + // Re-enable us_ticker update interrupt TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE); } 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 92300cc6d2..646a4a74c2 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 @@ -42,15 +42,13 @@ uint32_t gpio_set(PinName pin) { } void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) { - GPIO_TypeDef *gpio; - if (pin == NC) return; uint32_t port_index = STM_PORT(pin); // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill GPIO object structure for future use obj->pin = pin; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c index d2ea1e058a..ed1bc95766 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c @@ -48,7 +48,6 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0, 0}; static gpio_irq_handler irq_handler; static void handle_interrupt_in(uint32_t irq_index) { - // Retrieve the gpio and pin that generate the irq GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); 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 07625aa08c..391bbc68ed 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 @@ -30,7 +30,6 @@ #include "pinmap.h" #include "error.h" -// Not an API function // Enable GPIO clock and return GPIO base address uint32_t Set_GPIO_Clock(uint32_t port_idx) { uint32_t gpio_add = 0; @@ -66,9 +65,6 @@ 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) { - GPIO_TypeDef *gpio; - GPIO_InitTypeDef GPIO_InitStructure; - if (pin == NC) return; // Get the pin informations @@ -82,7 +78,7 @@ void pin_function(PinName pin, int data) { // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Configure Alternate Function // Warning: Must be done before the GPIO is initialized @@ -91,6 +87,7 @@ void pin_function(PinName pin, int data) { } // Configure GPIO + GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_40MHz; @@ -113,8 +110,6 @@ void pin_function(PinName pin, int data) { * Configure pin pull-up/pull-down */ void pin_mode(PinName pin, PinMode mode) { - GPIO_TypeDef *gpio; - if (pin == NC) return; uint32_t port_index = STM_PORT(pin); @@ -122,7 +117,7 @@ void pin_mode(PinName pin, PinMode mode) { // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Configure pull-up/pull-down resistors uint32_t pupd = (uint32_t)mode; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c index 7229e75f7c..7ac6b29095 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c @@ -43,13 +43,11 @@ PinName port_pin(PortName port, int pin_n) { } void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { - GPIO_TypeDef *gpio; - - uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...) + uint32_t port_index = (uint32_t)port; // Enable GPIO clock uint32_t gpio_add = Set_GPIO_Clock(port_index); - gpio = (GPIO_TypeDef *)gpio_add; + GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add; // Fill PORT object structure for future use obj->port = port; diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/sleep.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/sleep.c index a6e2147d15..b278fc189a 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/sleep.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/sleep.c @@ -111,7 +111,7 @@ void sleep(void) // Request to enter SLEEP mode with regulator ON PWR_EnterSleepMode(PWR_Regulator_ON, PWR_SLEEPEntry_WFI); - // Re-ensable us_ticker update interrupt + // Re-enable us_ticker update interrupt TIM_ITConfig(TIM9, TIM_IT_Update, ENABLE); }