Changeset 1d1bb0f in mainline for uspace/lib/usb/src

Timestamp:

2011-06-19T13:38:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b72efe8

Parents:

adfdbd5 (diff), 9724d7f (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 ​https://code.launchpad.net/~vojtech-horky/helenos/usb

Location:

uspace/lib/usb/src

Files:

• debug.c (modified) (3 diffs)
• hc.c (modified) (3 diffs)
• usb.c (modified) (2 diffs)

uspace/lib/usb/src/debug.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <ddf/log.h>
 #include <usb/debug.h>
 
@@ -67 +68 @@
                 if (rc > 0) {
                         log_stream = fopen(fname, "w");
+                        if (log_stream != NULL) {
+                                setvbuf(log_stream, NULL, _IOFBF, BUFSIZ);
+                        }
                         free(fname);
                 }
@@ -193 +197 @@
         bzero(buffer_dump[buffer_dump_index], BUFFER_DUMP_LEN);
 
-        if (buffer == NULL) {
-                return "(null)";
-        }
-        if (size == 0) {
-                return "(empty)";
-        }
-        if ((dumped_size == 0) || (dumped_size > size)) {
-                dumped_size = size;
-        }
-
-        /* How many bytes are available in the output buffer. */
-        size_t buffer_remaining_size = BUFFER_DUMP_LEN - 1 - REMAINDER_STR_LEN;
-        char *it = buffer_dump[buffer_dump_index];
-
-        size_t index = 0;
-
-        while (index < size) {
-                /* Determine space before the number. */
-                const char *space_before;
-                if (index == 0) {
-                        space_before = "";
-                } else if ((index % BUFFER_DUMP_GROUP_SIZE) == 0) {
-                        space_before = "  ";
-                } else {
-                        space_before = " ";
-                }
-
-                /*
-                 * Add the byte as a hexadecimal number plus the space.
-                 * We do it into temporary buffer to ensure that always
-                 * the whole byte is printed.
-                 */
-                int val = buffer[index];
-                char current_byte[16];
-                int printed = snprintf(current_byte, 16,
-                    "%s%02x", space_before, val);
-                if (printed < 0) {
-                        break;
-                }
-
-                if ((size_t) printed > buffer_remaining_size) {
-                        break;
-                }
-
-                /* We can safely add 1, because space for end 0 is reserved. */
-                str_append(it, buffer_remaining_size + 1, current_byte);
-
-                buffer_remaining_size -= printed;
-                /* Point at the terminator 0. */
-                it += printed;
-                index++;
-
-                if (index >= dumped_size) {
-                        break;
-                }
-        }
-
-        /* Add how many bytes were not printed. */
-        if (index < size) {
-                snprintf(it, REMAINDER_STR_LEN,
-                    REMAINDER_STR_FMT, size - index);
-        }
+        /* Do the actual dump. */
+        ddf_dump_buffer(buffer_dump[buffer_dump_index], BUFFER_DUMP_LEN,
+            buffer, 1, size, dumped_size);
 
         /* Next time, use the other buffer. */

uspace/lib/usb/src/hc.c

@@ -98 +98 @@
                 return EBUSY;
         
-        async_sess_t *sess = devman_device_connect(EXCHANGE_SERIALIZE,
+        async_sess_t *sess = devman_device_connect(EXCHANGE_ATOMIC,
             connection->hc_handle, 0);
         if (!sess)
@@ -177 +177 @@
 {
         async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev_handle,
+            devman_parent_device_connect(EXCHANGE_ATOMIC, dev_handle,
             IPC_FLAG_BLOCKING);
         if (!parent_sess)
@@ -241 +241 @@
 {
         async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, device_handle,
+            devman_parent_device_connect(EXCHANGE_ATOMIC, device_handle,
             IPC_FLAG_BLOCKING);
         if (!parent_sess)

uspace/lib/usb/src/usb.c

@@ -58 +58 @@
 };
 
+static const char *str_direction[] = {
+        "in",
+        "out",
+        "both"
+};
+
 /** String representation for USB transfer type.
  *
@@ -84 +90 @@
 }
 
+/** String representation of USB direction.
+ *
+ * @param d The direction.
+ * @return Direction as a string (in English).
+ */
+const char *usb_str_direction(usb_direction_t d)
+{
+        if (d >= ARR_SIZE(str_direction)) {
+                return "invalid";
+        }
+        return str_direction[d];
+}
+
 /** String representation of USB speed.
  *