Changes in uspace/drv/bus/usb/usbhid/multimedia/multimedia.c [5da7199:5f6e25e] in mainline

File:

• uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (10 diffs)

uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

@@ -47 +47 @@
 #include <errno.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <str_error.h>
 
@@ -52 +53 @@
 #include <io/console.h>
 
-#define NAME  "multimedia-keys"
+// FIXME: remove this header
+#include <abi/ipc/methods.h>
+
+#define NAME "multimedia-keys"
 
 /*----------------------------------------------------------------------------*/
@@ -65 +69 @@
         /** Count of stored keys (i.e. number of keys in the report). */
         //size_t key_count;     
-        /** IPC session to the console device (for sending key events). */
-        async_sess_t *console_sess;
+        /** IPC phone to the console device (for sending key events). */
+        int console_phone;
 } usb_multimedia_t;
 
@@ -75 +79 @@
  *
  * Currently recognizes only one method (IPC_M_CONNECT_TO_ME), in which case it
- * assumes the caller is the console and thus it stores IPC session to it for
+ * assumes the caller is the console and thus it stores IPC phone to it for 
  * later use by the driver to notify about key events.
  *
@@ -87 +91 @@
         usb_log_debug(NAME " default_connection_handler()\n");
         
+        sysarg_t method = IPC_GET_IMETHOD(*icall);
+        
         usb_multimedia_t *multim_dev = (usb_multimedia_t *)fun->driver_data;
         
@@ -93 +99 @@
                 return;
         }
-        
-        async_sess_t *sess =
-            async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
-        if (sess != NULL) {
-                if (multim_dev->console_sess == NULL) {
-                        multim_dev->console_sess = sess;
-                        usb_log_debug(NAME " Saved session to console: %p\n",
-                            sess);
-                        async_answer_0(icallid, EOK);
-                } else
+
+        if (method == IPC_M_CONNECT_TO_ME) {
+                int callback = IPC_GET_ARG5(*icall);
+
+                if (multim_dev->console_phone != -1) {
                         async_answer_0(icallid, ELIMIT);
-        } else
-                async_answer_0(icallid, EINVAL);
+                        return;
+                }
+
+                multim_dev->console_phone = callback;
+                usb_log_debug(NAME " Saved phone to console: %d\n", callback);
+                async_answer_0(icallid, EOK);
+                return;
+        }
+        
+        async_answer_0(icallid, EINVAL);
 }
 
@@ -146 +155 @@
 
         usb_log_debug2(NAME " Sending key %d to the console\n", ev.key);
-        if (multim_dev->console_sess == NULL) {
+        if (multim_dev->console_phone < 0) {
                 usb_log_warning(
                     "Connection to console not ready, key discarded.\n");
@@ -152 +161 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(multim_dev->console_sess);
-        async_msg_4(exch, KBDEV_EVENT, ev.type, ev.key, ev.mods, ev.c);
-        async_exchange_end(exch);
+        async_obsolete_msg_4(multim_dev->console_phone, KBDEV_EVENT, ev.type, ev.key, 
+            ev.mods, ev.c);
 }
 
@@ -214 +222 @@
         }
         
-        multim_dev->console_sess = NULL;
+        multim_dev->console_phone = -1;
         
         /*! @todo Autorepeat */
@@ -242 +250 @@
         if (data != NULL) {
                 usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-                // hangup session to the console
-                async_hangup(multim_dev->console_sess);
+                // hangup phone to the console
+                async_obsolete_hangup(multim_dev->console_phone);
         }
 }