libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-07 09:44:34 +08:00
Code Issues Releases Wiki Activity

fix a used uninitialized bug in components/drivers/serial.c reported by Grission

Browse Source 
and re-format the coding style

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2247 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
dzzxzz@gmail.com 2012-08-06 07:34:14 +00:00
parent 8f5a5898fd
commit 6c43028227
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* /*
* File : serial.c * File : serial.c
* This file is part of RT-Thread RTOS * This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006, RT-Thread Development Team * COPYRIGHT (C) 2006 - 2012, 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
@ -18,14 +18,14 @@
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
rt_inline void serial_ringbuffer_init(struct serial_ringbuffer* rbuffer) rt_inline void serial_ringbuffer_init(struct serial_ringbuffer *rbuffer)
{ {
rt_memset(rbuffer->buffer, 0, sizeof(rbuffer->buffer)); rt_memset(rbuffer->buffer, 0, sizeof(rbuffer->buffer));
rbuffer->put_index = 0; rbuffer->put_index = 0;
rbuffer->get_index = 0; rbuffer->get_index = 0;
} }
rt_inline void serial_ringbuffer_putc(struct serial_ringbuffer* rbuffer, char ch) rt_inline void serial_ringbuffer_putc(struct serial_ringbuffer *rbuffer, char ch)
{ {
rt_base_t level; rt_base_t level;
@ -45,7 +45,7 @@ rt_inline void serial_ringbuffer_putc(struct serial_ringbuffer* rbuffer, char ch
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
} }
rt_inline int serial_ringbuffer_putchar(struct serial_ringbuffer* rbuffer, char ch) rt_inline int serial_ringbuffer_putchar(struct serial_ringbuffer *rbuffer, char ch)
{ {
rt_base_t level; rt_base_t level;
rt_uint16_t next_index; rt_uint16_t next_index;
@ -71,7 +71,7 @@ rt_inline int serial_ringbuffer_putchar(struct serial_ringbuffer* rbuffer, char
return 1; return 1;
} }
rt_inline int serial_ringbuffer_getc(struct serial_ringbuffer* rbuffer) rt_inline int serial_ringbuffer_getc(struct serial_ringbuffer *rbuffer)
{ {
int ch; int ch;
rt_base_t level; rt_base_t level;
@ -89,7 +89,7 @@ rt_inline int serial_ringbuffer_getc(struct serial_ringbuffer* rbuffer)
return ch; return ch;
} }
rt_inline rt_uint32_t serial_ringbuffer_size(struct serial_ringbuffer* rbuffer) rt_inline rt_uint32_t serial_ringbuffer_size(struct serial_ringbuffer *rbuffer)
{ {
rt_uint32_t size; rt_uint32_t size;
rt_base_t level; rt_base_t level;
@ -112,7 +112,7 @@ static rt_err_t rt_serial_init(struct rt_device *dev)
struct rt_serial_device *serial; struct rt_serial_device *serial;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
serial = (struct rt_serial_device*) dev; serial = (struct rt_serial_device *)dev;
if (!(dev->flag & RT_DEVICE_FLAG_ACTIVATED)) if (!(dev->flag & RT_DEVICE_FLAG_ACTIVATED))
{ {
@ -142,7 +142,7 @@ static rt_err_t rt_serial_open(struct rt_device *dev, rt_uint16_t oflag)
rt_uint32_t int_flags = 0; rt_uint32_t int_flags = 0;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
serial = (struct rt_serial_device*) dev; serial = (struct rt_serial_device *)dev;
if (dev->flag & RT_DEVICE_FLAG_INT_RX) if (dev->flag & RT_DEVICE_FLAG_INT_RX)
int_flags = RT_SERIAL_RX_INT; int_flags = RT_SERIAL_RX_INT;
@ -151,7 +151,7 @@ static rt_err_t rt_serial_open(struct rt_device *dev, rt_uint16_t oflag)
if (int_flags) if (int_flags)
{ {
serial->ops->control(serial, RT_DEVICE_CTRL_SET_INT, (void*)int_flags); serial->ops->control(serial, RT_DEVICE_CTRL_SET_INT, (void *)int_flags);
} }
return RT_EOK; return RT_EOK;
@ -163,7 +163,7 @@ static rt_err_t rt_serial_close(struct rt_device *dev)
rt_uint32_t int_flags = 0; rt_uint32_t int_flags = 0;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
serial = (struct rt_serial_device*) dev; serial = (struct rt_serial_device *)dev;
if (dev->flag & RT_DEVICE_FLAG_INT_RX) if (dev->flag & RT_DEVICE_FLAG_INT_RX)
int_flags = RT_SERIAL_RX_INT; int_flags = RT_SERIAL_RX_INT;
@ -172,7 +172,7 @@ static rt_err_t rt_serial_close(struct rt_device *dev)
if (int_flags) if (int_flags)
{ {
serial->ops->control(serial, RT_DEVICE_CTRL_CLR_INT, (void*)int_flags); serial->ops->control(serial, RT_DEVICE_CTRL_CLR_INT, (void *)int_flags);
} }
return RT_EOK; return RT_EOK;
@ -185,9 +185,9 @@ static rt_size_t rt_serial_read(struct rt_device *dev, rt_off_t pos, void *buffe
struct rt_serial_device *serial; struct rt_serial_device *serial;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
serial = (struct rt_serial_device*) dev; serial = (struct rt_serial_device *)dev;
ptr = (rt_uint8_t*)buffer; ptr = (rt_uint8_t *)buffer;
if (dev->flag & RT_DEVICE_FLAG_INT_RX) if (dev->flag & RT_DEVICE_FLAG_INT_RX)
{ {
@ -197,7 +197,8 @@ static rt_size_t rt_serial_read(struct rt_device *dev, rt_off_t pos, void *buffe
int ch; int ch;
ch = serial_ringbuffer_getc(serial->int_rx); ch = serial_ringbuffer_getc(serial->int_rx);
if (ch == -1) break; if (ch == -1)
break;
*ptr = ch & 0xff; *ptr = ch & 0xff;
ptr ++; ptr ++;
@ -210,7 +211,7 @@ static rt_size_t rt_serial_read(struct rt_device *dev, rt_off_t pos, void *buffe
while ((rt_uint32_t)ptr - (rt_uint32_t)buffer < size) while ((rt_uint32_t)ptr - (rt_uint32_t)buffer < size)
{ {
*ptr = serial->ops->getc(serial); *ptr = serial->ops->getc(serial);
ptr ++; ptr ++;
} }
} }
@ -232,7 +233,7 @@ static rt_size_t rt_serial_write(struct rt_device *dev, rt_off_t pos,
struct rt_serial_device *serial; struct rt_serial_device *serial;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
serial = (struct rt_serial_device*) dev; serial = (struct rt_serial_device *)dev;
ptr = (rt_uint8_t*)buffer; ptr = (rt_uint8_t*)buffer;
@ -246,7 +247,8 @@ static rt_size_t rt_serial_write(struct rt_device *dev, rt_off_t pos,
ptr ++; ptr ++;
size --; size --;
} }
else break; else
break;
} }
} }
else else
@ -283,8 +285,8 @@ static rt_err_t rt_serial_control(struct rt_device *dev, rt_uint8_t cmd, void *a
{ {
struct rt_serial_device *serial; struct rt_serial_device *serial;
RT_ASSERT(serial != RT_NULL); RT_ASSERT(dev != RT_NULL);
serial = (struct rt_serial_device*) dev; serial = (struct rt_serial_device *)dev;
switch (cmd) switch (cmd)
{ {
@ -299,7 +301,7 @@ static rt_err_t rt_serial_control(struct rt_device *dev, rt_uint8_t cmd, void *a
break; break;
case RT_DEVICE_CTRL_CONFIG: case RT_DEVICE_CTRL_CONFIG:
/* configure device */ /* configure device */
serial->ops->configure(serial, (struct serial_configure *)args); serial->ops->configure(serial, (struct serial_configure *)args);
break; break;
} }
@ -344,7 +346,8 @@ void rt_hw_serial_isr(struct rt_serial_device *serial)
while (1) while (1)
{ {
ch = serial->ops->getc(serial); ch = serial->ops->getc(serial);
if (ch == -1) break; if (ch == -1)
break;
serial_ringbuffer_putc(serial->int_rx, ch); serial_ringbuffer_putc(serial->int_rx, ch);
} }