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

Add resource management for serial for the NRF52 family 

Instance counter keeps track of how many objects have been
initialized and freed. On the first object the instance is
enabled and on the last object the instance is disabled.
pull/6547/head
Marcus Chang 2018-03-27 16:34:52 -07:00
parent cafa8ae752
commit 18fa9414cd
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
targets/TARGET_NORDIC/TARGET_NRF5x/serial_api.c
View File

@ -188,6 +188,7 @@ typedef struct {
uint8_t buffer[NUMBER_OF_BANKS][DMA_BUFFER_SIZE]; uint8_t buffer[NUMBER_OF_BANKS][DMA_BUFFER_SIZE];
uint32_t rxdrdy_counter; uint32_t rxdrdy_counter;
uint32_t endrx_counter; uint32_t endrx_counter;
uint32_t usage_counter;
uint8_t tx_data; uint8_t tx_data;
volatile uint8_t tx_in_progress; volatile uint8_t tx_in_progress;
volatile uint8_t rx_in_progress; volatile uint8_t rx_in_progress;
@ -1006,7 +1007,6 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
/* Enable interrupts for UARTE0. */ /* Enable interrupts for UARTE0. */
NVIC_SetVector(UARTE0_UART0_IRQn, (uint32_t) nordic_nrf5_uart0_handler); NVIC_SetVector(UARTE0_UART0_IRQn, (uint32_t) nordic_nrf5_uart0_handler);
nordic_nrf5_uart_irq_enable(0); nordic_nrf5_uart_irq_enable(0);
nrf_uarte_enable(nordic_nrf5_uart_register[0]);
#if UART1_ENABLED #if UART1_ENABLED
/* Initialize FIFO buffer for UARTE1. */ /* Initialize FIFO buffer for UARTE1. */
@ -1019,7 +1019,6 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
/* Enable interrupts for UARTE1. */ /* Enable interrupts for UARTE1. */
NVIC_SetVector(UARTE1_IRQn, (uint32_t) nordic_nrf5_uart1_handler); NVIC_SetVector(UARTE1_IRQn, (uint32_t) nordic_nrf5_uart1_handler);
nordic_nrf5_uart_irq_enable(1); nordic_nrf5_uart_irq_enable(1);
nrf_uarte_enable(nordic_nrf5_uart_register[1]);
#endif #endif
} }
@ -1028,6 +1027,15 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
uart_object->instance = instance; uart_object->instance = instance;
/* Increment usage counter for this instance. */
nordic_nrf5_uart_state[instance].usage_counter++;
/* Enable instance on first usage. */
if (nordic_nrf5_uart_state[instance].usage_counter == 1) {
nrf_uarte_enable(nordic_nrf5_uart_register[instance]);
}
/* Store pins in serial object. */ /* Store pins in serial object. */
if (tx == NC) { if (tx == NC) {
@ -1086,7 +1094,27 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
*/ */
void serial_free(serial_t *obj) void serial_free(serial_t *obj)
{ {
MBED_ASSERT(obj);
#if DEVICE_SERIAL_ASYNCH
struct serial_s *uart_object = &obj->serial;
#else
struct serial_s *uart_object = obj;
#endif
int instance = uart_object->instance;
if (nordic_nrf5_uart_state[instance].usage_counter > 1) {
/* Decrement usage counter for this instance. */
nordic_nrf5_uart_state[instance].usage_counter--;
/* Disable instance when not in use. */
if (nordic_nrf5_uart_state[instance].usage_counter == 0) {
nrf_uarte_disable(nordic_nrf5_uart_register[instance]);
}
}
} }
/** Configure the baud rate /** Configure the baud rate