ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Typo corrections

pull/158/head
bcostm 2014-02-01 22:05:45 +01:00
parent ae20d141c5
commit 4ad143ae95
15 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c
View File

@ -42,15 +42,13 @@ uint32_t gpio_set(PinName pin) {
} }
void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) { void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
GPIO_TypeDef *gpio;
if (pin == NC) return; if (pin == NC) return;
uint32_t port_index = STM_PORT(pin); uint32_t port_index = STM_PORT(pin);
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Fill GPIO object structure for future use
obj->pin = pin; obj->pin = pin;

1
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c
View File

@ -48,7 +48,6 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0};
static gpio_irq_handler irq_handler; static gpio_irq_handler irq_handler;
static void handle_interrupt_in(uint32_t irq_index) { static void handle_interrupt_in(uint32_t irq_index) {
// Retrieve the gpio and pin that generate the irq // Retrieve the gpio and pin that generate the irq
GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]);
uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]);

11
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c
View File

@ -30,7 +30,6 @@
#include "pinmap.h" #include "pinmap.h"
#include "error.h" #include "error.h"
// Not an API function
// Enable GPIO clock and return GPIO base address // Enable GPIO clock and return GPIO base address
uint32_t Set_GPIO_Clock(uint32_t port_idx) { uint32_t Set_GPIO_Clock(uint32_t port_idx) {
uint32_t gpio_add = 0; 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) * Configure pin (mode, speed, output type and pull-up/pull-down)
*/ */
void pin_function(PinName pin, int data) { void pin_function(PinName pin, int data) {
GPIO_TypeDef *gpio;
GPIO_InitTypeDef GPIO_InitStructure;
if (pin == NC) return; if (pin == NC) return;
// Get the pin informations // Get the pin informations
@ -82,7 +78,7 @@ void pin_function(PinName pin, int data) {
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); uint32_t gpio_add = Set_GPIO_Clock(port_index);
gpio = (GPIO_TypeDef *)gpio_add; GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add;
// Configure Alternate Function // Configure Alternate Function
// Warning: Must be done before the GPIO is initialized // Warning: Must be done before the GPIO is initialized
@ -91,6 +87,7 @@ void pin_function(PinName pin, int data) {
} }
// Configure GPIO // Configure GPIO
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index);
GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode; GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_Level_3; 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 * Configure pin pull-up/pull-down
*/ */
void pin_mode(PinName pin, PinMode mode) { void pin_mode(PinName pin, PinMode mode) {
GPIO_TypeDef *gpio;
if (pin == NC) return; if (pin == NC) return;
uint32_t port_index = STM_PORT(pin); uint32_t port_index = STM_PORT(pin);
@ -122,7 +117,7 @@ void pin_mode(PinName pin, PinMode mode) {
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Configure pull-up/pull-down resistors
uint32_t pupd = (uint32_t)mode; uint32_t pupd = (uint32_t)mode;

6
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c
View File

@ -43,13 +43,11 @@ PinName port_pin(PortName port, int pin_n) {
} }
void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { void port_init(port_t *obj, PortName port, int mask, PinDirection dir) {
GPIO_TypeDef *gpio; uint32_t port_index = (uint32_t)port;
uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...)
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Fill PORT object structure for future use
obj->port = port; obj->port = port;

2
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/sleep.c
View File

@ -38,7 +38,7 @@ void sleep(void)
SCB->SCR = 0; // Normal sleep mode for ARM core SCB->SCR = 0; // Normal sleep mode for ARM core
__WFI(); __WFI();
// Re-ensable us_ticker update interrupt // Re-enable us_ticker update interrupt
TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE); TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE);
} }

6
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c
View File

@ -42,22 +42,20 @@ uint32_t gpio_set(PinName pin) {
} }
void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) { void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
GPIO_TypeDef *gpio;
if (pin == NC) return; if (pin == NC) return;
uint32_t port_index = STM_PORT(pin); uint32_t port_index = STM_PORT(pin);
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Fill GPIO object structure for future use
obj->pin = pin; obj->pin = pin;
obj->mask = gpio_set(pin); obj->mask = gpio_set(pin);
obj->reg_in = &gpio->IDR; obj->reg_in = &gpio->IDR;
obj->reg_set = &gpio->BSRR; obj->reg_set = &gpio->BSRR;
obj->reg_clr = &gpio->BRR; obj->reg_clr = &gpio->BRR;
// Configure GPIO // Configure GPIO
if (direction == PIN_OUTPUT) { if (direction == PIN_OUTPUT) {

1
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c
View File

@ -48,7 +48,6 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0, 0};
static gpio_irq_handler irq_handler; static gpio_irq_handler irq_handler;
static void handle_interrupt_in(uint32_t irq_index) { static void handle_interrupt_in(uint32_t irq_index) {
// Retrieve the gpio and pin that generate the irq // Retrieve the gpio and pin that generate the irq
GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]);
uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]);

12
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c
View File

@ -43,7 +43,6 @@ static const uint32_t AF_mapping[] = {
GPIO_Remap_I2C1 // 8 GPIO_Remap_I2C1 // 8
}; };
// Not an API function
// Enable GPIO clock and return GPIO base address // Enable GPIO clock and return GPIO base address
uint32_t Set_GPIO_Clock(uint32_t port_idx) { uint32_t Set_GPIO_Clock(uint32_t port_idx) {
uint32_t gpio_add = 0; 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 * Configure pin (input, output, alternate function or analog) + output speed + AF
*/ */
void pin_function(PinName pin, int data) { void pin_function(PinName pin, int data) {
GPIO_TypeDef *gpio;
GPIO_InitTypeDef GPIO_InitStructure;
if (pin == NC) return; if (pin == NC) return;
// Get the pin informations // Get the pin informations
@ -89,7 +85,7 @@ void pin_function(PinName pin, int data) {
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); uint32_t gpio_add = Set_GPIO_Clock(port_index);
gpio = (GPIO_TypeDef *)gpio_add; GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add;
// Enable AFIO clock // Enable AFIO clock
RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE);
@ -101,6 +97,7 @@ void pin_function(PinName pin, int data) {
} }
// Configure GPIO // Configure GPIO
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index);
GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode; GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
@ -120,9 +117,8 @@ void pin_function(PinName pin, int data) {
* Configure pin pull-up/pull-down * Configure pin pull-up/pull-down
*/ */
void pin_mode(PinName pin, PinMode mode) { void pin_mode(PinName pin, PinMode mode) {
GPIO_TypeDef *gpio;
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
if (pin == NC) return; if (pin == NC) return;
uint32_t port_index = STM_PORT(pin); uint32_t port_index = STM_PORT(pin);
@ -130,7 +126,7 @@ void pin_mode(PinName pin, PinMode mode) {
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Configure open-drain and pull-up/down
switch (mode) { switch (mode) {

6
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c
View File

@ -43,13 +43,11 @@ PinName port_pin(PortName port, int pin_n) {
} }
void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { void port_init(port_t *obj, PortName port, int mask, PinDirection dir) {
GPIO_TypeDef *gpio; uint32_t port_index = (uint32_t)port;
uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...)
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Fill PORT object structure for future use
obj->port = port; obj->port = port;

4
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/sleep.c
View File

@ -38,7 +38,7 @@ void sleep(void)
SCB->SCR = 0; // Normal sleep mode for ARM core SCB->SCR = 0; // Normal sleep mode for ARM core
__WFI(); __WFI();
// Re-ensable us_ticker update interrupt // Re-enable us_ticker update interrupt
TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE); 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 // Request to enter STOP mode with regulator in low power mode
PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI); 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); TIM_ITConfig(TIM1, TIM_IT_Update, ENABLE);
} }

4
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c
View File

@ -42,15 +42,13 @@ uint32_t gpio_set(PinName pin) {
} }
void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) { void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
GPIO_TypeDef *gpio;
if (pin == NC) return; if (pin == NC) return;
uint32_t port_index = STM_PORT(pin); uint32_t port_index = STM_PORT(pin);
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Fill GPIO object structure for future use
obj->pin = pin; obj->pin = pin;

1
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c
View File

@ -48,7 +48,6 @@ static uint32_t channel_pin[CHANNEL_NUM] = {0, 0, 0, 0};
static gpio_irq_handler irq_handler; static gpio_irq_handler irq_handler;
static void handle_interrupt_in(uint32_t irq_index) { static void handle_interrupt_in(uint32_t irq_index) {
// Retrieve the gpio and pin that generate the irq // Retrieve the gpio and pin that generate the irq
GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]); GPIO_TypeDef *gpio = (GPIO_TypeDef *)(channel_gpio[irq_index]);
uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]); uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]);

11
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c
View File

@ -30,7 +30,6 @@
#include "pinmap.h" #include "pinmap.h"
#include "error.h" #include "error.h"
// Not an API function
// Enable GPIO clock and return GPIO base address // Enable GPIO clock and return GPIO base address
uint32_t Set_GPIO_Clock(uint32_t port_idx) { uint32_t Set_GPIO_Clock(uint32_t port_idx) {
uint32_t gpio_add = 0; 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) * Configure pin (mode, speed, output type and pull-up/pull-down)
*/ */
void pin_function(PinName pin, int data) { void pin_function(PinName pin, int data) {
GPIO_TypeDef *gpio;
GPIO_InitTypeDef GPIO_InitStructure;
if (pin == NC) return; if (pin == NC) return;
// Get the pin informations // Get the pin informations
@ -82,7 +78,7 @@ void pin_function(PinName pin, int data) {
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); uint32_t gpio_add = Set_GPIO_Clock(port_index);
gpio = (GPIO_TypeDef *)gpio_add; GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add;
// Configure Alternate Function // Configure Alternate Function
// Warning: Must be done before the GPIO is initialized // Warning: Must be done before the GPIO is initialized
@ -91,6 +87,7 @@ void pin_function(PinName pin, int data) {
} }
// Configure GPIO // Configure GPIO
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index); GPIO_InitStructure.GPIO_Pin = (uint16_t)(1 << pin_index);
GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode; GPIO_InitStructure.GPIO_Mode = (GPIOMode_TypeDef)mode;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_40MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_40MHz;
@ -113,8 +110,6 @@ void pin_function(PinName pin, int data) {
* Configure pin pull-up/pull-down * Configure pin pull-up/pull-down
*/ */
void pin_mode(PinName pin, PinMode mode) { void pin_mode(PinName pin, PinMode mode) {
GPIO_TypeDef *gpio;
if (pin == NC) return; if (pin == NC) return;
uint32_t port_index = STM_PORT(pin); uint32_t port_index = STM_PORT(pin);
@ -122,7 +117,7 @@ void pin_mode(PinName pin, PinMode mode) {
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Configure pull-up/pull-down resistors
uint32_t pupd = (uint32_t)mode; uint32_t pupd = (uint32_t)mode;

6
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c
View File

@ -43,13 +43,11 @@ PinName port_pin(PortName port, int pin_n) {
} }
void port_init(port_t *obj, PortName port, int mask, PinDirection dir) { void port_init(port_t *obj, PortName port, int mask, PinDirection dir) {
GPIO_TypeDef *gpio; uint32_t port_index = (uint32_t)port;
uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...)
// Enable GPIO clock // Enable GPIO clock
uint32_t gpio_add = Set_GPIO_Clock(port_index); 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 // Fill PORT object structure for future use
obj->port = port; obj->port = port;

2
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/sleep.c
View File

@ -111,7 +111,7 @@ void sleep(void)
// Request to enter SLEEP mode with regulator ON // Request to enter SLEEP mode with regulator ON
PWR_EnterSleepMode(PWR_Regulator_ON, PWR_SLEEPEntry_WFI); 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); TIM_ITConfig(TIM9, TIM_IT_Update, ENABLE);
} }