Changeset f126c87 in mainline for uspace/lib/usb/include/usb/descriptor.h

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

• uspace/lib/usb/include/usb/descriptor.h (modified) (3 diffs)

uspace/lib/usb/include/usb/descriptor.h

@@ -45 +45 @@
         USB_DESCTYPE_INTERFACE = 4,
         USB_DESCTYPE_ENDPOINT = 5,
-        /* New in USB2.0 */
+        /* New in USB 2.0 */
         USB_DESCTYPE_DEVICE_QUALIFIER = 6,
         USB_DESCTYPE_OTHER_SPEED_CONFIGURATION = 7,
@@ -202 +202 @@
          * HS INT and ISO transfers. */
         uint16_t max_packet_size;
+
 #define ED_MPS_PACKET_SIZE_MASK  0x3ff
 #define ED_MPS_PACKET_SIZE_GET(value) \
@@ -207 +208 @@
 #define ED_MPS_TRANS_OPPORTUNITIES_GET(value) \
         ((((value) >> 10) & 0x3) + 1)
+
         /** Polling interval in milliseconds.
          * Ignored for bulk and control endpoints.