Changeset 7aaed09 in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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 mainline changes.

File:

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

uspace/drv/bus/usb/usbmast/main.c

@@ -114 +114 @@
 {
         //TODO: flush buffers, or whatever.
+        //TODO: remove device
         return ENOTSUP;
 }
@@ -139 +140 @@
 
         usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
-        usb_log_debug(" Bulk in endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_IN_EP].pipe->endpoint_no,
-            (size_t) dev->pipes[BULK_IN_EP].descriptor->max_packet_size);
+        usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
+            dev->pipes[BULK_IN_EP].pipe.endpoint_no,
+            dev->pipes[BULK_IN_EP].pipe.max_packet_size);
         usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_OUT_EP].pipe->endpoint_no,
-            (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);
+            dev->pipes[BULK_OUT_EP].pipe.endpoint_no,
+            dev->pipes[BULK_OUT_EP].pipe.max_packet_size);
 
         usb_log_debug("Get LUN count...\n");