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

Timestamp:

2011-12-22T12:04:54Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

3819ce5

Parents:

65d7b0a (diff), a438de4 (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 with mainline

File:

• uspace/srv/hw/char/i8042/i8042.c (modified) (1 diff)

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

@@ -197 +197 @@
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
-        register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
+        irq_register(inr_a, device_assign_devno(), 0, &i8042_kbd);
+        irq_register(inr_b, device_assign_devno(), 0, &i8042_kbd);
         printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
             NAME, inr_a, inr_b);