Fix broken STM32_NUCLEO_L152RE UARTs 4 and 5.

pull/1406/head
Shane Leonard 2015-11-02 11:30:56 -08:00
parent 6bdf53a4e8
commit 3bd04ade93
1 changed files with 8 additions and 8 deletions

View File

@ -95,13 +95,13 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
obj->index = 2; obj->index = 2;
} }
#if defined(USART4_BASE) #if defined(UART4_BASE)
if (obj->uart == UART_4) { if (obj->uart == UART_4) {
__UART4_CLK_ENABLE(); __UART4_CLK_ENABLE();
obj->index = 3; obj->index = 3;
} }
#endif #endif
#if defined(USART5_BASE) #if defined(UART5_BASE)
if (obj->uart == UART_5) { if (obj->uart == UART_5) {
__UART5_CLK_ENABLE(); __UART5_CLK_ENABLE();
obj->index = 4; obj->index = 4;
@ -156,14 +156,14 @@ void serial_free(serial_t *obj)
__USART3_CLK_DISABLE(); __USART3_CLK_DISABLE();
} }
#if defined(USART4_BASE) #if defined(UART4_BASE)
if (obj->uart == UART_4) { if (obj->uart == UART_4) {
__UART4_FORCE_RESET(); __UART4_FORCE_RESET();
__UART4_RELEASE_RESET(); __UART4_RELEASE_RESET();
__UART4_CLK_DISABLE(); __UART4_CLK_DISABLE();
} }
#endif #endif
#if defined(USART5_BASE) #if defined(UART5_BASE)
if (obj->uart == UART_5) { if (obj->uart == UART_5) {
__UART5_FORCE_RESET(); __UART5_FORCE_RESET();
__UART5_RELEASE_RESET(); __UART5_RELEASE_RESET();
@ -249,14 +249,14 @@ static void uart3_irq(void)
uart_irq(UART_3, 2); uart_irq(UART_3, 2);
} }
#if defined(USART4_BASE) #if defined(UART4_BASE)
static void uart4_irq(void) static void uart4_irq(void)
{ {
uart_irq(UART_4, 3); uart_irq(UART_4, 3);
} }
#endif #endif
#if defined(USART5_BASE) #if defined(UART5_BASE)
static void uart5_irq(void) static void uart5_irq(void)
{ {
uart_irq(UART_5, 4); uart_irq(UART_5, 4);
@ -291,14 +291,14 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
vector = (uint32_t)&uart3_irq; vector = (uint32_t)&uart3_irq;
} }
#if defined(USART4_BASE) #if defined(UART4_BASE)
if (obj->uart == UART_4) { if (obj->uart == UART_4) {
irq_n = UART4_IRQn; irq_n = UART4_IRQn;
vector = (uint32_t)&uart4_irq; vector = (uint32_t)&uart4_irq;
} }
#endif #endif
#if defined(USART5_BASE) #if defined(UART5_BASE)
if (obj->uart == UART_5) { if (obj->uart == UART_5) {
irq_n = UART5_IRQn; irq_n = UART5_IRQn;
vector = (uint32_t)&uart5_irq; vector = (uint32_t)&uart5_irq;