projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SEC: improve cipher API to allow variable-key ciphers.
[bertos.git]
/
bertos
/
cpu
/
cortex-m3
/
drv
/
ser_stm32.c
diff --git
a/bertos/cpu/cortex-m3/drv/ser_stm32.c
b/bertos/cpu/cortex-m3/drv/ser_stm32.c
index 315329bd8adae1391dd438ea4c98b737afefe039..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 rx_pin;
uint32_t tx_pin;
/* Sysctl */
- uint32_t sysctl;
- uint32_t sysctl
1
;
+ 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,
.base = GPIOA_BASE,
.rx_pin = GPIO_USART1_RX_PIN,
.tx_pin = GPIO_USART1_TX_PIN,
- .sysctl = RCC_APB2_GPIOA,
- .sysctl
1
= 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,
},
/* UART2 */
{
.base = GPIOA_BASE,
.rx_pin = GPIO_USART2_RX_PIN,
.tx_pin = GPIO_USART2_TX_PIN,
- .sysctl = RCC_APB2_GPIOA,
- .sysctl
1
= 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,
},
/* UART3 */
{
.base = GPIOB_BASE,
.rx_pin = GPIO_USART3_RX_PIN,
.tx_pin = GPIO_USART3_TX_PIN,
- .sysctl = RCC_APB2_GPIOB,
- .sysctl
1
= RCC_APB1_USART3,
+ .sysctl
_gpio
= RCC_APB2_GPIOB,
+ .sysctl
_usart
= RCC_APB1_USART3,
},
};
},
};
@@
-145,22
+145,20
@@
void stm32_uartInit(int port)
{
struct stm32_usart *base = (struct stm32_usart *)UARTDesc[port].base;
{
struct stm32_usart *base = (struct stm32_usart *)UARTDesc[port].base;
- kprintf("init port[%d]cnt[%d]\n", port, SER_CNT);
ASSERT(port >= 0 && port < SER_CNT);
/* Enable clocking on AFIO */
RCC->APB2ENR |= RCC_APB2_AFIO;
ASSERT(port >= 0 && port < SER_CNT);
/* Enable clocking on AFIO */
RCC->APB2ENR |= RCC_APB2_AFIO;
+ RCC->APB2ENR |= gpio_uart[port].sysctl_gpio;
/* Configure USART pins */
if (port == USART1_PORT)
{
/* Configure USART pins */
if (port == USART1_PORT)
{
- RCC->APB2ENR |= gpio_uart[port].sysctl;
- RCC->APB2ENR |= gpio_uart[port].sysctl1;
+ RCC->APB2ENR |= gpio_uart[port].sysctl_usart;
}
else
{
}
else
{
- RCC->APB1ENR |= gpio_uart[port].sysctl;
- 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,
}
stm32_gpioPinConfig((struct stm32_gpio *)gpio_uart[port].base, gpio_uart[port].tx_pin,
@@
-170,9
+168,9
@@
void stm32_uartInit(int port)
GPIO_MODE_IN_FLOATING, GPIO_SPEED_50MHZ);
/* Clear control registry */
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 */
base->SR = 0;
/* Set serial param: 115.200 bps, no parity */
@@
-183,9
+181,6
@@
void stm32_uartInit(int port)
/* Enable trasmision and receiver */
base->CR1 |= (BV(CR1_TE) | BV(CR1_RE));
/* Enable trasmision and receiver */
base->CR1 |= (BV(CR1_TE) | BV(CR1_RE));
-
- kprintf("INIT[%02x]\n", (uint8_t)base->SR); \
-
}
static bool tx_sending(struct SerialHardware *_hw)
}
static bool tx_sending(struct SerialHardware *_hw)
@@
-221,7
+216,7
@@
static void uart_irq_tx(int port)
* Disable TX empty interrupts if there're no more
* characters to transmit.
*/
* Disable TX empty interrupts if there're no more
* characters to transmit.
*/
- base->CR1 &= ~BV(
7
);
+ base->CR1 &= ~BV(
CR1_TXEIE
);
UARTDesc[port].sending = false;
}
else
UARTDesc[port].sending = false;
}
else
@@
-237,12
+232,17
@@
static void uart_common_irq_handler(int port)
/* Read and clear the IRQ status */
status = base->SR;
/* Read and clear the IRQ status */
status = base->SR;
+
+ /* Check hw errors */
+ ser_handles[port]->status = status &
+ (BV(SR_ORE) | BV(SR_FE) | BV(SR_PE) | BV(SR_NE));
+
/* Process the IRQ */
/* Process the IRQ */
- if (status & BV(
5
))
+ if (status & BV(
CR1_RXNEIE
))
{
uart_irq_rx(port);
}
{
uart_irq_rx(port);
}
- if (status & (BV(
7) | BV(6
)))
+ if (status & (BV(
CR1_TXEIE) | BV(CR1_TCIE
)))
{
uart_irq_tx(port);
}
{
uart_irq_tx(port);
}
@@
-255,14
+255,14
@@
static void stm32_uartIRQEnable(int port, sysirq_handler_t handler)
/* Register the IRQ handler */
sysirq_setHandler(UARTDesc[port].irq, handler);
/* Register the IRQ handler */
sysirq_setHandler(UARTDesc[port].irq, handler);
- base->CR1 |= BV(
5
);
+ base->CR1 |= BV(
CR1_RXNEIE
);
}
static void stm32_uartIRQDisable(int port)
{
struct stm32_usart *base = (struct stm32_usart *)UARTDesc[port].base;
}
static void stm32_uartIRQDisable(int port)
{
struct stm32_usart *base = (struct stm32_usart *)UARTDesc[port].base;
- base->CR1 &= ~(BV(
5
) | USART_FLAG_TXE);
+ base->CR1 &= ~(BV(
CR1_RXNEIE
) | USART_FLAG_TXE);
}
}
@@
-289,9
+289,8
@@
static void stm32_uartIRQDisable(int port)
stm32_uartPutChar(USART ## port ## _BASE, fifo_pop(txfifo)); \
if (!fifo_isempty(txfifo)) \
{ \
stm32_uartPutChar(USART ## port ## _BASE, fifo_pop(txfifo)); \
if (!fifo_isempty(txfifo)) \
{ \
- kputs("tx_en_irq\n"); \
hw->sending = true; \
hw->sending = true; \
- base->CR1 |= BV(
7
); \
+ base->CR1 |= BV(
CR1_TXEIE
); \
} \
} \
\
} \
} \
\