From bb5aa7222ef2b757bcb8f049fb8fdeb0d665a1d8 Mon Sep 17 00:00:00 2001 From: Mathias Brossard Date: Mon, 10 Jan 2022 23:43:54 -0600 Subject: [PATCH] cmsis_uart: use CMSIS UART driver for nrf52820 --- records/hic_hal/nrf52820.yaml | 1 + source/hic_hal/nordic/nrf52820/IO_Config.h | 6 + source/hic_hal/nordic/nrf52820/uart.c | 262 --------------------- 3 files changed, 7 insertions(+), 262 deletions(-) delete mode 100644 source/hic_hal/nordic/nrf52820/uart.c diff --git a/records/hic_hal/nrf52820.yaml b/records/hic_hal/nrf52820.yaml index a91ff3801c..3043cd6412 100644 --- a/records/hic_hal/nrf52820.yaml +++ b/records/hic_hal/nrf52820.yaml @@ -22,6 +22,7 @@ common: - source/hic_hal/nordic/nrf52820 - source/hic_hal/nordic/nrf52820/cmsis - source/hic_hal/nordic/nrf52820/nrfx/drivers + - source/hic_hal/cmsis-driver/uart tool_specific: uvision: diff --git a/source/hic_hal/nordic/nrf52820/IO_Config.h b/source/hic_hal/nordic/nrf52820/IO_Config.h index 817b3bc407..d71ff52d18 100644 --- a/source/hic_hal/nordic/nrf52820/IO_Config.h +++ b/source/hic_hal/nordic/nrf52820/IO_Config.h @@ -85,6 +85,12 @@ extern uint32_t i2c_sda_pin; #define UART_TX_PIN uart_tx_pin #define UART_RX_PIN uart_rx_pin +// cmsis-driver/uart/uart.c configuration +#include "Driver_USART.h" +extern ARM_DRIVER_USART Driver_USART0; +#define CMSIS_UART_INSTANCE (Driver_USART0) +#define CMSIS_UART_IRQ (UARTE0_UART0_IRQn) + // I2C #define I2C_SCL_PIN i2c_scl_pin #define I2C_SDA_PIN i2c_sda_pin diff --git a/source/hic_hal/nordic/nrf52820/uart.c b/source/hic_hal/nordic/nrf52820/uart.c deleted file mode 100644 index 5bac440cd6..0000000000 --- a/source/hic_hal/nordic/nrf52820/uart.c +++ /dev/null @@ -1,262 +0,0 @@ -/** - * @file uart.c - * @brief UART Function for nrf52820 HIC - * - * DAPLink Interface Firmware - * Copyright (c) 2021, Arm Limited, All Rights Reserved - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "string.h" -#include "Driver_USART.h" -#include "uart.h" -#include "util.h" -#include "cortex_m.h" -#include "circ_buf.h" -#include "settings.h" // for config_get_overflow_detect - -#define USART_INSTANCE (Driver_USART0) -#define USART_IRQ (UARTE0_UART0_IRQn) - -extern ARM_DRIVER_USART USART_INSTANCE; - -static void clear_buffers(void); - -#define RX_OVRF_MSG "\n" -#define RX_OVRF_MSG_SIZE (sizeof(RX_OVRF_MSG) - 1) -#define BUFFER_SIZE (512) - -circ_buf_t write_buffer; -uint8_t write_buffer_data[BUFFER_SIZE]; -circ_buf_t read_buffer; -uint8_t read_buffer_data[BUFFER_SIZE]; -uint16_t cur_line_state; -uint32_t cur_control; -uint32_t cur_baud; - -struct { - // Number of bytes pending to be transferred. This is 0 if there is no - // ongoing transfer and the uart_handler processed the last transfer. - volatile uint32_t tx_size; - - uint8_t rx; - uint8_t tx; -} cb_buf; - -void uart_handler(uint32_t event); - -void clear_buffers(void) -{ - circ_buf_init(&write_buffer, write_buffer_data, sizeof(write_buffer_data)); - circ_buf_init(&read_buffer, read_buffer_data, sizeof(read_buffer_data)); -} - -int32_t uart_initialize(void) -{ - clear_buffers(); - cb_buf.tx_size = 0; - USART_INSTANCE.Initialize(uart_handler); - USART_INSTANCE.PowerControl(ARM_POWER_FULL); - cur_line_state = 0; - cur_control = 0; - cur_baud = 0; - - return 1; -} - -int32_t uart_uninitialize(void) -{ - USART_INSTANCE.Control(ARM_USART_CONTROL_RX, 0); - USART_INSTANCE.Control(ARM_USART_ABORT_RECEIVE, 0U); - USART_INSTANCE.PowerControl(ARM_POWER_OFF); - USART_INSTANCE.Uninitialize(); - clear_buffers(); - cb_buf.tx_size = 0; - - return 1; -} - -int32_t uart_reset(void) -{ - // disable interrupt - NVIC_DisableIRQ(USART_IRQ); - clear_buffers(); - // enable interrupt - NVIC_EnableIRQ(USART_IRQ); - - return 1; -} - -int32_t uart_set_configuration(UART_Configuration *config) -{ - uint32_t control = ARM_USART_MODE_ASYNCHRONOUS; - - switch (config->DataBits) { - case UART_DATA_BITS_5: - control |= ARM_USART_DATA_BITS_5; - break; - - case UART_DATA_BITS_6: - control |= ARM_USART_DATA_BITS_6; - break; - - case UART_DATA_BITS_7: - control |= ARM_USART_DATA_BITS_7; - break; - - case UART_DATA_BITS_8: /* fallthrough */ - default: - control |= ARM_USART_DATA_BITS_8; - break; - } - - switch (config->Parity) { - case UART_PARITY_EVEN: - control |= ARM_USART_PARITY_EVEN; - break; - - case UART_PARITY_ODD: - control |= ARM_USART_PARITY_ODD; - break; - - case UART_PARITY_NONE: /* fallthrough */ - default: - control |= ARM_USART_PARITY_NONE; - break; - } - - switch (config->StopBits) { - case UART_STOP_BITS_1: /* fallthrough */ - default: - control |= ARM_USART_STOP_BITS_1; - break; - - case UART_STOP_BITS_1_5: - control |= ARM_USART_STOP_BITS_1_5; - break; - - case UART_STOP_BITS_2: - control |= ARM_USART_STOP_BITS_2; - break; - } - - switch (config->FlowControl) { - case UART_FLOW_CONTROL_NONE: /* fallthrough */ - default: - control |= ARM_USART_FLOW_CONTROL_NONE; - break; - - case UART_FLOW_CONTROL_RTS_CTS: - control |= ARM_USART_FLOW_CONTROL_RTS_CTS; - break; - } - - if ((control == cur_control) && (config->Baudrate == cur_baud)) { - return 1; - } - cur_control = control; - cur_baud = config->Baudrate; - - NVIC_DisableIRQ(USART_IRQ); - clear_buffers(); - - // If there was no Receive() call in progress aborting it is harmless. - USART_INSTANCE.Control(ARM_USART_CONTROL_RX, 0U); - USART_INSTANCE.Control(ARM_USART_ABORT_RECEIVE, 0U); - - uint32_t r = USART_INSTANCE.Control(control, config->Baudrate); - if (r != ARM_DRIVER_OK) { - return 0; - } - USART_INSTANCE.Control(ARM_USART_CONTROL_TX, 1); - USART_INSTANCE.Control(ARM_USART_CONTROL_RX, 1); - USART_INSTANCE.Receive(&(cb_buf.rx), 1); - - NVIC_ClearPendingIRQ(USART_IRQ); - NVIC_EnableIRQ(USART_IRQ); - - uart_reset(); - - return 1; -} - -int32_t uart_get_configuration(UART_Configuration *config) -{ - return 1; -} - -void uart_set_control_line_state(uint16_t ctrl_bmp) -{ - if (ctrl_bmp != cur_line_state) { - uart_reset(); - cur_line_state = ctrl_bmp; - } -} - -int32_t uart_write_free(void) -{ - return circ_buf_count_free(&write_buffer); -} - -int32_t uart_write_data(uint8_t *data, uint16_t size) -{ - if (size == 0) { - return 0; - } - - // Disable interrupts to prevent the uart_handler from modifying the - // circular buffer at the same time. - NVIC_DisableIRQ(USART_IRQ); - uint32_t cnt = circ_buf_write(&write_buffer, data, size); - if (cb_buf.tx_size == 0 && circ_buf_count_used(&write_buffer) > 0) { - // There's no pending transfer, so we need to start the process. - cb_buf.tx = circ_buf_pop(&write_buffer); - USART_INSTANCE.Send(&(cb_buf.tx), 1); - cb_buf.tx_size = 1; - } - NVIC_EnableIRQ(USART_IRQ); - - return cnt; -} - -int32_t uart_read_data(uint8_t *data, uint16_t size) -{ - return circ_buf_read(&read_buffer, data, size); -} - -void uart_handler(uint32_t event) { - if (event & ARM_USART_EVENT_RECEIVE_COMPLETE) { - uint32_t free = circ_buf_count_free(&read_buffer); - if (free > RX_OVRF_MSG_SIZE) { - circ_buf_push(&read_buffer, cb_buf.rx); - } else if ((RX_OVRF_MSG_SIZE == free) && config_get_overflow_detect()) { - circ_buf_write(&read_buffer, (uint8_t*)RX_OVRF_MSG, RX_OVRF_MSG_SIZE); - } else { - // Drop character - } - USART_INSTANCE.Receive(&(cb_buf.rx), 1); - } - - if (event & ARM_USART_EVENT_SEND_COMPLETE) { - if (circ_buf_count_used(&write_buffer) > 0) { - cb_buf.tx = circ_buf_pop(&write_buffer); - USART_INSTANCE.Send(&(cb_buf.tx), 1); - } else { - // Signals that next call to uart_write_data() should start a - // transfer. - cb_buf.tx_size = 0; - } - } -}