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

Timestamp:

2010-12-17T10:14:01Z (12 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

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

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

@@ -219 +219 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -248 +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: