Changes in uspace/drv/block/usbmast/bo_trans.c [53b9f2c:b7fd2a0] in mainline

File:

• uspace/drv/block/usbmast/bo_trans.c (modified) (5 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(
@@ -228 +228 @@
  *
  * @param mfun          Mass storage function
- * @return              Error code of maximum LUN (index, not count)
+ * @return              Maximum LUN (index, not count), or -1
  */
 int usb_massstor_get_max_lun(usbmast_dev_t *mdev)
@@ -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,
@@ -240 +240 @@
             &data_recv_len);
         if (rc != EOK) {
-                return rc;
+                return -1;
         }
         if (data_recv_len != 1) {
-                return EEMPTY;
-        }
-        return (int) max_lun;
+                return -1;
+        }
+        return max_lun;
 }