瀏覽代碼

Revert "serial: set the errno if and only if in thread context"

This reverts commit 07bd09fc0fc256e5c53ad3c6157802fd94c9910c.
The validation of the context is done with in `rt_set_errno`. So it's
safe to call it here.
Grissiom 11 年之前
父節點
當前提交
6bb2c0f2ea
共有 1 個文件被更改,包括 3 次插入4 次删除
  1. 3 4
      components/drivers/serial/serial.c

+ 3 - 4
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);
     }