Changeset 6a44ee4 in mainline for uspace/srv/hw/char/i8042/i8042.c

Timestamp:

2011-07-20T15:26:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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 mainline changes.

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>
@@ -46 +47 @@
 #include <errno.h>
 #include <inttypes.h>
-
 #include "i8042.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define NAME "i8042"
@@ -119 +122 @@
 
 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);
+static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static int i8042_init(void);
 static void i8042_port_write(int devid, uint8_t data);
@@ -213 +216 @@
 
 /** Character device connection handler */
-static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_callid_t callid;
@@ -247 +250 @@
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
-                switch (method) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!method) {
                         /* 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");
@@ -300 +306 @@
 
         if (i8042_port[devid].client_phone != -1) {
-                async_msg_1(i8042_port[devid].client_phone,
+                async_obsolete_msg_1(i8042_port[devid].client_phone,
                     IPC_FIRST_USER_METHOD, data);
         }