Changeset 98e15b1 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-05-29T21:58:31Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

95067954, d600874

Parents:

6ab7f3e9 (diff), bd7acda (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 with usb/development

File:

• uspace/srv/hid/console/console.c (modified) (9 diffs)

uspace/srv/hid/console/console.c

@@ -57 +57 @@
 #include <io/style.h>
 #include <io/screenbuffer.h>
+#include <inttypes.h>
 
 #include "console.h"
@@ -67 +68 @@
 /** Interval for checking for new keyboard (1/4s). */
 #define HOTPLUG_WATCH_INTERVAL (1000 * 250)
+
+/* Kernel defines 32 but does not export it. */
+#define MAX_IPC_OUTGOING_PHONES 128
+/** To allow proper phone closing. */
+static ipc_callid_t driver_phones[MAX_IPC_OUTGOING_PHONES] = { 0 };
 
 /** Phone to the keyboard driver. */
@@ -90 +96 @@
                                        contents and related settings. */
 } console_t;
+
+
 
 /** Array of data for virtual consoles */
@@ -401 +409 @@
 }
 
+static void close_driver_phone(ipc_callid_t hash)
+{
+        int i;
+        for (i = 0; i < MAX_IPC_OUTGOING_PHONES; i++) {
+                if (driver_phones[i] == hash) {
+                        printf("Device %" PRIxn " gone.\n", hash);
+                        driver_phones[i] = 0;
+                        async_hangup(i);
+                        return;
+                }
+        }
+}
+
 /** Handler for keyboard */
 static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall)
@@ -415 +436 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
+                        close_driver_phone(iid);
                         return;
                 case KBD_EVENT:
@@ -458 +480 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
+                        close_driver_phone(iid);
                         return;
                 case MEVENT_BUTTON:
@@ -715 +738 @@
 }
 
+static int async_connect_to_me_hack(int phone, sysarg_t arg1, sysarg_t arg2,
+sysarg_t arg3, async_client_conn_t client_receiver, ipc_callid_t *hash)
+{
+        sysarg_t task_hash;
+        sysarg_t phone_hash;
+        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
+            NULL, NULL, NULL, &task_hash, &phone_hash);
+        if (rc != EOK)
+                return rc;
+
+        if (client_receiver != NULL)
+                async_new_connection(task_hash, phone_hash, phone_hash, NULL,
+                    client_receiver);
+
+        if (hash != NULL) {
+                *hash = phone_hash;
+        }
+
+        return EOK;
+}
+
 static int connect_keyboard_or_mouse(const char *devname,
     async_client_conn_t handler, const char *path)
@@ -729 +773 @@
         }
         
-        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);
+        ipc_callid_t hash;
+        int rc = async_connect_to_me_hack(phone, SERVICE_CONSOLE, 0, phone,
+            handler, &hash);
         if (rc != EOK) {
                 printf(NAME ": " \
@@ -737 +783 @@
         }
         
-        printf(NAME ": found %s \"%s\".\n", devname, path);
+        driver_phones[phone] = hash;
+
+        printf(NAME ": found %s \"%s\" (%" PRIxn ").\n", devname, path, hash);
 
         return phone;