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 #2822 from anangl/master 

TARGET_NRF5: Removed waiting for TX completed from 'serial_putc()'.
pull/2828/merge
Sam Grove 2016-09-28 15:37:58 -07:00 committed by GitHub
parent fbce4e18b2 86005da023
commit 2564a833c0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/serial_api.c
View File

@ -258,11 +258,15 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
nrf_gpio_cfg_input(UART_CB.pselrxd, NRF_GPIO_PIN_NOPULL);
}
// UART pins must only be configured when the peripheral is disabled.
nrf_uart_disable(UART_INSTANCE);
if (UART_CB.initialized) {
// Reconfigure RX/TX pins only.
// For already initialized peripheral it is sufficient to reconfigure
// RX/TX pins only.
// Ensure that there is no unfinished TX transfer.
while (!serial_writable(obj)) {
}
// UART pins can be configured only when the peripheral is disabled.
nrf_uart_disable(UART_INSTANCE);
nrf_uart_txrx_pins_set(UART_INSTANCE, UART_CB.pseltxd, UART_CB.pselrxd);
nrf_uart_enable(UART_INSTANCE);
}
@ -479,9 +483,6 @@ void serial_putc(serial_t *obj, int c)
nrf_uart_event_clear(UART_INSTANCE, NRF_UART_EVENT_TXDRDY);
nrf_uart_txd_set(UART_INSTANCE, (uint8_t)c);
// Wait until sending is completed.
while (!nrf_uart_event_check(UART_INSTANCE, NRF_UART_EVENT_TXDRDY)) {
}
}
int serial_readable(serial_t *obj)