Changeset 5a6cc679 in mainline for uspace/drv/block/usbmast/bo_trans.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/drv/block/usbmast/bo_trans.c (modified) (3 diffs)

uspace/drv/block/usbmast/bo_trans.c

@@ -58 +58 @@
  * @return              Error code
  */
-int usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, scsi_cmd_t *cmd)
-{
-        int rc;
+errno_t usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, scsi_cmd_t *cmd)
+{
+        errno_t rc;
 
         if (cmd->data_in && cmd->data_out)
@@ -192 +192 @@
  * @return              Error code
  */
-int usb_massstor_reset(usbmast_dev_t *mdev)
+errno_t usb_massstor_reset(usbmast_dev_t *mdev)
 {
         return usb_control_request_set(
@@ -234 +234 @@
         uint8_t max_lun;
         size_t data_recv_len;
-        int rc = usb_control_request_get(
+        errno_t rc = usb_control_request_get(
             usb_device_get_default_pipe(mdev->usb_dev),
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,