Reformat. Clean up. Use more clear variable names.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3964 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/drv/ser_stm32.c b/bertos/cpu/cortex-m3/drv/ser_stm32.c
index 081a057997ac90e589e145235a630cf282d98b47..a74b7fe0d6d4430ea600880f65c53e1880f7ad0d 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/ser_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/ser_stm32.c
@@ -72,8 +72,8 @@ struct gpio_uart_info
        uint32_t rx_pin;
        uint32_t tx_pin;
        /* Sysctl */
-       uint32_t sysctl;
-       uint32_t sysctl1;
+       uint32_t sysctl_gpio;
+       uint32_t sysctl_usart;
 
 };
 
@@ -85,24 +85,24 @@ static const struct gpio_uart_info gpio_uart[SER_CNT] =
                .base = GPIOA_BASE,
                .rx_pin = GPIO_USART1_RX_PIN,
                .tx_pin = GPIO_USART1_TX_PIN,
-               .sysctl = RCC_APB2_GPIOA,
-               .sysctl1 = RCC_APB2_USART1,
+               .sysctl_gpio = RCC_APB2_GPIOA,
+               .sysctl_usart = RCC_APB2_USART1,
        },
        /* UART2 */
        {
                .base = GPIOA_BASE,
                .rx_pin = GPIO_USART2_RX_PIN,
                .tx_pin = GPIO_USART2_TX_PIN,
-               .sysctl = RCC_APB2_GPIOA,
-               .sysctl1 = RCC_APB1_USART2,
+               .sysctl_gpio = RCC_APB2_GPIOA,
+               .sysctl_usart = RCC_APB1_USART2,
        },
        /* UART3 */
        {
                .base = GPIOB_BASE,
                .rx_pin = GPIO_USART3_RX_PIN,
                .tx_pin = GPIO_USART3_TX_PIN,
-               .sysctl = RCC_APB2_GPIOB,
-               .sysctl1 = RCC_APB1_USART3,
+               .sysctl_gpio = RCC_APB2_GPIOB,
+               .sysctl_usart = RCC_APB1_USART3,
        },
 };
 
@@ -149,16 +149,16 @@ void stm32_uartInit(int port)
 
        /* Enable clocking on AFIO */
        RCC->APB2ENR |= RCC_APB2_AFIO;
-       RCC->APB2ENR |=  gpio_uart[port].sysctl;
+       RCC->APB2ENR |= gpio_uart[port].sysctl_gpio;
 
        /* Configure USART pins */
        if (port == USART1_PORT)
        {
-               RCC->APB2ENR |=  gpio_uart[port].sysctl1;
+               RCC->APB2ENR |=  gpio_uart[port].sysctl_usart;
        }
        else
        {
-               RCC->APB1ENR |=  gpio_uart[port].sysctl1;
+               RCC->APB1ENR |=  gpio_uart[port].sysctl_usart;
        }
 
        stm32_gpioPinConfig((struct stm32_gpio *)gpio_uart[port].base,  gpio_uart[port].tx_pin,
@@ -168,9 +168,9 @@ void stm32_uartInit(int port)
                                GPIO_MODE_IN_FLOATING, GPIO_SPEED_50MHZ);
 
        /* Clear control registry */
-       base->CR2 = 0; //CR2_CLEAR_MASK;
-       base->CR1 = 0; //CR1_CLEAR_MASK;
-       base->CR3 = 0; //CR3_CLEAR_MASK;
+       base->CR2 = 0;
+       base->CR1 = 0;
+       base->CR3 = 0;
        base->SR = 0;
 
        /* Set serial param: 115.200 bps, no parity */

diff --git a/bertos/cpu/cortex-m3/io/stm32_adc.h b/bertos/cpu/cortex-m3/io/stm32_adc.h
index 24bd2479e5f5fa0f76374810eb634835e127ec7a..09bb07487fd251563dc3102b7b86214065286937 100644 (file)
--- a/bertos/cpu/cortex-m3/io/stm32_adc.h
+++ b/bertos/cpu/cortex-m3/io/stm32_adc.h
@@ -272,7 +272,7 @@
 /* ADC registers Masks */\r
 #define CR1_ADC_CLEAR_MASK             ((uint32_t)0xFFF0FEFF)\r
 #define CR2_ADC_CLEAR_MASK             ((uint32_t)0xFFF1F7FD)\r
-#define SQR1_CLEAR_MASK            ((uint32_t)0xFF0FFFFF)
+#define SQR1_CLEAR_MASK                ((uint32_t)0xFF0FFFFF)