Changes in uspace/srv/hw/char/i8042/i8042.c [385a3d6:b3d513f] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hw/char/i8042/i8042.c
r385a3d6 rb3d513f 169 169 void *vaddr; 170 170 171 i8042_physical = sysinfo_value(" i8042.address.physical");172 i8042_kernel = sysinfo_value(" i8042.address.kernel");171 i8042_physical = sysinfo_value("kbd.address.physical"); 172 i8042_kernel = sysinfo_value("kbd.address.kernel"); 173 173 if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0) 174 174 return -1; … … 193 193 i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status; 194 194 i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data; 195 ipc_register_irq(sysinfo_value(" i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);196 ipc_register_irq(sysinfo_value(" i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);195 ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd); 196 ipc_register_irq(sysinfo_value("mouse.inr"), device_assign_devno(), 0, &i8042_kbd); 197 197 198 198 pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB); … … 208 208 static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall) 209 209 { 210 void *fs_va = NULL; 210 211 ipc_callid_t callid; 211 212 ipc_call_t call; 212 213 ipcarg_t method; 213 214 dev_handle_t dh; 215 int flags; 214 216 int retval; 217 size_t cnt; 215 218 int dev_id, i; 216 219 … … 222 225 /* Determine which disk device is the client connecting to. */ 223 226 dev_id = -1; 224 for (i = 0; i < MAX_DEVS; i++) {227 for (i = 0; i < MAX_DEVS; i++) 225 228 if (i8042_port[i].dev_handle == dh) 226 229 dev_id = i; 227 } 228 229 if (dev_id < 0) { 230 231 if (dev_id < 0/* || disk[dev_id].present == false*/) { 230 232 ipc_answer_0(iid, EINVAL); 231 233 return;
Note:
See TracChangeset
for help on using the changeset viewer.