Changeset 434ef65 in mainline for uspace/lib/usb/src/usb.c

Timestamp:

2011-03-21T16:54:36Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

41ef5b9, ce794342

Parents:

5287502 (diff), 625f1ba (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:

Small improvements of libusb

Below is a summary of changes

• added usb_str_speed() function for nicer outputs
• USB framework remembers configuration descriptor
• some refactoring (hub driver, messages of transfer batch API)

File:

• uspace/lib/usb/src/usb.c (modified) (2 diffs)

uspace/lib/usb/src/usb.c

@@ -36 +36 @@
 #include <errno.h>
 
+#define ARR_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
+
+static const char *str_speed[] = {
+        "low",
+        "full",
+        "high"
+};
+
+static const char *str_transfer_type[] = {
+        "control",
+        "isochronous",
+        "bulk",
+        "interrupt"
+};
+
+static const char *str_transfer_type_short[] = {
+        "ctrl",
+        "iso",
+        "bulk",
+        "intr"
+};
 
 /** String representation for USB transfer type.
@@ -42 +63 @@
  * @return Transfer type as a string (in English).
  */
-const char * usb_str_transfer_type(usb_transfer_type_t t)
+const char *usb_str_transfer_type(usb_transfer_type_t t)
 {
-        switch (t) {
-                case USB_TRANSFER_ISOCHRONOUS:
-                        return "isochronous";
-                case USB_TRANSFER_INTERRUPT:
-                        return "interrupt";
-                case USB_TRANSFER_CONTROL:
-                        return "control";
-                case USB_TRANSFER_BULK:
-                        return "bulk";
-                default:
-                        return "unknown";
+        if (t >= ARR_SIZE(str_transfer_type)) {
+                return "invalid";
         }
+        return str_transfer_type[t];
+}
+
+/** String representation for USB transfer type (short version).
+ *
+ * @param t Transfer type.
+ * @return Transfer type as a short string for debugging messages.
+ */
+const char *usb_str_transfer_type_short(usb_transfer_type_t t)
+{
+        if (t >= ARR_SIZE(str_transfer_type_short)) {
+                return "invl";
+        }
+        return str_transfer_type_short[t];
+}
+
+/** String representation of USB speed.
+ *
+ * @param s The speed.
+ * @return USB speed as a string (in English).
+ */
+const char *usb_str_speed(usb_speed_t s)
+{
+        if (s >= ARR_SIZE(str_speed)) {
+                return "invalid";
+        }
+        return str_speed[s];
 }