diff options
| author | Meco Man <[email protected]> | 2023-02-05 18:35:33 -0500 |
|---|---|---|
| committer | Man, Jianting (Meco) <[email protected]> | 2023-02-07 21:43:57 -0500 |
| commit | f58d3c5200d5a51a39503c5311422e2fb99d3d20 (patch) | |
| tree | cab3ae78ea13bfb649e5087c138bf9a951746a4b /include | |
| parent | 890c1c9264e425f20c2925de4095fb46ca4e74aa (diff) | |
rt_device_write/read return data type as rt_ssize_t
rt_ssize_t can give negative error code, which follows the unix style correctly
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtdef.h | 12 | ||||
| -rw-r--r-- | include/rtthread.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/rtdef.h b/include/rtdef.h index 31341759bf..4a65c27842 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -1217,8 +1217,8 @@ struct rt_device_ops rt_err_t (*init) (rt_device_t dev); rt_err_t (*open) (rt_device_t dev, rt_uint16_t oflag); rt_err_t (*close) (rt_device_t dev); - rt_size_t (*read) (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); - rt_size_t (*write) (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); + rt_ssize_t (*read) (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); + rt_ssize_t (*write) (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); rt_err_t (*control)(rt_device_t dev, int cmd, void *args); }; #endif /* RT_USING_DEVICE_OPS */ @@ -1261,8 +1261,8 @@ struct rt_device rt_err_t (*init) (rt_device_t dev); rt_err_t (*open) (rt_device_t dev, rt_uint16_t oflag); rt_err_t (*close) (rt_device_t dev); - rt_size_t (*read) (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); - rt_size_t (*write) (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); + rt_ssize_t (*read) (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); + rt_ssize_t (*write) (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); rt_err_t (*control)(rt_device_t dev, int cmd, void *args); #endif /* RT_USING_DEVICE_OPS */ @@ -1290,8 +1290,8 @@ struct rt_driver rt_err_t (*init) (rt_device_t dev); rt_err_t (*open) (rt_device_t dev, rt_uint16_t oflag); rt_err_t (*close) (rt_device_t dev); - rt_size_t (*read) (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); - rt_size_t (*write) (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); + rt_ssize_t (*read) (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); + rt_ssize_t (*write) (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); rt_err_t (*control)(rt_device_t dev, int cmd, void *args); #endif const struct filesystem_ops *fops; diff --git a/include/rtthread.h b/include/rtthread.h index 7538a3c032..5cfa3c26b1 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -560,11 +560,11 @@ rt_device_set_tx_complete(rt_device_t dev, rt_err_t rt_device_init (rt_device_t dev); rt_err_t rt_device_open (rt_device_t dev, rt_uint16_t oflag); rt_err_t rt_device_close(rt_device_t dev); -rt_size_t rt_device_read (rt_device_t dev, +rt_ssize_t rt_device_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size); -rt_size_t rt_device_write(rt_device_t dev, +rt_ssize_t rt_device_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size); |