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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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 mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

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

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

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <async.h>
 #include <sysinfo.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);
@@ -122 +121 @@
         
         if (cir_service)
-                async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
-                    IPC_GET_METHOD(*call));
+                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+                    IPC_GET_IMETHOD(*call));
 }