Changeset 5f0fe4e9 in mainline

Timestamp:

2011-05-11T19:37:16Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c372e03

Parents:

cf002dbf

Message:

Mass storage (small) refactoring

Location:

uspace/drv/usbmast

Files:

• main.c (modified) (2 diffs)
• mast.c (modified) (2 diffs)
• mast.h (modified) (1 diff)

uspace/drv/usbmast/main.c

@@ -107 +107 @@
             (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);
 
-        int lun_count = usb_massstor_get_max_lun(dev);
-        /* Return value:
-         * rc < 0 => device does not know this request, only single LUN
-         *     could be present
-         * rc >= 0 - the rc is the maximum LUN, thus count is +1
-         */
-        if (lun_count < 0) {
-                lun_count = 1;
-        } else {
-                lun_count++;
-        }
+        size_t lun_count = usb_masstor_get_lun_count(dev);
 
         usb_massstor_inquiry_result_t inquiry;
@@ -127 +117 @@
         }
 
-        usb_log_info("Mass storage `%s': `%s' by `%s' is %s (%s), %d LUN(s).\n",
+        usb_log_info("Mass storage `%s': " \
+            "`%s' by `%s' is %s (%s), %zu LUN(s).\n",
             dev->ddf_dev->name,
             inquiry.product_and_revision, inquiry.vendor_id,

uspace/drv/usbmast/mast.c

@@ -173 +173 @@
 /** Get max LUN of a mass storage device.
  *
+ * @see usb_masstor_get_lun_count
+ *
  * @warning Error from this command does not necessarily indicate malfunction
  * of the device. Device does not need to support this request.
+ * You shall rather use usb_masstor_get_lun_count.
  *
  * @param dev Mass storage device.
@@ -195 +198 @@
 }
 
+/** Get number of LUNs supported by mass storage device.
+ *
+ * @warning This function hides any error during the request
+ * (typically that shall not be a problem).
+ *
+ * @param dev Mass storage device.
+ * @return Number of LUNs.
+ */
+size_t usb_masstor_get_lun_count(usb_device_t *dev)
+{
+        int max_lun = usb_massstor_get_max_lun(dev);
+        if (max_lun < 0) {
+                max_lun = 1;
+        } else {
+                max_lun++;
+        }
+
+        return (size_t) max_lun;
+}
+
 /**
  * @}

uspace/drv/usbmast/mast.h

@@ -62 +62 @@
 void usb_massstor_reset_recovery(usb_device_t *, size_t, size_t);
 int usb_massstor_get_max_lun(usb_device_t *);
+size_t usb_masstor_get_lun_count(usb_device_t *);
 int usb_massstor_inquiry(usb_device_t *, size_t, size_t,
     usb_massstor_inquiry_result_t *);