Changeset 17aca1c in mainline for uspace/srv/hw/char/i8042/i8042.c

Timestamp:

2011-02-04T20:56:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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) (5 diffs)

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

@@ -40 +40 @@
 #include <libarch/ddi.h>
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>
@@ -199 +198 @@
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
-        ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
+        register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
+        register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
         printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
             NAME, inr_a, inr_b);
@@ -236 +235 @@
 
         if (dev_id < 0) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         printf(NAME ": accepted connection\n");
@@ -251 +250 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -272 +271 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }