Changes in uspace/srv/hw/char/i8042/i8042.c [c0699467:ffa2c8ef] in mainline

File:

• uspace/srv/hw/char/i8042/i8042.c (modified) (6 diffs)

uspace/srv/hw/char/i8042/i8042.c

@@ -41 +41 @@
 #include <devmap.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <unistd.h>
 #include <sysinfo.h>
@@ -47 +46 @@
 #include <errno.h>
 #include <inttypes.h>
+
 #include "i8042.h"
-
-// FIXME: remove this header
-#include <abi/ipc/methods.h>
 
 #define NAME "i8042"
@@ -122 +119 @@
 
 static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call);
-static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall);
 static int i8042_init(void);
 static void i8042_port_write(int devid, uint8_t data);
@@ -216 +213 @@
 
 /** Character device connection handler */
-static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -250 +247 @@
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
-                
-                if (!method) {
+                switch (method) {
+                case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
                         async_answer_0(callid, EOK);
                         return;
-                }
-                
-                switch (method) {
                 case IPC_M_CONNECT_TO_ME:
                         printf(NAME ": creating callback connection\n");
@@ -306 +300 @@
 
         if (i8042_port[devid].client_phone != -1) {
-                async_obsolete_msg_1(i8042_port[devid].client_phone,
+                async_msg_1(i8042_port[devid].client_phone,
                     IPC_FIRST_USER_METHOD, data);
         }