Changeset 8b655705 in mainline for uspace/srv/hid/kbd/port/z8530.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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.

File:

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

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

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/irc.h>
 #include <async.h>
@@ -99 +98 @@
         
         async_set_interrupt_received(z8530_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
+        register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
         
         return 0;
@@ -109 +108 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }