summaryrefslogtreecommitdiff
path: root/components/drivers/serial
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2014-02-27 18:19:59 +0800
committerBernard Xiong <[email protected]>2014-02-27 18:19:59 +0800
commit5aeedc4f3a3c3fcfffb0cd4a474f5faa75053839 (patch)
tree138fc42d0983b1e484daf440d9501d996ded1373 /components/drivers/serial
parent3d80e414ff6c03ff04fecb914e7aa9b3fb535e03 (diff)
parenta4cd949519dc9d511ee9171b255e67c21128827e (diff)
Merge pull request #241 from bright-pan/master
Add RTS/CTS option in the serial framework.
Diffstat (limited to 'components/drivers/serial')
-rw-r--r--components/drivers/serial/serial.c52
1 files changed, 15 insertions, 37 deletions
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
index 5e7a8ec814..a9b4e47b43 100644
--- a/components/drivers/serial/serial.c
+++ b/components/drivers/serial/serial.c
@@ -25,6 +25,9 @@
* 2012-11-23 bernard fix compiler warning.
* 2013-02-20 bernard use RT_SERIAL_RB_BUFSZ to define
* the size of ring buffer.
+ * 2014-02-26 bright use DeviceDriver ringbuffer.
+ * add hardware flow support.
+ * use new struct serial_ringbuffer.
*/
#include <rthw.h>
@@ -33,9 +36,7 @@
rt_inline void serial_ringbuffer_init(struct serial_ringbuffer *rbuffer)
{
- rt_memset(rbuffer->buffer, 0, sizeof(rbuffer->buffer));
- rbuffer->put_index = 0;
- rbuffer->get_index = 0;
+ rt_ringbuffer_init(&rbuffer->rb, rbuffer->pool, rbuffer->size);
}
rt_inline void serial_ringbuffer_putc(struct serial_ringbuffer *rbuffer,
@@ -45,17 +46,8 @@ rt_inline void serial_ringbuffer_putc(struct serial_ringbuffer *rbuffer,
/* disable interrupt */
level = rt_hw_interrupt_disable();
-
- rbuffer->buffer[rbuffer->put_index] = ch;
- rbuffer->put_index = (rbuffer->put_index + 1) & (RT_SERIAL_RB_BUFSZ - 1);
-
- /* if the next position is read index, discard this 'read char' */
- if (rbuffer->put_index == rbuffer->get_index)
- {
- rbuffer->get_index = (rbuffer->get_index + 1) & (RT_SERIAL_RB_BUFSZ - 1);
- }
-
- /* enable interrupt */
+ rt_ringbuffer_putchar(&rbuffer->rb, ch);
+ // enable interrupt
rt_hw_interrupt_enable(level);
}
@@ -63,25 +55,11 @@ rt_inline int serial_ringbuffer_putchar(struct serial_ringbuffer *rbuffer,
char ch)
{
rt_base_t level;
- rt_uint16_t next_index;
+ //rt_uint16_t next_index;
/* disable interrupt */
level = rt_hw_interrupt_disable();
-
- next_index = (rbuffer->put_index + 1) & (RT_SERIAL_RB_BUFSZ - 1);
- if (next_index != rbuffer->get_index)
- {
- rbuffer->buffer[rbuffer->put_index] = ch;
- rbuffer->put_index = next_index;
- }
- else
- {
- /* enable interrupt */
- rt_hw_interrupt_enable(level);
-
- return -1;
- }
-
+ rt_ringbuffer_putchar(&rbuffer->rb, ch);
/* enable interrupt */
rt_hw_interrupt_enable(level);
@@ -90,17 +68,14 @@ rt_inline int serial_ringbuffer_putchar(struct serial_ringbuffer *rbuffer,
rt_inline int serial_ringbuffer_getc(struct serial_ringbuffer *rbuffer)
{
- int ch;
+ int ch = 0;
rt_base_t level;
- ch = -1;
/* disable interrupt */
level = rt_hw_interrupt_disable();
- if (rbuffer->get_index != rbuffer->put_index)
- {
- ch = rbuffer->buffer[rbuffer->get_index];
- rbuffer->get_index = (rbuffer->get_index + 1) & (RT_SERIAL_RB_BUFSZ - 1);
- }
+ /* get char */
+ if (!rt_ringbuffer_getchar(&rbuffer->rb, (rt_uint8_t *)&ch))
+ ch = -1;
/* enable interrupt */
rt_hw_interrupt_enable(level);
@@ -113,7 +88,10 @@ rt_inline rt_uint32_t serial_ringbuffer_size(struct serial_ringbuffer *rbuffer)
rt_base_t level;
level = rt_hw_interrupt_disable();
+ size = rt_ringbuffer_space_len(&rbuffer->rb);
+ /*
size = (rbuffer->put_index - rbuffer->get_index) & (RT_SERIAL_RB_BUFSZ - 1);
+ */
rt_hw_interrupt_enable(level);
return size;