libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3566 from xckhmf/master 

[bsp\nrf5x]Support BSP UART0
This commit is contained in:
朱天龙 (Armink) 2020-04-29 00:47:20 -05:00 committed by GitHub
parent 252b9aa01c 79b44d29ad
commit 5d696a2460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 89 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
bsp/nrf5x/libraries/drivers/drv_uart.c
View File

@ -1,59 +1,83 @@
/*
* Copyright (c) 2006-2020, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2020-04-28 xckhmf Modify for <nrfx>
*
*/
#include <rtdevice.h> #include <rtdevice.h>
#include <nrfx_uart.h> #include <nrfx_uart.h>
#include "drv_uart.h" #include "drv_uart.h"
static struct rt_serial_device _serial0_0; #ifdef BSP_USING_UART
static void uart_event_hander(nrfx_uart_event_t const *p_event,void *p_context);
typedef struct typedef struct
{ {
struct rt_serial_device *serial; struct rt_serial_device *serial;
nrfx_uart_t uart; nrfx_uart_t uart;
uint8_t rx_byte;
uint16_t rx_length;
uint32_t rx_pin; uint32_t rx_pin;
uint32_t tx_pin; uint32_t tx_pin;
nrfx_uart_event_handler_t event_handler; nrfx_uart_event_handler_t event_handler;
} UART_CFG_T; } drv_uart_cfg_t;
#ifdef BSP_USING_UART0
UART_CFG_T uart0 = { static struct rt_serial_device _serial_0;
static void uart0_event_hander(nrfx_uart_event_t const *p_event,void *p_context);
drv_uart_cfg_t m_uart0_cfg = {
.uart = NRFX_UART_INSTANCE(0), .uart = NRFX_UART_INSTANCE(0),
#ifdef RT_USING_CONSOLE .rx_byte = 0,
.rx_pin = 8, .rx_length = 0,
.tx_pin = 6, .rx_pin = BSP_UART0_RX_PIN,
.event_handler = uart_event_hander, .tx_pin = BSP_UART0_TX_PIN,
#else .event_handler = uart0_event_hander
.rx_pin = 19,
.tx_pin = 20
#endif
}; };
UART_CFG_T *working_cfg = RT_NULL; #endif /* BSP_USING_UART0 */
static void uart_event_hander(nrfx_uart_event_t const *p_event,void *p_context) #ifdef BSP_USING_UART1
{ #error <nrfx_uart> not support UART1. Use UART0 instead.
#endif /* BSP_USING_UART1 */
#ifdef BSP_USING_UART0
static void uart0_event_hander(nrfx_uart_event_t const *p_event,void *p_context)
{
if (p_event->type == NRFX_UART_EVT_RX_DONE) if (p_event->type == NRFX_UART_EVT_RX_DONE)
{ {
rt_hw_serial_isr(working_cfg->serial, RT_SERIAL_EVENT_RX_IND); if(p_event->data.rxtx.bytes == 1)
{
m_uart0_cfg.rx_length = p_event->data.rxtx.bytes;
/* rx_byte equal p_data */
//m_uart0_cfg.rx_byte = *(p_event->data.rxtx.p_data);
rt_hw_serial_isr(m_uart0_cfg.serial, RT_SERIAL_EVENT_RX_IND);
}
nrfx_uart_rx(&(m_uart0_cfg.uart),&m_uart0_cfg.rx_byte,1);
} }
if (p_event->type == NRFX_UART_EVT_TX_DONE) if (p_event->type == NRFX_UART_EVT_TX_DONE)
{ {
/* @TODO:[RT_DEVICE_FLAG_INT_TX]*/
} }
} }
#endif /* BSP_USING_UART0 */
static rt_err_t _uart_cfg(struct rt_serial_device *serial, struct serial_configure *cfg) static rt_err_t _uart_cfg(struct rt_serial_device *serial, struct serial_configure *cfg)
{ {
nrfx_uart_config_t config = NRFX_UART_DEFAULT_CONFIG(uart0.tx_pin,uart0.rx_pin); nrfx_uart_config_t config = NRFX_UART_DEFAULT_CONFIG(BSP_UART0_TX_PIN,BSP_UART0_RX_PIN);
UART_CFG_T *instance = &uart0; drv_uart_cfg_t *instance = RT_NULL;
RT_ASSERT(serial != RT_NULL); RT_ASSERT(serial != RT_NULL);
RT_ASSERT(cfg != RT_NULL); RT_ASSERT(cfg != RT_NULL);
if (serial->parent.user_data != RT_NULL) if (serial->parent.user_data == RT_NULL)
{ {
instance = (UART_CFG_T*)serial->parent.user_data; return -RT_ERROR;
} }
instance = (drv_uart_cfg_t*)serial->parent.user_data;
nrfx_uart_uninit(&(instance->uart)); nrfx_uart_uninit(&(instance->uart));
switch (cfg->baud_rate) switch (cfg->baud_rate)
@ -83,28 +107,23 @@ static rt_err_t _uart_cfg(struct rt_serial_device *serial, struct serial_configu
config.hal_cfg.hwfc = NRF_UART_HWFC_DISABLED; config.hal_cfg.hwfc = NRF_UART_HWFC_DISABLED;
config.pselrxd = instance->rx_pin; config.pselrxd = instance->rx_pin;
config.pseltxd = instance->tx_pin; config.pseltxd = instance->tx_pin;
nrfx_uart_init(&(instance->uart), &config, instance->event_handler); nrfx_uart_init(&(instance->uart), &config, instance->event_handler);
nrfx_uart_rx(&(instance->uart),&(instance->rx_byte),1);
nrf_uart_int_enable(instance->uart.p_reg, NRF_UART_INT_MASK_RXDRDY | NRF_UART_INT_MASK_RXTO | NRF_UART_INT_MASK_ERROR);
nrf_uart_int_disable(instance->uart.p_reg, NRF_UART_INT_MASK_TXDRDY); nrf_uart_int_disable(instance->uart.p_reg, NRF_UART_INT_MASK_TXDRDY);
nrfx_uart_rx_enable(&(instance->uart));
working_cfg = instance;
return RT_EOK; return RT_EOK;
} }
static rt_err_t _uart_ctrl(struct rt_serial_device *serial, int cmd, void *arg) static rt_err_t _uart_ctrl(struct rt_serial_device *serial, int cmd, void *arg)
{ {
UART_CFG_T *instance = working_cfg; drv_uart_cfg_t *instance = NULL;
RT_ASSERT(serial != RT_NULL); RT_ASSERT(serial != RT_NULL);
if (serial->parent.user_data != RT_NULL) if (serial->parent.user_data == RT_NULL)
{ {
instance = (UART_CFG_T*)serial->parent.user_data; return -RT_ERROR;
} }
instance = (drv_uart_cfg_t*)serial->parent.user_data;
switch (cmd) switch (cmd)
{ {
@ -129,10 +148,7 @@ static rt_err_t _uart_ctrl(struct rt_serial_device *serial, int cmd, void *arg)
break; break;
case RT_DEVICE_CTRL_PIN: case RT_DEVICE_CTRL_PIN:
if (working_cfg != instance) _uart_cfg(instance->serial, &(instance->serial->config));
{
_uart_cfg(instance->serial, &(instance->serial->config));
}
break; break;
case RT_DEVICE_POWERSAVE: case RT_DEVICE_POWERSAVE:
@ -152,13 +168,13 @@ static rt_err_t _uart_ctrl(struct rt_serial_device *serial, int cmd, void *arg)
static int _uart_putc(struct rt_serial_device *serial, char c) static int _uart_putc(struct rt_serial_device *serial, char c)
{ {
UART_CFG_T *instance = working_cfg; drv_uart_cfg_t *instance = NULL;
int rtn = 1; int rtn = 1;
RT_ASSERT(serial != RT_NULL); RT_ASSERT(serial != RT_NULL);
if (serial->parent.user_data != RT_NULL) if (serial->parent.user_data != RT_NULL)
{ {
instance = (UART_CFG_T*)serial->parent.user_data; instance = (drv_uart_cfg_t*)serial->parent.user_data;
} }
nrf_uart_event_clear(instance->uart.p_reg, NRF_UART_EVENT_TXDRDY); nrf_uart_event_clear(instance->uart.p_reg, NRF_UART_EVENT_TXDRDY);
@ -171,23 +187,21 @@ static int _uart_putc(struct rt_serial_device *serial, char c)
return rtn; return rtn;
} }
/*
@note: this function is invaild ,the cause of the problem is [nrfx_uart.c - line 340]
*/
static int _uart_getc(struct rt_serial_device *serial) static int _uart_getc(struct rt_serial_device *serial)
{ {
int ch = -1; int ch = -1;
UART_CFG_T *instance = working_cfg; drv_uart_cfg_t *instance = NULL;
RT_ASSERT(serial != RT_NULL); RT_ASSERT(serial != RT_NULL);
if (serial->parent.user_data != RT_NULL) if (serial->parent.user_data != RT_NULL)
{ {
instance = (UART_CFG_T*)serial->parent.user_data; instance = (drv_uart_cfg_t*)serial->parent.user_data;
}
if(instance->rx_length)
{
ch = instance->rx_byte;
instance->rx_length--;
} }
ch = (int)(nrf_uart_rxd_get(instance->uart.p_reg));
return ch; return ch;
} }
@ -202,11 +216,14 @@ void rt_hw_uart_init(void)
{ {
struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT; struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT;
config.bufsz = RT_SERIAL_RB_BUFSZ; #ifdef BSP_USING_UART0
_serial0_0.config = config; _serial_0.config = config;
_serial0_0.ops = &_uart_ops; _serial_0.ops = &_uart_ops;
uart0.serial = &_serial0_0; m_uart0_cfg.serial = &_serial_0;
rt_hw_serial_register(&_serial_0, "uart0", \
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, &m_uart0_cfg);
#endif /* BSP_USING_UART0 */
rt_hw_serial_register(&_serial0_0, "uart0", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, &uart0);
} }
#endif /* BSP_USING_UART */

17
bsp/nrf5x/nrf52840/board/Kconfig
View File

@ -2,14 +2,14 @@ menu "Hardware Drivers Config"
config SOC_NRF52840 config SOC_NRF52840
bool bool
config SOC_NRF52840 config SOC_NRF52840
select RT_USING_COMPONENTS_INIT select RT_USING_COMPONENTS_INIT
select RT_USING_USER_MAIN select RT_USING_USER_MAIN
default y default y
menu "Onboard Peripheral Drivers" menu "Onboard Peripheral Drivers"
config BSP_USING_JLINK_TO_USART config BSP_USING_JLINK_TO_USART
bool "Enable JLINK TO USART (uart0)" bool "Enable JLINK TO USART (uart0|RX_PIN:8|TX_PIN:6)"
select BSP_USING_UART select BSP_USING_UART
select BSP_USING_UART0 select BSP_USING_UART0
default y default y
@ -30,11 +30,20 @@ menu "On-chip Peripheral Drivers"
config BSP_USING_UART0 config BSP_USING_UART0
bool "Enable UART0" bool "Enable UART0"
default y default y
if BSP_USING_UART0
config BSP_UART0_RX_PIN
int "uart0 rx pin number"
range 0 31
default 8
config BSP_UART0_TX_PIN
int "uart0 tx pin number"
range 0 31
default 6
endif
config BSP_USING_UART1 config BSP_USING_UART1
bool "Enable UART1" bool "Enable UART1"
default n default n
endif endif
endmenu endmenu
endmenu endmenu

3
bsp/nrf5x/nrf52840/rtconfig.h
View File

@ -155,10 +155,13 @@
/* Onboard Peripheral Drivers */ /* Onboard Peripheral Drivers */
#define BSP_USING_JLINK_TO_USART
/* On-chip Peripheral Drivers */ /* On-chip Peripheral Drivers */
#define BSP_USING_UART #define BSP_USING_UART
#define BSP_USING_UART0 #define BSP_USING_UART0
#define BSP_UART0_RX_PIN 8
#define BSP_UART0_TX_PIN 6
#endif #endif