mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2025-12-26 17:18:24 +00:00
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
This commit is contained in:
committed by
Man, Jianting (Meco)
parent
890c1c9264
commit
f58d3c5200
@@ -721,7 +721,7 @@ static int _vcom_getc(struct rt_serial_device *serial)
|
||||
return result;
|
||||
}
|
||||
|
||||
static rt_size_t _vcom_rb_block_put(struct vcom *data, const rt_uint8_t *buf, rt_size_t size)
|
||||
static rt_ssize_t _vcom_rb_block_put(struct vcom *data, const rt_uint8_t *buf, rt_size_t size)
|
||||
{
|
||||
rt_base_t level;
|
||||
rt_size_t put_len = 0;
|
||||
@@ -751,7 +751,7 @@ static rt_size_t _vcom_rb_block_put(struct vcom *data, const rt_uint8_t *buf, rt
|
||||
return size;
|
||||
}
|
||||
|
||||
static rt_size_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, int direction)
|
||||
static rt_ssize_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, int direction)
|
||||
{
|
||||
struct ufunction *func;
|
||||
struct vcom *data;
|
||||
|
||||
@@ -324,13 +324,13 @@ static rt_err_t rt_ecm_eth_close(rt_device_t dev)
|
||||
return RT_EOK;
|
||||
}
|
||||
|
||||
static rt_size_t rt_ecm_eth_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
|
||||
static rt_ssize_t rt_ecm_eth_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
|
||||
{
|
||||
rt_set_errno(-RT_ENOSYS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static rt_size_t rt_ecm_eth_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
|
||||
static rt_ssize_t rt_ecm_eth_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
|
||||
{
|
||||
rt_set_errno(-RT_ENOSYS);
|
||||
return 0;
|
||||
|
||||
@@ -594,7 +594,7 @@ static rt_err_t _hid_descriptor_config(uhid_comm_desc_t hid, rt_uint8_t cintf_nr
|
||||
|
||||
return RT_EOK;
|
||||
}
|
||||
static rt_size_t _hid_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
|
||||
static rt_ssize_t _hid_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
|
||||
{
|
||||
struct hid_s *hiddev = (struct hid_s *)dev;
|
||||
struct hid_report report;
|
||||
|
||||
@@ -44,7 +44,7 @@ typedef enum
|
||||
DIR_NONE,
|
||||
}CB_DIR;
|
||||
|
||||
typedef rt_size_t (*cbw_handler)(ufunction_t func, ustorage_cbw_t cbw);
|
||||
typedef rt_ssize_t (*cbw_handler)(ufunction_t func, ustorage_cbw_t cbw);
|
||||
|
||||
struct scsi_cmd
|
||||
{
|
||||
@@ -168,17 +168,17 @@ const static char* _ustring[] =
|
||||
"Interface",
|
||||
};
|
||||
|
||||
static rt_size_t _test_unit_ready(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _request_sense(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _start_stop(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _read_capacity(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_size_t _verify_10(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _test_unit_ready(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _request_sense(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _start_stop(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _read_capacity(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _read_10(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _write_10(ufunction_t func, ustorage_cbw_t cbw);
|
||||
static rt_ssize_t _verify_10(ufunction_t func, ustorage_cbw_t cbw);
|
||||
|
||||
rt_align(4)
|
||||
static struct scsi_cmd cmd_data[] =
|
||||
@@ -212,7 +212,7 @@ static void _send_status(ufunction_t func)
|
||||
data->status = STAT_CSW;
|
||||
}
|
||||
|
||||
static rt_size_t _test_unit_ready(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _test_unit_ready(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
|
||||
@@ -227,7 +227,7 @@ static rt_size_t _test_unit_ready(ufunction_t func, ustorage_cbw_t cbw)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static rt_size_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
|
||||
@@ -251,7 +251,7 @@ static rt_size_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw)
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
|
||||
static rt_size_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
rt_uint8_t *buf;
|
||||
@@ -290,7 +290,7 @@ static rt_size_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _request_sense(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _request_sense(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
struct request_sense_data *buf;
|
||||
@@ -333,7 +333,7 @@ static rt_size_t _request_sense(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
rt_uint8_t *buf;
|
||||
@@ -369,7 +369,7 @@ static rt_size_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
rt_uint8_t *buf;
|
||||
@@ -414,7 +414,7 @@ static rt_size_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _read_capacity(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _read_capacity(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
|
||||
@@ -459,7 +459,7 @@ static rt_size_t _read_capacity(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _read_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
rt_size_t size;
|
||||
@@ -499,7 +499,7 @@ static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _write_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
|
||||
@@ -536,7 +536,7 @@ static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
*
|
||||
* @return RT_EOK on successful.
|
||||
*/
|
||||
static rt_size_t _verify_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
static rt_ssize_t _verify_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
|
||||
@@ -551,7 +551,7 @@ static rt_size_t _verify_10(ufunction_t func, ustorage_cbw_t cbw)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static rt_size_t _start_stop(ufunction_t func,
|
||||
static rt_ssize_t _start_stop(ufunction_t func,
|
||||
ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
@@ -795,7 +795,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
|
||||
return RT_TRUE;
|
||||
}
|
||||
|
||||
static rt_size_t _cbw_handler(ufunction_t func, struct scsi_cmd* cmd,
|
||||
static rt_ssize_t _cbw_handler(ufunction_t func, struct scsi_cmd* cmd,
|
||||
ustorage_cbw_t cbw)
|
||||
{
|
||||
struct mstorage *data;
|
||||
|
||||
@@ -1083,13 +1083,13 @@ static rt_err_t rt_rndis_eth_close(rt_device_t dev)
|
||||
return RT_EOK;
|
||||
}
|
||||
|
||||
static rt_size_t rt_rndis_eth_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
|
||||
static rt_ssize_t rt_rndis_eth_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
|
||||
{
|
||||
rt_set_errno(-RT_ENOSYS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static rt_size_t rt_rndis_eth_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
|
||||
static rt_ssize_t rt_rndis_eth_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
|
||||
{
|
||||
rt_set_errno(-RT_ENOSYS);
|
||||
return 0;
|
||||
|
||||
@@ -227,7 +227,7 @@ static rt_err_t _winusb_descriptor_config(winusb_desc_t winusb, rt_uint8_t cintf
|
||||
return RT_EOK;
|
||||
}
|
||||
|
||||
static rt_size_t win_usb_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
|
||||
static rt_ssize_t win_usb_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
|
||||
{
|
||||
if(((ufunction_t)dev->user_data)->device->state != USB_STATE_CONFIGURED)
|
||||
{
|
||||
@@ -241,7 +241,7 @@ static rt_size_t win_usb_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_si
|
||||
rt_usbd_io_request(((ufunction_t)dev->user_data)->device,winusb_device->ep_out,&winusb_device->ep_out->request);
|
||||
return size;
|
||||
}
|
||||
static rt_size_t win_usb_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
|
||||
static rt_ssize_t win_usb_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
|
||||
{
|
||||
if(((ufunction_t)dev->user_data)->device->state != USB_STATE_CONFIGURED)
|
||||
{
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
static rt_list_t device_list;
|
||||
|
||||
static rt_size_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_size_t size);
|
||||
static rt_size_t rt_usbd_ep_read_prepare(udevice_t device, uep_t ep, void *buffer, rt_size_t size);
|
||||
static rt_ssize_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_size_t size);
|
||||
static rt_ssize_t rt_usbd_ep_read_prepare(udevice_t device, uep_t ep, void *buffer, rt_size_t size);
|
||||
static rt_err_t rt_usbd_ep_assign(udevice_t device, uep_t ep);
|
||||
rt_err_t rt_usbd_ep_unassign(udevice_t device, uep_t ep);
|
||||
|
||||
@@ -962,7 +962,7 @@ static rt_err_t _stop_notify(udevice_t device)
|
||||
return RT_EOK;
|
||||
}
|
||||
|
||||
static rt_size_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_size_t size)
|
||||
static rt_ssize_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_size_t size)
|
||||
{
|
||||
rt_uint16_t maxpacket;
|
||||
|
||||
@@ -988,7 +988,7 @@ static rt_size_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_s
|
||||
return size;
|
||||
}
|
||||
|
||||
static rt_size_t rt_usbd_ep_read_prepare(udevice_t device, uep_t ep, void *buffer, rt_size_t size)
|
||||
static rt_ssize_t rt_usbd_ep_read_prepare(udevice_t device, uep_t ep, void *buffer, rt_size_t size)
|
||||
{
|
||||
RT_ASSERT(device != RT_NULL);
|
||||
RT_ASSERT(device->dcd != RT_NULL);
|
||||
|
||||
@@ -149,7 +149,7 @@ static rt_err_t rt_usbh_adk_start(struct uintf* intf)
|
||||
*
|
||||
* @return the error code, RT_EOK on successfully.
|
||||
*/
|
||||
static rt_size_t rt_usbh_adk_read(rt_device_t device, rt_off_t pos, void* buffer,
|
||||
static rt_ssize_t rt_usbh_adk_read(rt_device_t device, rt_off_t pos, void* buffer,
|
||||
rt_size_t size)
|
||||
{
|
||||
uadk_t adk;
|
||||
@@ -177,7 +177,7 @@ static rt_size_t rt_usbh_adk_read(rt_device_t device, rt_off_t pos, void* buffer
|
||||
*
|
||||
* @return the error code, RT_EOK on successfully.
|
||||
*/
|
||||
static rt_size_t rt_usbh_adk_write (rt_device_t device, rt_off_t pos, const void* buffer,
|
||||
static rt_ssize_t rt_usbh_adk_write (rt_device_t device, rt_off_t pos, const void* buffer,
|
||||
rt_size_t size)
|
||||
{
|
||||
uadk_t adk;
|
||||
|
||||
@@ -64,7 +64,7 @@ static rt_err_t rt_udisk_init(rt_device_t dev)
|
||||
*
|
||||
* @return the actually read size on successful, otherwise negative returned.
|
||||
*/
|
||||
static rt_size_t rt_udisk_read(rt_device_t dev, rt_off_t pos, void* buffer,
|
||||
static rt_ssize_t rt_udisk_read(rt_device_t dev, rt_off_t pos, void* buffer,
|
||||
rt_size_t size)
|
||||
{
|
||||
rt_err_t ret;
|
||||
@@ -102,7 +102,7 @@ static rt_size_t rt_udisk_read(rt_device_t dev, rt_off_t pos, void* buffer,
|
||||
*
|
||||
* @return the actually written size on successful, otherwise negative returned.
|
||||
*/
|
||||
static rt_size_t rt_udisk_write (rt_device_t dev, rt_off_t pos, const void* buffer,
|
||||
static rt_ssize_t rt_udisk_write (rt_device_t dev, rt_off_t pos, const void* buffer,
|
||||
rt_size_t size)
|
||||
{
|
||||
rt_err_t ret;
|
||||
|
||||
Reference in New Issue
Block a user