Changes in uspace/lib/drv/generic/driver.c [0ca16307:9f6c5ef0] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (8 diffs)

uspace/lib/drv/generic/driver.c

@@ -48 +48 @@
 #include <ctype.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include <ipc/driver.h>
@@ -177 +178 @@
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {
-                printf("%s: new device with handle = %x was added.\n",
+                printf("%s: new device with handle=%" PRIun " was added.\n",
                     driver->name, dev_handle);
         } else {
-                printf("%s: failed to add a new device with handle = %d.\n",
+                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
                     driver->name, dev_handle);
                 remove_from_devices_list(dev);
@@ -207 +208 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -230 +230 @@
         if (dev == NULL) {
                 printf("%s: driver_connection_gen error - no device with handle"
-                    " %x was found.\n", driver->name, handle);
+                    " %" PRIun " was found.\n", driver->name, handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -294 +294 @@
                                 printf("%s: driver_connection_gen error - ",
                                     driver->name);
-                                printf("device with handle %d has no interface "
+                                printf("device with handle %" PRIun " has no interface "
                                     "with id %d.\n", handle, iface_idx);
                                 ipc_answer_0(callid, ENOTSUP);
@@ -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;
 
-        goto leave;
+        if (child_handle != NULL) {
+                *child_handle = child->handle;
+        }
+        return EOK;
 
 failure:
@@ -431 +435 @@
         }
 
-leave:
         return rc;
 }