Changeset 5d915b7 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2011-09-14T14:25:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8e3d17f

Parents:

1e647c7d

Message:

uhci: Minor tweaks and comment fixes

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -134 +134 @@
         memcpy(dest, usb_batch->setup_buffer, usb_batch->setup_size);
         dest += usb_batch->setup_size;
-        /* Copy generic data if unless they are provided by the device */
+        /* Copy generic data unless they are provided by the device */
         if (usb_batch->ep->direction != USB_DIRECTION_IN) {
                 memcpy(dest, usb_batch->buffer, usb_batch->buffer_size);
@@ -142 +142 @@
             " memory structures ready.\n", usb_batch,
             USB_TRANSFER_BATCH_ARGS(*usb_batch));
+
         assert(
             batch_setup[usb_batch->ep->transfer_type][usb_batch->ep->direction]);
@@ -215 +216 @@
         assert(uhci_batch);
         assert(uhci_batch->usb_batch);
+        assert(uhci_batch->usb_batch->ep);
+        assert(uhci_batch->usb_batch->ep->direction == USB_DIRECTION_OUT ||
+            uhci_batch->usb_batch->ep->direction == USB_DIRECTION_IN);
+
         static const usb_packet_id pids[] = {
                 [USB_DIRECTION_IN] = USB_PID_IN,
                 [USB_DIRECTION_OUT] = USB_PID_OUT,
         };
-        assert(uhci_batch->usb_batch->ep->direction == USB_DIRECTION_OUT ||
-            uhci_batch->usb_batch->ep->direction == USB_DIRECTION_IN);
 
         const usb_packet_id pid = pids[uhci_batch->usb_batch->ep->direction];