Changeset db71e2a in mainline for uspace/lib/usb

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

Location:

uspace/lib/usb/src

Files:

• debug.c (modified) (1 diff)
• dev.c (modified) (3 diffs)

uspace/lib/usb/src/debug.c

@@ -84 +84 @@
          * Remove previous string.
          */
-        bzero(buffer_dump[buffer_dump_index], BUFFER_DUMP_LEN);
+        memset(buffer_dump[buffer_dump_index], 0, BUFFER_DUMP_LEN);
 
         /* Do the actual dump. */

uspace/lib/usb/src/dev.c

@@ -38 +38 @@
 
 static bool try_parse_bus_and_address(const char *path,
-    char **func_start,
+    const char **func_start,
     devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
 {
@@ -44 +44 @@
         size_t address;
         int rc;
-        char *ptr;
+        const char *ptr;
 
         rc = str_uint64_t(path, &ptr, 10, false, &sid);
@@ -108 +108 @@
         usb_address_t addr = -1;
         int rc;
-        char *func_start = NULL;
+        const char *func_start = NULL;
         char *path = NULL;