Changeset 3f29834 in mainline

Timestamp:

2009-12-26T13:03:53Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9f51afc

Parents:

bb2dbf8

Message:

Fix non-generic identifiers.

File:

• uspace/srv/kbd/generic/kbd.c (modified) (5 diffs)

uspace/srv/kbd/generic/kbd.c

@@ -60 +60 @@
 #define NAMESPACE  "hid_in"
 
-int phone2cons = -1;
+int client_phone = -1;
 
 /** Currently active modifiers. */
@@ -164 +164 @@
         ev.c = layout[active_layout]->parse_ev(&ev);
 
-        async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
-}
-
-static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
+        async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
+}
+
+static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -179 +179 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        if (phone2cons != -1) {
-                                ipc_hangup(phone2cons);
-                                phone2cons = -1;
+                        if (client_phone != -1) {
+                                ipc_hangup(client_phone);
+                                client_phone = -1;
                         }
                         
@@ -187 +187 @@
                         return;
                 case IPC_M_CONNECT_TO_ME:
-                        if (phone2cons != -1) {
+                        if (client_phone != -1) {
                                 retval = ELIMIT;
                                 break;
                         }
-                        phone2cons = IPC_GET_ARG5(call);
+                        client_phone = IPC_GET_ARG5(call);
                         retval = 0;
                         break;
@@ -238 +238 @@
         
         /* Register driver */
-        int rc = devmap_driver_register(NAME, console_connection);
+        int rc = devmap_driver_register(NAME, client_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver (%d)\n", rc);