Changeset b77931d in mainline for uspace/drv/bus

Timestamp:

2011-11-05T16:08:01Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d176b1d

Parents:

ab27e01

Message:

usb: usb_pipe_t was always allocated in usb_endpoint_mapping_t, embed it.

Location:

uspace/drv/bus/usb

Files:

• usbhid/main.c (modified) (1 diff)
• usbmast/bo_trans.c (modified) (3 diffs)
• usbmast/main.c (modified) (1 diff)

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

@@ -113 +113 @@
            usb_hid_polling_callback,
            /* How much data to request. */
-           dev->pipes[hid_dev->poll_pipe_index].pipe->max_packet_size,
+           dev->pipes[hid_dev->poll_pipe_index].pipe.max_packet_size,
            /* Callback when the polling ends. */
            usb_hid_polling_ended_callback,

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

@@ -67 +67 @@
         int retval = EOK;
         size_t act_size;
-        usb_pipe_t *bulk_in_pipe = mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe;
-        usb_pipe_t *bulk_out_pipe = mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe;
+        usb_pipe_t *bulk_in_pipe = &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe;
+        usb_pipe_t *bulk_out_pipe = &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe;
         usb_direction_t ddir;
         void *dbuf;
@@ -118 +118 @@
                 if (ddir == USB_DIRECTION_IN) {
                         usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
-                            mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+                            &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
                 } else {
                         usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
-                            mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
+                            &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
                 }
         } else if (rc != EOK) {
@@ -216 +216 @@
         usb_massstor_reset(mdev);
         usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
-            mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+            &mdev->usb_dev->pipes[BULK_IN_EP].pipe);
         usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
-            mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
+            &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 }
 

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

@@ -140 +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,
+        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 out endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_OUT_EP].pipe->endpoint_no,
+            dev->pipes[BULK_OUT_EP].pipe.endpoint_no,
             (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);