Changeset 5f0fe4e9 in mainline for uspace/drv/usbmast/main.c

Timestamp:

2011-05-11T19:37:16Z (14 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

File:

• uspace/drv/usbmast/main.c (modified) (2 diffs)

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,