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

Merge pull request #1129 from stevew817/master 

Silicon Labs - Serial ports other than stdio were not properly enabled
pull/1132/head
Martin Kojtal 2015-05-22 09:31:25 +01:00
parent e55fa60b4f e8ff8e7629
commit 773be33ba7
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/serial_api.c
View File

@ -66,6 +66,8 @@ serial_t stdio_uart;
static void uart_irq(UARTName, int, SerialIrq);
uint8_t serial_get_index(serial_t *obj);
void serial_enable(serial_t *obj, uint8_t enable);
void serial_enable_pins(serial_t *obj, uint8_t enable);
IRQn_Type serial_get_rx_irq_index(serial_t *obj);
IRQn_Type serial_get_tx_irq_index(serial_t *obj);
CMU_Clock_TypeDef serial_get_clock(serial_t *obj);
@ -435,17 +437,10 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
if (obj->serial.periph.uart == (USART_TypeDef*)STDIO_UART ) {
stdio_uart_inited = 1;
memcpy(&stdio_uart, obj, sizeof(serial_t));
/* enable TX and RX by default for STDIO */
if(LEUART_REF_VALID(obj->serial.periph.leuart)) {
obj->serial.periph.leuart->CMD = LEUART_CMD_TXEN | LEUART_CMD_RXEN;
} else {
obj->serial.periph.uart->CMD = USART_CMD_TXEN | USART_CMD_RXEN;
}
}
serial_enable_pins(obj, true);
serial_enable(obj, true);
obj->serial.dmaOptionsTX.dmaChannel = -1;