Changeset cf2af94 in mainline for contrib/arch/uspace/srv/kbd/kbd.adl

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:

• contrib/arch/uspace/srv/kbd/kbd.adl (modified) (2 diffs)

contrib/arch/uspace/srv/kbd/kbd.adl

@@ -1 +1 @@
 interface kbd extends service {
                 /* Callback connection */
-                ipcarg_t ipc_m_connect_to_me(void);
+                sysarg_t ipc_m_connect_to_me(void);
                 
                 /* Yield hardware */
-                ipcarg_t yield(void);
+                sysarg_t yield(void);
                 
                 /* Reclaim hardware */
-                ipcarg_t reclaim(void);
+                sysarg_t reclaim(void);
         protocol:
                 [kbd.bp]
@@ -14 +14 @@
 interface event {
                 /* Send keyboard event */
-                ipcarg_t event(in ipcarg_t type, in ipcarg_t key, in ipcarg_t mods, in ipcarg_t char);
+                sysarg_t event(in sysarg_t type, in sysarg_t key, in sysarg_t mods, in sysarg_t char);
         protocol:
                 [event.bp]