djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/hal: Renaming uart hal function to use hal_uart prefix.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-03-05 22:37:07 +01:00
parent ee5884bfe9
commit 0489153094
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nrf5/hal/hal_uart.c
View File

@ -60,7 +60,7 @@ uint32_t hal_uart_baudrate_lookup[] = {
UART_BAUDRATE_BAUDRATE_Baud1M, ///< 1000000 baud. UART_BAUDRATE_BAUDRATE_Baud1M, ///< 1000000 baud.
}; };
void nrf_uart_char_write(uint8_t ch) { void hal_uart_char_write(uint8_t ch) {
UART_BASE->TXD = (uint8_t)ch; UART_BASE->TXD = (uint8_t)ch;
while (UART_BASE->EVENTS_TXDRDY != 1) { while (UART_BASE->EVENTS_TXDRDY != 1) {
// Blocking wait. // Blocking wait.
@ -70,7 +70,7 @@ void nrf_uart_char_write(uint8_t ch) {
UART_BASE->EVENTS_TXDRDY = 0; UART_BASE->EVENTS_TXDRDY = 0;
} }
uint8_t nrf_uart_char_read(void) { uint8_t hal_uart_char_read(void) {
while (UART_BASE->EVENTS_RXDRDY != 1) { while (UART_BASE->EVENTS_RXDRDY != 1) {
// Wait for RXD data. // Wait for RXD data.
} }
@ -79,27 +79,27 @@ uint8_t nrf_uart_char_read(void) {
return (uint8_t)UART_BASE->RXD; return (uint8_t)UART_BASE->RXD;
} }
void nrf_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) { void hal_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) {
int i = 0; int i = 0;
uint8_t ch = p_buffer[i++]; uint8_t ch = p_buffer[i++];
while (i < num_of_bytes) { while (i < num_of_bytes) {
nrf_uart_char_write(ch); hal_uart_char_write(ch);
ch = p_buffer[i++]; ch = p_buffer[i++];
} }
cb(); cb();
} }
void nrf_uart_buffer_read(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) { void hal_uart_buffer_read(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) {
int i = 0; int i = 0;
while (i < num_of_bytes) { while (i < num_of_bytes) {
uint8_t ch = nrf_uart_char_read(); uint8_t ch = hal_uart_char_read();
p_buffer[i] = ch; p_buffer[i] = ch;
i++; i++;
} }
cb(); cb();
} }
void nrf_uart_init(hal_uart_init_t const * p_uart_init) { void hal_uart_init(hal_uart_init_t const * p_uart_init) {
hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->tx_pin->pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED); hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->tx_pin->pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED);
hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->rx_pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED); hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->rx_pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED);

10
nrf5/hal/hal_uart.h
View File

@ -122,14 +122,14 @@ typedef struct {
typedef void (*uart_complete_cb)(void); typedef void (*uart_complete_cb)(void);
void nrf_uart_init(hal_uart_init_t const * p_uart_init); void hal_uart_init(hal_uart_init_t const * p_uart_init);
void nrf_uart_char_write(uint8_t ch); void hal_uart_char_write(uint8_t ch);
uint8_t nrf_uart_char_read(void); uint8_t hal_uart_char_read(void);
void nrf_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb); void hal_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb);
void nrf_uart_buffer_read(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb); void hal_uart_buffer_read(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb);
#endif // UART_H__ #endif // UART_H__

20
nrf5/hal/hal_uarte.c
View File

@ -68,21 +68,21 @@ static const uint32_t hal_uart_baudrate_lookup[] = {
UARTE_BAUDRATE_BAUDRATE_Baud1M, ///< 1000000 baud. UARTE_BAUDRATE_BAUDRATE_Baud1M, ///< 1000000 baud.
}; };
__STATIC_INLINE void nrf_uart_irq_clear(void) { __STATIC_INLINE void hal_uart_irq_clear(void) {
NVIC_ClearPendingIRQ(UART_IRQ_NUM); NVIC_ClearPendingIRQ(UART_IRQ_NUM);
} }
__STATIC_INLINE void nrf_uart_irq_enable(uint8_t priority) { __STATIC_INLINE void hal_uart_irq_enable(uint8_t priority) {
NVIC_SetPriority(UART_IRQ_NUM, priority); NVIC_SetPriority(UART_IRQ_NUM, priority);
nrf_uart_irq_clear(); hal_uart_irq_clear();
NVIC_EnableIRQ(UART_IRQ_NUM); NVIC_EnableIRQ(UART_IRQ_NUM);
} }
void nrf_sendchar(int ch) { void nrf_sendchar(int ch) {
nrf_uart_char_write(ch); hal_uart_char_write(ch);
} }
void nrf_uart_init(hal_uart_init_t const * p_uart_init) { void hal_uart_init(hal_uart_init_t const * p_uart_init) {
hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->tx_pin->pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED); hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->tx_pin->pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED);
hal_gpio_pin_set(p_uart_init->tx_pin->port, p_uart_init->tx_pin->pin); hal_gpio_pin_set(p_uart_init->tx_pin->port, p_uart_init->tx_pin->pin);
hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->rx_pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED); hal_gpio_cfg_pin(p_uart_init->tx_pin->port, p_uart_init->rx_pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED);
@ -121,7 +121,7 @@ void nrf_uart_init(hal_uart_init_t const * p_uart_init) {
#endif #endif
} }
nrf_uart_irq_enable(p_uart_init->irq_priority); hal_uart_irq_enable(p_uart_init->irq_priority);
UARTE_BASE->INTENSET = (UARTE_INTENSET_ENDRX_Set << UARTE_INTENSET_ENDRX_Pos); UARTE_BASE->INTENSET = (UARTE_INTENSET_ENDRX_Set << UARTE_INTENSET_ENDRX_Pos);
UARTE_BASE->INTENSET = (UARTE_INTENSET_ENDTX_Set << UARTE_INTENSET_ENDTX_Pos); UARTE_BASE->INTENSET = (UARTE_INTENSET_ENDTX_Set << UARTE_INTENSET_ENDTX_Pos);
@ -132,7 +132,7 @@ void nrf_uart_init(hal_uart_init_t const * p_uart_init) {
UARTE_BASE->EVENTS_ENDRX = 0; UARTE_BASE->EVENTS_ENDRX = 0;
} }
void nrf_uart_char_write(uint8_t ch) { void hal_uart_char_write(uint8_t ch) {
static volatile uint8_t m_tx_buf[TX_BUF_SIZE]; static volatile uint8_t m_tx_buf[TX_BUF_SIZE];
(void)m_tx_buf; (void)m_tx_buf;
@ -153,7 +153,7 @@ void nrf_uart_char_write(uint8_t ch) {
UARTE_BASE->INTENSET = (UARTE_INTENSET_ENDTX_Set << UARTE_INTENSET_ENDTX_Pos); UARTE_BASE->INTENSET = (UARTE_INTENSET_ENDTX_Set << UARTE_INTENSET_ENDTX_Pos);
} }
uint8_t nrf_uart_char_read(void) { uint8_t hal_uart_char_read(void) {
static volatile uint8_t m_rx_buf[RX_BUF_SIZE]; static volatile uint8_t m_rx_buf[RX_BUF_SIZE];
UARTE_BASE->INTENCLR = (UARTE_INTENSET_ENDRX_Set << UARTE_INTENSET_ENDRX_Pos); UARTE_BASE->INTENCLR = (UARTE_INTENSET_ENDRX_Set << UARTE_INTENSET_ENDRX_Pos);
@ -173,7 +173,7 @@ uint8_t nrf_uart_char_read(void) {
return (uint8_t)m_rx_buf[0]; return (uint8_t)m_rx_buf[0];
} }
void nrf_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) { void hal_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) {
dma_write_cb = cb; dma_write_cb = cb;
UARTE_BASE->TXD.PTR = (uint32_t)p_buffer; UARTE_BASE->TXD.PTR = (uint32_t)p_buffer;
@ -189,7 +189,7 @@ void nrf_uart_buffer_write(uint8_t * p_buffer, uint32_t num_of_bytes, uart_compl
} }
void nrf_uart_buffer_read(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) { void hal_uart_buffer_read(uint8_t * p_buffer, uint32_t num_of_bytes, uart_complete_cb cb) {
dma_read_cb = cb; dma_read_cb = cb;
UARTE_BASE->RXD.PTR = (uint32_t)(p_buffer); UARTE_BASE->RXD.PTR = (uint32_t)(p_buffer);