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

Timestamp:

2010-11-19T23:50:06Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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

@@ -145 +145 @@
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = devmap_device_register(name, &i8042_port[i].dev_handle);
+                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -218 +218 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int retval;
         int dev_id, i;
@@ -230 +230 @@
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].dev_handle == dh)
+                if (i8042_port[i].devmap_handle == dh)
                         dev_id = i;
         }