Changeset a90fc0c in mainline

Timestamp:

2011-03-21T15:53:51Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d7186cd

Parents:

aaff605

Message:

Refactoring of "enum to string" functions

Location:

uspace/lib/usb

Files:

• include/usb/usb.h (modified) (1 diff)
• src/usb.c (modified) (4 diffs)

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

@@ -61 +61 @@
 
 const char * usb_str_transfer_type(usb_transfer_type_t t);
+const char * usb_str_transfer_type_short(usb_transfer_type_t t);
 
 /** USB data transfer direction. */

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",
@@ -41 +43 @@
         "high"
 };
-static size_t str_speed_size = sizeof(str_speed)/sizeof(str_speed[0]);
+
+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.
@@ -48 +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];
 }
 
@@ -71 +91 @@
 const char *usb_str_speed(usb_speed_t s)
 {
-        if (s >= str_speed_size) {
+        if (s >= ARR_SIZE(str_speed)) {
                 return "invalid";
         }