Changeset a5b3de6 in mainline for uspace/lib/usbhost/include

Timestamp:

2017-10-25T11:55:15Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2b35478

Parents:

c3d926f3

Message:

usbhost endpoint: removed target

The reasons for having usb_target_t inside endpoint have been dismissed. Enpoint is not a target of a transaction, so this was just misleading.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• endpoint.h (modified) (2 diffs)
• usb_transfer_batch.h (modified) (2 diffs)

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -60 +60 @@
         /** USB device */
         device_t *device;
-        /** USB address. */
-        usb_target_t target;
+        /** Enpoint number */
+        usb_endpoint_t endpoint;
         /** Communication direction. */
         usb_direction_t direction;
@@ -108 +108 @@
         return item ? list_get_instance(item, endpoint_t, link) : NULL;
 }
+
 #endif
 

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -55 +55 @@
 /** Structure stores additional data needed for communication with EP */
 typedef struct usb_transfer_batch {
+        /** Target for communication */
+        usb_target_t target;
+
         /** Endpoint used for communication */
         endpoint_t *ep;
+
         /** Size reported to be sent */
         size_t expected_size;
@@ -96 +100 @@
  */
 #define USB_TRANSFER_BATCH_ARGS(batch) \
-        (batch).ep->target.address, (batch).ep->target.endpoint, \
+        (batch).target.address, (batch).target.endpoint, \
         usb_str_speed((batch).ep->speed), \
         usb_str_transfer_type_short((batch).ep->transfer_type), \