Changeset bbc28be in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2010-12-03T12:59:13Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

70c85211

Parents:

2e15ac40 (diff), da55d5b (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:

Merged branch development into /lelian/hidd

File:

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

uspace/lib/drv/generic/driver.c

@@ -48 +48 @@
 #include <ctype.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include <ipc/driver.h>
@@ -164 +165 @@
         
         devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
+    
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -171 +174 @@
         
         add_to_devices_list(dev);
+        dev->parent = driver_get_device(&devices, parent_dev_handle);
+        
         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);
@@ -203 +208 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -226 +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;
@@ -290 +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);