Changeset 985e26d2 in mainline for contrib/arch/uspace/srv/kbd/kbd.bp

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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:

• contrib/arch/uspace/srv/kbd/kbd.bp (modified) (1 diff)

contrib/arch/uspace/srv/kbd/kbd.bp

@@ +1 @@
+?ipc_m_connect_me_to ;
 (
-        !ns.IPC_M_CONNECT_ME_TO /* cir */ +
-        NULL
-) ;
-!ns.IPC_M_CONNECT_TO_ME ;
-(
-        ?kbd.IPC_M_CONNECT_ME_TO ;
-        (
-                (
-                        ?kbd.KBD_YIELD +
-                        ?kbd.KBD_RECLAIM +
-                ) |
-                !console.KBD_EVENT
-        )* ;
-        ?kbd.IPC_M_PHONE_HUNGUP
+        ?ipc_m_connect_to_me +
+        ?yield +
+        ?reclam
 )* ;
-(
-        !cir.IPC_M_PHONE_HUNGUP +
-        NULL
-)
+?ipc_m_phone_hungup