Changeset 357b5f5 in mainline for uspace/srv/hid/kbd

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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.

Location:

uspace/srv/hid/kbd

Files:

• generic/kbd.c (modified) (1 diff)
• port/adb.c (modified) (2 diffs)
• port/chardev.c (modified) (2 diffs)
• port/ns16550.c (modified) (2 diffs)
• port/z8530.c (modified) (2 diffs)

uspace/srv/hid/kbd/generic/kbd.c

@@ -177 +177 @@
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         if (client_phone != -1) {

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

@@ -71 +71 @@
 
         /* NB: The callback connection is slotted for removal */
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
@@ -105 +105 @@
                 int retval;
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */

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

@@ -91 +91 @@
 
         /* NB: The callback connection is slotted for removal */
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
@@ -125 +125 @@
                 int retval;
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */

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

@@ -36 +36 @@
 
 #include <ipc/ipc.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <async.h>
 #include <sysinfo.h>
@@ -122 +122 @@
         
         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));
 }
 

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

@@ -36 +36 @@
 
 #include <ipc/ipc.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <async.h>
 #include <sysinfo.h>
@@ -110 +110 @@
         
         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));
 }