Changeset 132ab5d1 in mainline for uspace/drv/block/usbmast

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

Location:

uspace/drv/block/usbmast

Files:

• bo_trans.c (modified) (2 diffs)
• main.c (modified) (1 diff)

uspace/drv/block/usbmast/bo_trans.c

@@ -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)
@@ -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;
 }
 

uspace/drv/block/usbmast/main.c

@@ -215 +215 @@
  * @param mdev          Mass storage device
  * @param lun           LUN
- * @return              EOK on success or negative error code.
+ * @return              EOK on success or an error code.
  */
 static int usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun)