Changeset 7943c43 in mainline for uspace/lib/usb/src/usb.c

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/lib/usb/src/usb.c (modified) (1 diff)

uspace/lib/usb/src/usb.c

@@ -39 +39 @@
 
 static const char *str_speed[] = {
-        "low",
-        "full",
-        "high"
+        [USB_SPEED_LOW] = "low",
+        [USB_SPEED_FULL] = "full",
+        [USB_SPEED_HIGH] = "high",
 };
 
 static const char *str_transfer_type[] = {
-        "control",
-        "isochronous",
-        "bulk",
-        "interrupt"
+        [USB_TRANSFER_CONTROL] = "control",
+        [USB_TRANSFER_ISOCHRONOUS] = "isochronous",
+        [USB_TRANSFER_BULK] = "bulk",
+        [USB_TRANSFER_INTERRUPT] = "interrupt",
 };
 
 static const char *str_transfer_type_short[] = {
-        "ctrl",
-        "iso",
-        "bulk",
-        "intr"
+        [USB_TRANSFER_CONTROL] = "ctrl",
+        [USB_TRANSFER_ISOCHRONOUS] = "iso",
+        [USB_TRANSFER_BULK] = "bulk",
+        [USB_TRANSFER_INTERRUPT] = "intr",
 };
 
 static const char *str_direction[] = {
-        "in",
-        "out",
-        "both"
+        [USB_DIRECTION_IN] = "in",
+        [USB_DIRECTION_OUT] = "out",
+        [USB_DIRECTION_BOTH] = "both",
 };