chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #186 from grissiom/serial-fix 

Serial fix
This commit is contained in:
Bernard Xiong 2013-10-25 05:40:45 -07:00
parent 5f61b8ce6c 400b96d2d9
commit 166531168d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/K60Fxxxx/drivers/drv_uart.c
View File

@ -218,7 +218,9 @@ static const struct rt_uart_ops _k60_ops =
void UART5_RX_TX_IRQHandler(void) void UART5_RX_TX_IRQHandler(void)
{ {
rt_interrupt_enter();
rt_hw_serial_isr((struct rt_serial_device*)&_k60_serial); rt_hw_serial_isr((struct rt_serial_device*)&_k60_serial);
rt_interrupt_leave();
} }

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

@ -222,6 +222,10 @@ static rt_size_t rt_serial_read(struct rt_device *dev,
struct rt_serial_device *serial; struct rt_serial_device *serial;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
if (size == 0)
return 0;
serial = (struct rt_serial_device *)dev; serial = (struct rt_serial_device *)dev;
ptr = (rt_uint8_t *)buffer; ptr = (rt_uint8_t *)buffer;
@ -253,8 +257,8 @@ static rt_size_t rt_serial_read(struct rt_device *dev,
} }
read_nbytes = (rt_uint32_t)ptr - (rt_uint32_t)buffer; read_nbytes = (rt_uint32_t)ptr - (rt_uint32_t)buffer;
/* set error code */ /* set error code if and only if in thread context */
if (read_nbytes == 0) if (read_nbytes == 0 && !rt_interrupt_get_nest())
{ {
rt_set_errno(-RT_EEMPTY); rt_set_errno(-RT_EEMPTY);
} }
@ -272,6 +276,10 @@ static rt_size_t rt_serial_write(struct rt_device *dev,
struct rt_serial_device *serial; struct rt_serial_device *serial;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
if (size == 0)
return 0;
serial = (struct rt_serial_device *)dev; serial = (struct rt_serial_device *)dev;
ptr = (rt_uint8_t*)buffer; ptr = (rt_uint8_t*)buffer;
@ -341,7 +349,8 @@ static rt_size_t rt_serial_write(struct rt_device *dev,
} }
write_nbytes = (rt_uint32_t)ptr - (rt_uint32_t)buffer; write_nbytes = (rt_uint32_t)ptr - (rt_uint32_t)buffer;
if (write_nbytes == 0) /* set error code if and only if in thread context */
if (write_nbytes == 0 && !rt_interrupt_get_nest())
{ {
rt_set_errno(-RT_EFULL); rt_set_errno(-RT_EFULL);
} }