Changes in uspace/srv/hid/console/console.c [a2a3763:103ae7f8] in mainline

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"
@@ -68 +67 @@
 /** 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. */
@@ -96 +90 @@
                                        contents and related settings. */
 } console_t;
-
-
 
 /** Array of data for virtual consoles */
@@ -409 +401 @@
 }
 
-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)
@@ -436 +415 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
-                        close_driver_phone(iid);
                         return;
                 case KBD_EVENT:
@@ -480 +458 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
-                        close_driver_phone(iid);
                         return;
                 case MEVENT_BUTTON:
@@ -738 +715 @@
 }
 
-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)
@@ -773 +729 @@
         }
         
-        ipc_callid_t hash;
-        int rc = async_connect_to_me_hack(phone, SERVICE_CONSOLE, 0, phone,
-            handler, &hash);
+        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);
         if (rc != EOK) {
                 printf(NAME ": " \
@@ -783 +737 @@
         }
         
-        driver_phones[phone] = hash;
-
-        printf(NAME ": found %s \"%s\" (%" PRIxn ").\n", devname, path, hash);
+        printf(NAME ": found %s \"%s\".\n", devname, path);
 
         return phone;