Changeset 92574f4 in mainline for uspace/srv/hid/kbd/port/ns16550.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

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

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/irc.h>
 #include <async.h>
@@ -111 +110 @@
         
         async_set_interrupt_received(ns16550_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
+        register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
         
         return pio_enable((void *) ns16550_physical, 8, &vaddr);