Changeset 973ef9fc in mainline for uspace/srv/hw/char/i8042/i8042.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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

@@ -46 +46 @@
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "i8042.h"
@@ -201 +202 @@
         ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
         ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
-        printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b);
+        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
+            NAME, inr_a, inr_b);
 
         wait_ready();
@@ -217 +219 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -246 +248 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
@@ -262 +264 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %d to devid %d\n",
+                        printf(NAME ": write %" PRIun " to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));