Changeset 91b60499 in mainline for uspace/drv/char/i8042/i8042.c
- Timestamp:
- 2017-09-30T06:29:42Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 300f4c4
- Parents:
- d076f16 (diff), 6636fb19 (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/drv/char/i8042/i8042.c
rd076f16 r91b60499 269 269 }; 270 270 271 rc = register_interrupt_handler(ddf_dev, irq_kbd, i8042_irq_handler, 272 &irq_code); 273 if (rc != EOK) { 271 const int irq_kbd_cap = register_interrupt_handler(ddf_dev, irq_kbd, 272 i8042_irq_handler, &irq_code); 273 if (irq_kbd_cap < 0) { 274 rc = irq_kbd_cap; 274 275 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.", 275 276 ddf_dev_get_name(ddf_dev)); … … 277 278 } 278 279 279 rc = register_interrupt_handler(ddf_dev, irq_mouse, i8042_irq_handler, 280 &irq_code); 281 if (rc != EOK) { 280 const int irq_mouse_cap = register_interrupt_handler(ddf_dev, irq_mouse, 281 i8042_irq_handler, &irq_code); 282 if (irq_mouse_cap < 0) { 283 rc = irq_mouse_cap; 282 284 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.", 283 285 ddf_dev_get_name(ddf_dev));
Note:
See TracChangeset
for help on using the changeset viewer.