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

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (3 diffs)

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

@@ -148 +148 @@
                 rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
                 if (rc != EOK) {
-                        devmap_hangup_phone(DEVMAP_DRIVER);
                         printf(NAME ": Unable to register device %s.\n", name);
                         return rc;
@@ -219 +218 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -248 +247 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP: