diff options
| author | Bernard Xiong <[email protected]> | 2013-10-25 18:11:24 -0700 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-10-25 18:11:24 -0700 |
| commit | fac2bb2288c9ca4d6117dddf26984f7e3bd6a2d4 (patch) | |
| tree | c031a9979667b58ad15850195431b696a90c2874 /components | |
| parent | 166531168de3e906098531f9d8c9cac71a89177a (diff) | |
| parent | 6bb2c0f2ead16ac7c46b582f67e354bedbcf87a1 (diff) | |
Merge pull request #187 from grissiom/serial-fix
Revert "serial: set the errno if and only if in thread context"
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/serial/serial.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index c4a7ac6980..5e7a8ec814 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -257,8 +257,8 @@ static rt_size_t rt_serial_read(struct rt_device *dev, } read_nbytes = (rt_uint32_t)ptr - (rt_uint32_t)buffer; - /* set error code if and only if in thread context */ - if (read_nbytes == 0 && !rt_interrupt_get_nest()) + /* set error code */ + if (read_nbytes == 0) { rt_set_errno(-RT_EEMPTY); } @@ -349,8 +349,7 @@ static rt_size_t rt_serial_write(struct rt_device *dev, } write_nbytes = (rt_uint32_t)ptr - (rt_uint32_t)buffer; - /* set error code if and only if in thread context */ - if (write_nbytes == 0 && !rt_interrupt_get_nest()) + if (write_nbytes == 0) { rt_set_errno(-RT_EFULL); } |
