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

File:

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

uspace/lib/drv/generic/driver.c

@@ -48 +48 @@
 #include <ctype.h>
 #include <errno.h>
-#include <inttypes.h>
 
 #include <ipc/driver.h>
@@ -81 +80 @@
 static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
 {
-        int id = (int)IPC_GET_IMETHOD(*icall);
+        int id = (int)IPC_GET_METHOD(*icall);
         interrupt_context_t *ctx;
         
@@ -178 +177 @@
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {
-                printf("%s: new device with handle=%" PRIun " was added.\n",
+                printf("%s: new device with handle = %x was added.\n",
                     driver->name, dev_handle);
         } else {
-                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
+                printf("%s: failed to add a new device with handle = %d.\n",
                     driver->name, dev_handle);
                 remove_from_devices_list(dev);
@@ -200 +199 @@
                 ipc_callid_t callid = async_get_call(&call);
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -208 +207 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOENT);
+                        if (!(callid & IPC_CALLID_NOTIFICATION))
+                                ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -230 +230 @@
         if (dev == NULL) {
                 printf("%s: driver_connection_gen error - no device with handle"
-                    " %" PRIun " was found.\n", driver->name, handle);
+                    " %x was found.\n", driver->name, handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -254 +254 @@
                 ipc_call_t call;
                 callid = async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                ipcarg_t method = IPC_GET_METHOD(call);
                 int iface_idx;
                 
@@ -294 +294 @@
                                 printf("%s: driver_connection_gen error - ",
                                     driver->name);
-                                printf("device with handle %" PRIun " has no interface "
+                                printf("device with handle %d has no interface "
                                     "with id %d.\n", handle, iface_idx);
                                 ipc_answer_0(callid, ENOTSUP);
@@ -308 +308 @@
 
                         /* get the method of the remote interface */
-                        sysarg_t iface_method_idx = IPC_GET_ARG1(call);
+                        ipcarg_t iface_method_idx = IPC_GET_ARG1(call);
                         remote_iface_func_ptr_t iface_method_ptr =
                             get_remote_method(rem_iface, iface_method_idx);
@@ -346 +346 @@
 {
         /* Select interface */
-        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
+        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
         case DRIVER_DEVMAN:
                 /* handle PnP events from device manager */
@@ -418 +418 @@
                 goto failure;
 
-        return EOK;
+        goto leave;
 
 failure:
@@ -431 +431 @@
         }
 
+leave:
         return rc;
 }