Changeset 1d2a1a9 in mainline for uspace/srv/hw/char/i8042/i8042.c
- Timestamp:
- 2011-08-17T20:44:32Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0cc32f2
- Parents:
- bb285b4 (diff), c53a705 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hw/char/i8042/i8042.c
rbb285b4 r1d2a1a9 39 39 #include <ddi.h> 40 40 #include <libarch/ddi.h> 41 #include < devmap.h>41 #include <loc.h> 42 42 #include <async.h> 43 43 #include <async_obsolete.h> … … 50 50 51 51 // FIXME: remove this header 52 #include < kernel/ipc/ipc_methods.h>52 #include <abi/ipc/methods.h> 53 53 54 54 #define NAME "i8042" … … 135 135 printf(NAME ": i8042 PS/2 port driver\n"); 136 136 137 rc = devmap_driver_register(NAME, i8042_connection);137 rc = loc_server_register(NAME, i8042_connection); 138 138 if (rc < 0) { 139 printf(NAME ": Unable to register driver.\n");139 printf(NAME ": Unable to register server.\n"); 140 140 return rc; 141 141 } … … 148 148 149 149 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]); 150 rc = devmap_device_register(name, &i8042_port[i].devmap_handle);150 rc = loc_service_register(name, &i8042_port[i].service_id); 151 151 if (rc != EOK) { 152 152 printf(NAME ": Unable to register device %s.\n", name); … … 221 221 ipc_call_t call; 222 222 sysarg_t method; 223 devmap_handle_t dh;223 service_id_t dsid; 224 224 int retval; 225 225 int dev_id, i; … … 228 228 229 229 /* Get the device handle. */ 230 d h= IPC_GET_ARG1(*icall);230 dsid = IPC_GET_ARG1(*icall); 231 231 232 232 /* Determine which disk device is the client connecting to. */ 233 233 dev_id = -1; 234 234 for (i = 0; i < MAX_DEVS; i++) { 235 if (i8042_port[i]. devmap_handle == dh)235 if (i8042_port[i].service_id == dsid) 236 236 dev_id = i; 237 237 }
Note:
See TracChangeset
for help on using the changeset viewer.