diff options
| author | Bernard Xiong <[email protected]> | 2015-09-24 21:04:35 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-09-24 21:04:35 +0800 |
| commit | 5b77fa2d114c980a581f606cbf1cfe6bb06ba8b7 (patch) | |
| tree | 1e97f61497adde8d119d72da83f39cd828f2c4ff /components | |
| parent | 168bb7843f466abcda0d21cd198ce08d5f70b8e6 (diff) | |
| parent | d0dcdd11fe6ed42b853fb7b4ef0e91163c5f50ee (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/serial/serial.c | 6 | ||||
| -rw-r--r-- | components/external/lodepng/SConscript | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index f5a199e10b..3bae89c740 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -522,12 +522,10 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event) rt_base_t level; struct rt_serial_rx_fifo* rx_fifo; + /* interrupt mode receive */ rx_fifo = (struct rt_serial_rx_fifo*)serial->serial_rx; RT_ASSERT(rx_fifo != RT_NULL); - - /* interrupt mode receive */ - RT_ASSERT(serial->parent.open_flag & RT_DEVICE_FLAG_INT_RX); - + while (1) { ch = serial->ops->getc(serial); diff --git a/components/external/lodepng/SConscript b/components/external/lodepng/SConscript index fd05e1013a..55d6d01d3f 100644 --- a/components/external/lodepng/SConscript +++ b/components/external/lodepng/SConscript @@ -1,4 +1,5 @@ from building import * +import rtconfig cwd = GetCurrentDir() src = Split(''' @@ -7,6 +8,9 @@ lodepng.c CPPPATH = [cwd] -group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH) +if rtconfig.ARCH == 'sim': + group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH) +else: + group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH) Return('group') |