Changeset fa9b606 in mainline for uspace/lib

Timestamp:

2010-12-10T16:46:54Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ee0d8a8

Parents:

10096231 (diff), ebb98c5 (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 development into smekideki

Location:

uspace/lib

Files:

• drv/generic/driver.c (modified) (2 diffs)
• drv/include/driver.h (modified) (1 diff)
• usb/Makefile (modified) (1 diff)
• usb/include/usb/classes/hidparser.h (added)
• usb/src/hidparser.c (added)
• usb/src/remotedrv.c (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -390 +390 @@
  */
 int child_device_register_wrapper(device_t *parent, const char *child_name,
-    const char *child_match_id, int child_match_score)
+    const char *child_match_id, int child_match_score,
+    devman_handle_t *child_handle)
 {
         device_t *child = NULL;
@@ -418 +419 @@
                 goto failure;
 
+        if (child_handle != NULL) {
+                *child_handle = child->handle;
+        }
         return EOK;
 

uspace/lib/drv/include/driver.h

@@ -199 +199 @@
 
 int child_device_register(device_t *, device_t *);
-int child_device_register_wrapper(device_t *, const char *, const char *, int);
+int child_device_register_wrapper(device_t *, const char *, const char *, int,
+    devman_handle_t *);
 
 

uspace/lib/usb/Makefile

@@ -38 +38 @@
         src/hcdhubd.c \
         src/hcdrv.c \
+        src/hidparser.c \
         src/localdrv.c \
         src/remotedrv.c \

uspace/lib/usb/src/remotedrv.c

@@ -300 +300 @@
  */
 static void remote_in_callback(usb_hc_device_t *hc,
-    usb_transaction_outcome_t outcome, size_t actual_size, void *arg)
+    size_t actual_size, usb_transaction_outcome_t outcome, void *arg)
 {
         transfer_info_t *transfer = (transfer_info_t *) arg;