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

remove interrupt Tx and DMA Rx mode in USART. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@556 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-03-29 16:22:08 +00:00
parent 742c22f928
commit e8449b0f67
2 changed files with 107 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

369
libcpu/arm/stm32/serial.c
View File

@ -12,6 +12,7 @@
* 2009-02-05 Bernard first version * 2009-02-05 Bernard first version
* 2009-10-25 Bernard fix rt_serial_read bug when there is no data * 2009-10-25 Bernard fix rt_serial_read bug when there is no data
* in the buffer. * in the buffer.
* 2010-03-29 Bernard cleanup code.
*/ */
#include "serial.h" #include "serial.h"
@ -25,79 +26,6 @@ static void rt_serial_enable_dma(DMA_Channel_TypeDef* dma_channel,
*/ */
/*@{*/ /*@{*/
/**
* This function read a character from serial without interrupt enable mode
*
* @return the read char
*/
int rt_serial_getc(struct stm32_serial_device* uart)
{
rt_base_t level;
int ch = -1;
/* disable interrupt */
level = rt_hw_interrupt_disable();
if (uart->int_rx->read_index != uart->int_rx->save_index)
{
ch = uart->int_rx->rx_buffer[uart->int_rx->read_index];
uart->int_rx->read_index ++;
if (uart->int_rx->read_index >= UART_RX_BUFFER_SIZE)
uart->int_rx->read_index = 0;
}
/* enable interrupt */
rt_hw_interrupt_enable(level);
return ch;
}
/* save a char to serial buffer */
void rt_serial_savechar(struct stm32_serial_device* uart, char ch)
{
rt_base_t level;
/* disable interrupt */
level = rt_hw_interrupt_disable();
uart->int_rx->rx_buffer[uart->int_rx->save_index] = ch;
uart->int_rx->save_index ++;
if (uart->int_rx->save_index >= UART_RX_BUFFER_SIZE)
uart->int_rx->save_index = 0;
/* if the next position is read index, discard this 'read char' */
if (uart->int_rx->save_index == uart->int_rx->read_index)
{
uart->int_rx->read_index ++;
if (uart->int_rx->read_index >= UART_RX_BUFFER_SIZE)
uart->int_rx->read_index = 0;
}
/* enable interrupt */
rt_hw_interrupt_enable(level);
}
/**
* This function will write a character to serial without interrupt enable mode
*
* @param c the char to write
*/
void rt_serial_putc(rt_device_t device, const char c)
{
struct stm32_serial_device* uart = (struct stm32_serial_device*) device->private;
/*
* to be polite with serial console add a line feed
* to the carriage return character
*/
if (c=='\n' && (device->flag & RT_DEVICE_FLAG_STREAM))
rt_serial_putc(device, '\r');
while (!(uart->uart_device->SR & USART_FLAG_TXE));
uart->uart_device->DR = (c & 0x1FF);
}
/* RT-Thread Device Interface */ /* RT-Thread Device Interface */
static rt_err_t rt_serial_init (rt_device_t dev) static rt_err_t rt_serial_init (rt_device_t dev)
{ {
@ -113,24 +41,16 @@ static rt_err_t rt_serial_init (rt_device_t dev)
uart->int_rx->save_index = 0; uart->int_rx->save_index = 0;
} }
if (dev->flag & RT_DEVICE_FLAG_DMA_RX)
{
RT_ASSERT(uart->dma_rx->dma_channel != RT_NULL);
uart->dma_rx->read_index = uart->dma_rx->read_descriptor = 0;
uart->dma_rx->is_full = RT_FALSE;
}
if (dev->flag & RT_DEVICE_FLAG_INT_TX)
{
rt_memset(uart->int_tx->tx_buffer, 0,
sizeof(uart->int_tx->tx_buffer));
uart->int_tx->write_index = uart->int_tx->save_index = 0;
}
if (dev->flag & RT_DEVICE_FLAG_DMA_TX) if (dev->flag & RT_DEVICE_FLAG_DMA_TX)
{ {
RT_ASSERT(uart->dma_rx->dma_channel != RT_NULL); RT_ASSERT(uart->dma_tx->dma_channel != RT_NULL);
uart->dma_tx->list_head = uart->dma_tx->list_tail = RT_NULL; uart->dma_tx->list_head = uart->dma_tx->list_tail = RT_NULL;
/* init data node memory pool */
rt_mp_init(&(uart->dma_tx->data_node_mp), "dn",
uart->dma_tx->data_node_mem_pool,
sizeof(uart->dma_tx->data_node_mem_pool),
sizeof(struct stm32_serial_data_node));
} }
/* Enable USART */ /* Enable USART */
@ -144,36 +64,11 @@ static rt_err_t rt_serial_init (rt_device_t dev)
static rt_err_t rt_serial_open(rt_device_t dev, rt_uint16_t oflag) static rt_err_t rt_serial_open(rt_device_t dev, rt_uint16_t oflag)
{ {
struct stm32_serial_device* uart;
RT_ASSERT(dev != RT_NULL);
uart = (struct stm32_serial_device*)dev->private;
if (dev->flag & RT_DEVICE_FLAG_DMA_RX)
{
/* enable Rx DMA */
rt_serial_enable_dma(uart->dma_rx->dma_channel,
(rt_uint32_t)&(uart->dma_rx->rx_buffer[uart->dma_rx->save_descriptor][0]),
UART_DMA_RX_BUFFER_SIZE);
}
return RT_EOK; return RT_EOK;
} }
static rt_err_t rt_serial_close(rt_device_t dev) static rt_err_t rt_serial_close(rt_device_t dev)
{ {
struct stm32_serial_device* uart;
RT_ASSERT(dev != RT_NULL);
uart = (struct stm32_serial_device*)dev->private;
if (dev->flag & RT_DEVICE_FLAG_DMA_RX)
{
/* disable DMA */
DMA_Cmd(uart->dma_rx->dma_channel, DISABLE);
}
return RT_EOK; return RT_EOK;
} }
@ -189,83 +84,37 @@ static rt_size_t rt_serial_read (rt_device_t dev, rt_off_t pos, void* buffer, rt
if (dev->flag & RT_DEVICE_FLAG_INT_RX) if (dev->flag & RT_DEVICE_FLAG_INT_RX)
{ {
rt_int32_t ch;
/* interrupt mode Rx */ /* interrupt mode Rx */
while (size) while (size)
{ {
/* get a character */ rt_base_t level;
ch = rt_serial_getc(uart);
if (ch < 0) /* disable interrupt */
level = rt_hw_interrupt_disable();
if (uart->int_rx->read_index != uart->int_rx->save_index)
{ {
/* set error code */ /* read a character */
err_code = -RT_EEMPTY; *ptr++ = uart->int_rx->rx_buffer[uart->int_rx->read_index];
break; size--;
/* move to next position */
uart->int_rx->read_index ++;
if (uart->int_rx->read_index >= UART_RX_BUFFER_SIZE)
uart->int_rx->read_index = 0;
} }
else else
{ {
*ptr++ = ch; /* set error code */
size --; err_code = -RT_EEMPTY;
/* enable interrupt */
rt_hw_interrupt_enable(level);
break;
} }
}
}
else if (dev->flag & RT_DEVICE_FLAG_DMA_RX)
{
/* check queue empty */
if ((uart->dma_rx->read_descriptor == uart->dma_rx->save_descriptor))
{
/* set error code */
err_code = -RT_EEMPTY;
}
else
{
/* read data */
while ((rt_uint32_t)ptr - (rt_uint32_t)buffer < size)
{
/* read buffer */
*ptr ++ = uart->dma_rx->
rx_buffer[uart->dma_rx->read_descriptor][uart->dma_rx->read_index];
/* move to next position */ /* enable interrupt */
uart->dma_rx->read_index ++; rt_hw_interrupt_enable(level);
/* wrap read index */
if (uart->dma_rx->read_index >= UART_DMA_RX_BUFFER_SIZE)
{
/* wrap read index */
uart->dma_rx->read_index = 0;
/* move to next read descriptor */
uart->dma_rx->read_descriptor ++;
/* wrap read descriptor */
if (uart->dma_rx->read_descriptor >= UART_DMA_RX_DESCRIPTOR)
uart->dma_rx->read_descriptor = 0;
if (uart->dma_rx->is_full == RT_TRUE)
{
rt_uint32_t level;
level = rt_hw_interrupt_disable();
uart->dma_rx->save_descriptor ++;
if (uart->dma_rx->save_descriptor >= UART_DMA_RX_DESCRIPTOR)
uart->dma_rx->save_descriptor = 0;
rt_hw_interrupt_enable(level);
/* re-enable DMA to receive */
rt_serial_enable_dma(uart->dma_rx->dma_channel,
(rt_uint32_t)&(uart->dma_rx->rx_buffer[uart->dma_rx->save_descriptor][0]),
UART_DMA_RX_BUFFER_SIZE);
}
/* check queue empty */
if ((uart->dma_rx->read_descriptor == uart->dma_rx->save_descriptor))
{
/* set error code */
err_code = -RT_EEMPTY;
break;
}
}
}
} }
} }
else else
@ -315,34 +164,16 @@ static rt_size_t rt_serial_write (rt_device_t dev, rt_off_t pos, const void* buf
if (dev->flag & RT_DEVICE_FLAG_INT_TX) if (dev->flag & RT_DEVICE_FLAG_INT_TX)
{ {
/* interrupt mode Tx */ /* interrupt mode Tx, does not support */
while (uart->int_tx->save_index != uart->int_tx->write_index) RT_ASSERT(0);
{
/* save on tx buffer */
uart->int_tx->tx_buffer[uart->int_tx->save_index] = *ptr++;
-- size;
/* move to next position */
uart->int_tx->save_index ++;
/* wrap save index */
if (uart->int_tx->save_index >= UART_TX_BUFFER_SIZE)
uart->int_tx->save_index = 0;
}
/* set error code */
if (size > 0)
err_code = -RT_EFULL;
} }
#ifdef RT_USING_HEAP
else if (dev->flag & RT_DEVICE_FLAG_DMA_TX) else if (dev->flag & RT_DEVICE_FLAG_DMA_TX)
{ {
/* DMA mode Tx */ /* DMA mode Tx */
/* allocate a data node */ /* allocate a data node */
struct stm32_serial_data_node* data_node = struct stm32_serial_data_node* data_node = (struct stm32_serial_data_node*)
(struct stm32_serial_data_node*) rt_malloc (sizeof(struct stm32_serial_data_node)); rt_mp_alloc (&(uart->dma_tx->data_node_mp), RT_WAITING_FOREVER);
if (data_node == RT_NULL) if (data_node == RT_NULL)
{ {
/* set error code */ /* set error code */
@ -382,14 +213,36 @@ static rt_size_t rt_serial_write (rt_device_t dev, rt_off_t pos, const void* buf
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
} }
} }
#endif
else else
{ {
/* polling mode */ /* polling mode */
while (size) if (dev->flag & RT_DEVICE_FLAG_STREAM)
{ {
rt_serial_putc(dev, *ptr); /* stream mode */
++ptr; --size; while (size)
{
if (*ptr == '\n')
{
while (!(uart->uart_device->SR & USART_FLAG_TXE));
uart->uart_device->DR = '\r';
}
while (!(uart->uart_device->SR & USART_FLAG_TXE));
uart->uart_device->DR = (*ptr & 0x1FF);
++ptr; --size;
}
}
else
{
/* write data directly */
while (size)
{
while (!(uart->uart_device->SR & USART_FLAG_TXE));
uart->uart_device->DR = (*ptr & 0x1FF);
++ptr; --size;
}
} }
} }
@ -432,6 +285,12 @@ rt_err_t rt_hw_serial_register(rt_device_t device, const char* name, rt_uint32_t
{ {
RT_ASSERT(device != RT_NULL); RT_ASSERT(device != RT_NULL);
if ((flag & RT_DEVICE_FLAG_DMA_RX) ||
(flag & RT_DEVICE_FLAG_INT_TX))
{
RT_ASSERT(0);
}
device->type = RT_Device_Class_Char; device->type = RT_Device_Class_Char;
device->rx_indicate = RT_NULL; device->rx_indicate = RT_NULL;
device->tx_complete = RT_NULL; device->tx_complete = RT_NULL;
@ -460,7 +319,27 @@ void rt_hw_serial_isr(rt_device_t device)
/* save on rx buffer */ /* save on rx buffer */
while (uart->uart_device->SR & USART_FLAG_RXNE) while (uart->uart_device->SR & USART_FLAG_RXNE)
{ {
rt_serial_savechar(uart, uart->uart_device->DR & 0xff); rt_base_t level;
/* disable interrupt */
level = rt_hw_interrupt_disable();
/* save character */
uart->int_rx->rx_buffer[uart->int_rx->save_index] = uart->uart_device->DR & 0xff;
uart->int_rx->save_index ++;
if (uart->int_rx->save_index >= UART_RX_BUFFER_SIZE)
uart->int_rx->save_index = 0;
/* if the next position is read index, discard this 'read char' */
if (uart->int_rx->save_index == uart->int_rx->read_index)
{
uart->int_rx->read_index ++;
if (uart->int_rx->read_index >= UART_RX_BUFFER_SIZE)
uart->int_rx->read_index = 0;
}
/* enable interrupt */
rt_hw_interrupt_enable(level);
} }
/* clear interrupt */ /* clear interrupt */
@ -482,62 +361,8 @@ void rt_hw_serial_isr(rt_device_t device)
if (USART_GetITStatus(uart->uart_device, USART_IT_TC) != RESET) if (USART_GetITStatus(uart->uart_device, USART_IT_TC) != RESET)
{ {
/* interrupt mode transmission */
RT_ASSERT(device->flag & RT_DEVICE_FLAG_INT_TX);
/* transmission completed */
uart->int_tx->write_index ++;
if (uart->int_tx->write_index >= UART_TX_BUFFER_SIZE)
uart->int_tx->write_index = 0;
/* clear interrupt */ /* clear interrupt */
USART_ClearITPendingBit(uart->uart_device, USART_IT_TC); USART_ClearITPendingBit(uart->uart_device, USART_IT_TC);
/* start next transmission */
if (uart->int_tx->write_index <
uart->int_tx->save_index)
{
uart->uart_device->DR = uart->int_tx
->tx_buffer[uart->int_tx->write_index];
}
}
}
/*
* ISR for DMA mode Rx
*/
void rt_hw_serial_dma_rx_isr(rt_device_t device)
{
rt_uint32_t next_descriptor;
struct stm32_serial_device* uart = (struct stm32_serial_device*) device->private;
/* DMA mode receive */
RT_ASSERT(device->flag & RT_DEVICE_FLAG_DMA_RX);
/* invoke callback */
if (device->rx_indicate != RT_NULL)
device->rx_indicate(device, UART_DMA_RX_BUFFER_SIZE);
next_descriptor = uart->dma_rx->save_descriptor;
/* move to next descriptor */
next_descriptor ++;
if (next_descriptor >= UART_DMA_RX_DESCRIPTOR)
next_descriptor = 0;
if (next_descriptor != uart->dma_rx->read_descriptor)
{
uart->dma_rx->save_descriptor = next_descriptor;
/* enable next DMA */
rt_serial_enable_dma(uart->dma_rx->dma_channel,
(rt_uint32_t)&(uart->dma_rx->rx_buffer[uart->dma_rx->save_descriptor][0]),
UART_DMA_RX_BUFFER_SIZE);
}
else
{
/* no descriptor yet, disable DMA */
DMA_Cmd(uart->dma_rx->dma_channel, DISABLE);
uart->dma_rx->is_full = RT_TRUE;
} }
} }
@ -546,7 +371,6 @@ void rt_hw_serial_dma_rx_isr(rt_device_t device)
*/ */
void rt_hw_serial_dma_tx_isr(rt_device_t device) void rt_hw_serial_dma_tx_isr(rt_device_t device)
{ {
#ifdef RT_USING_HEAP
rt_uint32_t level; rt_uint32_t level;
struct stm32_serial_data_node* data_node; struct stm32_serial_data_node* data_node;
struct stm32_serial_device* uart = (struct stm32_serial_device*) device->private; struct stm32_serial_device* uart = (struct stm32_serial_device*) device->private;
@ -565,30 +389,29 @@ void rt_hw_serial_dma_tx_isr(rt_device_t device)
/* disable interrupt */ /* disable interrupt */
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
/* remove list tail */ /* remove list head */
uart->dma_tx->list_tail = data_node->prev; uart->dma_tx->list_head = data_node->next;
if (uart->dma_tx->list_tail == RT_NULL) if (uart->dma_tx->list_head == RT_NULL) /* data link empty */
uart->dma_tx->list_head = RT_NULL; uart->dma_tx->list_tail = RT_NULL;
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
/* free data node memory(!!) */ /* release data node memory */
rt_free(data_node); rt_mp_free(data_node);
if (uart->dma_tx->list_tail != RT_NULL) if (uart->dma_tx->list_head != RT_NULL)
{ {
/* transmit next data node */ /* transmit next data node */
rt_serial_enable_dma(uart->dma_tx->dma_channel, rt_serial_enable_dma(uart->dma_tx->dma_channel,
(rt_uint32_t)uart->dma_tx->list_tail->data_ptr, (rt_uint32_t)uart->dma_tx->list_head->data_ptr,
uart->dma_tx->list_tail->data_size); uart->dma_tx->list_head->data_size);
} }
else else
{ {
/* no data to be transmitted, disable DMA */ /* no data to be transmitted, disable DMA */
DMA_Cmd(uart->dma_tx->dma_channel, DISABLE); DMA_Cmd(uart->dma_tx->dma_channel, DISABLE);
} }
#endif
} }
/*@}*/ /*@}*/

34
libcpu/arm/stm32/serial.h
View File

@ -1,7 +1,7 @@
/* /*
* File : serial.h * File : serial.h
* This file is part of RT-Thread RTOS * This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2009, RT-Thread Development Team * COPYRIGHT (C) 2009 - 2010, RT-Thread Development Team
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at * found in the file LICENSE in this distribution or at
@ -10,6 +10,7 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2009-01-05 Bernard first version * 2009-01-05 Bernard first version
* 2010-03-29 Bernard remove interrupt tx and DMA rx mode.
*/ */
#ifndef __RT_HW_SERIAL_H__ #ifndef __RT_HW_SERIAL_H__
#define __RT_HW_SERIAL_H__ #define __RT_HW_SERIAL_H__
@ -20,20 +21,8 @@
/* STM32F10x library definitions */ /* STM32F10x library definitions */
#include <stm32f10x.h> #include <stm32f10x.h>
#define UART_DMA_RX_DESCRIPTOR 2
#define UART_DMA_RX_BUFFER_SIZE 16
#define UART_RX_BUFFER_SIZE 64 #define UART_RX_BUFFER_SIZE 64
#define UART_TX_BUFFER_SIZE 64 #define UART_TX_DMA_NODE_SIZE 4
struct stm32_serial_dma_rx
{
DMA_Channel_TypeDef* dma_channel;
rt_uint8_t rx_buffer[UART_DMA_RX_DESCRIPTOR][UART_RX_BUFFER_SIZE];
rt_uint32_t save_descriptor;
rt_uint32_t read_index, read_descriptor;
rt_bool_t is_full;
};
/* data node for Tx Mode */ /* data node for Tx Mode */
struct stm32_serial_data_node struct stm32_serial_data_node
@ -44,8 +33,16 @@ struct stm32_serial_data_node
}; };
struct stm32_serial_dma_tx struct stm32_serial_dma_tx
{ {
/* DMA Channel */
DMA_Channel_TypeDef* dma_channel; DMA_Channel_TypeDef* dma_channel;
/* data list head and tail */
struct stm32_serial_data_node *list_head, *list_tail; struct stm32_serial_data_node *list_head, *list_tail;
/* data node memory pool */
struct rt_mempool data_node_mp;
rt_uint8_t data_node_mem_pool[UART_TX_DMA_NODE_SIZE *
(sizeof(struct stm32_serial_data_node) + sizeof(void*))];
}; };
struct stm32_serial_int_rx struct stm32_serial_int_rx
@ -54,29 +51,20 @@ struct stm32_serial_int_rx
rt_uint32_t read_index, save_index; rt_uint32_t read_index, save_index;
}; };
struct stm32_serial_int_tx
{
rt_uint8_t tx_buffer[UART_TX_BUFFER_SIZE];
rt_uint32_t write_index, save_index;
};
struct stm32_serial_device struct stm32_serial_device
{ {
USART_TypeDef* uart_device; USART_TypeDef* uart_device;
/* rx structure */ /* rx structure */
struct stm32_serial_int_rx* int_rx; struct stm32_serial_int_rx* int_rx;
struct stm32_serial_dma_rx* dma_rx;
/* tx structure */ /* tx structure */
struct stm32_serial_int_tx* int_tx;
struct stm32_serial_dma_tx* dma_tx; struct stm32_serial_dma_tx* dma_tx;
}; };
rt_err_t rt_hw_serial_register(rt_device_t device, const char* name, rt_uint32_t flag, struct stm32_serial_device *serial); rt_err_t rt_hw_serial_register(rt_device_t device, const char* name, rt_uint32_t flag, struct stm32_serial_device *serial);
void rt_hw_serial_isr(rt_device_t device); void rt_hw_serial_isr(rt_device_t device);
void rt_hw_serial_dma_rx_isr(rt_device_t device);
void rt_hw_serial_dma_tx_isr(rt_device_t device); void rt_hw_serial_dma_tx_isr(rt_device_t device);
#endif #endif