Changeset 19a1800 in mainline for uspace/srv/hid/kbd/port/gxemul.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 the current development

File:

• uspace/srv/hid/kbd/port/gxemul.c (modified) (2 diffs)

uspace/srv/hid/kbd/port/gxemul.c

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
 #include <async.h>
 #include <sysinfo.h>
@@ -74 +73 @@
         async_set_interrupt_received(gxemul_irq_handler);
         gxemul_cmds[0].addr = (void *) addr;
-        ipc_register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
+        register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
         return 0;
 }