libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[DeviceDrivers] Enhanced serial DMA rx driver reliability.

This commit is contained in:
armink 2017-03-17 13:25:19 +08:00
parent 282c2f22f2
commit afe3b16106
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
components/drivers/serial/serial.c
View File

@ -166,13 +166,14 @@ rt_inline int _serial_int_tx(struct rt_serial_device *serial, const rt_uint8_t *
* *
* @return length * @return length
*/ */
static rt_size_t rt_dma_calc_recved_len(struct rt_serial_device *serial) { static rt_size_t rt_dma_calc_recved_len(struct rt_serial_device *serial)
static rt_size_t rx_length; {
struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *)serial->serial_rx; rt_size_t rx_length;
struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *) serial->serial_rx;
RT_ASSERT(rx_fifo != RT_NULL); RT_ASSERT(rx_fifo != RT_NULL);
rx_length = (rx_fifo->put_index >= rx_fifo->get_index)? (rx_fifo->put_index - rx_fifo->get_index): rx_length = (rx_fifo->put_index >= rx_fifo->get_index) ? (rx_fifo->put_index - rx_fifo->get_index):
(serial->config.bufsz - (rx_fifo->get_index - rx_fifo->put_index)); (serial->config.bufsz - (rx_fifo->get_index - rx_fifo->put_index));
return rx_length; return rx_length;
} }
@ -183,14 +184,16 @@ static rt_size_t rt_dma_calc_recved_len(struct rt_serial_device *serial) {
* @param serial serial device * @param serial serial device
* @param len get data length for this operate * @param len get data length for this operate
*/ */
static void rt_dma_recv_update_get_index(struct rt_serial_device *serial, rt_size_t len) { static void rt_dma_recv_update_get_index(struct rt_serial_device *serial, rt_size_t len)
struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *)serial->serial_rx; {
struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *) serial->serial_rx;
RT_ASSERT(rx_fifo != RT_NULL); RT_ASSERT(rx_fifo != RT_NULL);
RT_ASSERT(len <= rt_dma_calc_recved_len(serial)); RT_ASSERT(len <= rt_dma_calc_recved_len(serial));
rx_fifo->get_index += len; rx_fifo->get_index += len;
if (rx_fifo->get_index > serial->config.bufsz ) { if (rx_fifo->get_index > serial->config.bufsz)
{
rx_fifo->get_index -= serial->config.bufsz; rx_fifo->get_index -= serial->config.bufsz;
} }
} }
@ -201,37 +204,41 @@ static void rt_dma_recv_update_get_index(struct rt_serial_device *serial, rt_siz
* @param serial serial device * @param serial serial device
* @param len received length for this transmit * @param len received length for this transmit
*/ */
static void rt_dma_recv_update_put_index(struct rt_serial_device *serial, rt_size_t len) { static void rt_dma_recv_update_put_index(struct rt_serial_device *serial, rt_size_t len)
{
struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *)serial->serial_rx; struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *)serial->serial_rx;
rt_size_t i;
RT_ASSERT(rx_fifo != RT_NULL); RT_ASSERT(rx_fifo != RT_NULL);
if (rx_fifo->get_index <= rx_fifo->put_index) { if (rx_fifo->get_index <= rx_fifo->put_index)
{
rx_fifo->put_index += len; rx_fifo->put_index += len;
/* beyond the fifo end */ /* beyond the fifo end */
if (rx_fifo->put_index >= serial->config.bufsz) { if (rx_fifo->put_index >= serial->config.bufsz)
for (i = 0; i <= len / serial->config.bufsz; i++) { {
rx_fifo->put_index -= serial->config.bufsz; rx_fifo->put_index %= serial->config.bufsz;
}
/* force overwrite get index */ /* force overwrite get index */
if (rx_fifo->put_index >= rx_fifo->get_index) { if (rx_fifo->put_index >= rx_fifo->get_index)
{
rx_fifo->get_index = rx_fifo->put_index + 1; rx_fifo->get_index = rx_fifo->put_index + 1;
} }
} }
} else {
rx_fifo->put_index += len;
if(rx_fifo->put_index >= rx_fifo->get_index) {
/* beyond the fifo end */
if(rx_fifo->put_index >= serial->config.bufsz) {
for (i = 0; i <= len / serial->config.bufsz; i++) {
rx_fifo->put_index -= serial->config.bufsz;
} }
else
{
rx_fifo->put_index += len;
if (rx_fifo->put_index >= rx_fifo->get_index)
{
/* beyond the fifo end */
if (rx_fifo->put_index >= serial->config.bufsz)
{
rx_fifo->put_index %= serial->config.bufsz;
} }
/* force overwrite get index */ /* force overwrite get index */
rx_fifo->get_index = rx_fifo->put_index + 1; rx_fifo->get_index = rx_fifo->put_index + 1;
} }
} }
if (rx_fifo->get_index >= serial->config.bufsz) rx_fifo->get_index = 0;
} }
/* /*
@ -607,17 +614,17 @@ static rt_err_t rt_serial_control(struct rt_device *dev,
if (args) if (args)
{ {
struct serial_configure *pconfig = (struct serial_configure *) args; struct serial_configure *pconfig = (struct serial_configure *) args;
if(pconfig->bufsz != serial->config.bufsz && serial->parent.ref_count) if (pconfig->bufsz != serial->config.bufsz && serial->parent.ref_count)
{ {
/*can not change buffer size*/ /*can not change buffer size*/
return RT_EBUSY; return RT_EBUSY;
} }
/* set serial configure */ /* set serial configure */
serial->config = *pconfig; serial->config = *pconfig;
if(serial->parent.ref_count) if (serial->parent.ref_count)
{ {
/* serial device has been opened, to configure it */ /* serial device has been opened, to configure it */
serial->ops->configure(serial, (struct serial_configure *)args); serial->ops->configure(serial, (struct serial_configure *) args);
} }
} }
@ -754,25 +761,36 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
case RT_SERIAL_EVENT_RX_DMADONE: case RT_SERIAL_EVENT_RX_DMADONE:
{ {
int length; int length;
rt_base_t level;
/* get DMA rx length */ /* get DMA rx length */
length = (event & (~0xff)) >> 8; length = (event & (~0xff)) >> 8;
if (serial->config.bufsz == 0) { if (serial->config.bufsz == 0)
{
struct rt_serial_rx_dma* rx_dma; struct rt_serial_rx_dma* rx_dma;
rx_dma = (struct rt_serial_rx_dma*)serial->serial_rx; rx_dma = (struct rt_serial_rx_dma*) serial->serial_rx;
RT_ASSERT(rx_dma != RT_NULL); RT_ASSERT(rx_dma != RT_NULL);
RT_ASSERT(serial->parent.rx_indicate != RT_NULL); RT_ASSERT(serial->parent.rx_indicate != RT_NULL);
serial->parent.rx_indicate(&(serial->parent), length); serial->parent.rx_indicate(&(serial->parent), length);
rx_dma->activated = RT_FALSE; rx_dma->activated = RT_FALSE;
} else { }
else
{
/* disable interrupt */
level = rt_hw_interrupt_disable();
/* update fifo put index */ /* update fifo put index */
rt_dma_recv_update_put_index(serial, length); rt_dma_recv_update_put_index(serial, length);
/* calculate received total length */
length = rt_dma_calc_recved_len(serial);
/* enable interrupt */
rt_hw_interrupt_enable(level);
/* invoke callback */ /* invoke callback */
if (serial->parent.rx_indicate != RT_NULL) { if (serial->parent.rx_indicate != RT_NULL)
serial->parent.rx_indicate(&(serial->parent), rt_dma_calc_recved_len(serial)); {
serial->parent.rx_indicate(&(serial->parent), length);
} }
} }
break; break;