Changeset 925a21e in mainline for uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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:

• uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (13 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>
 
@@ -53 +52 @@
 #include <io/console.h>
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
-#define NAME "multimedia-keys"
+#define NAME  "multimedia-keys"
 
 /*----------------------------------------------------------------------------*/
@@ -69 +65 @@
         /** Count of stored keys (i.e. number of keys in the report). */
         //size_t key_count;     
-        /** IPC phone to the console device (for sending key events). */
-        int console_phone;
+        /** IPC session to the console device (for sending key events). */
+        async_sess_t *console_sess;
 } usb_multimedia_t;
 
@@ -79 +75 @@
  *
  * 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 phone to it for 
+ * assumes the caller is the console and thus it stores IPC session to it for
  * later use by the driver to notify about key events.
  *
@@ -91 +87 @@
         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;
         
@@ -99 +93 @@
                 return;
         }
-
-        if (method == IPC_M_CONNECT_TO_ME) {
-                int callback = IPC_GET_ARG5(*icall);
-
-                if (multim_dev->console_phone != -1) {
+        
+        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
                         async_answer_0(icallid, ELIMIT);
-                        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);
+        } else
+                async_answer_0(icallid, EINVAL);
 }
 
@@ -155 +146 @@
 
         usb_log_debug2(NAME " Sending key %d to the console\n", ev.key);
-        if (multim_dev->console_phone < 0) {
+        if (multim_dev->console_sess == NULL) {
                 usb_log_warning(
                     "Connection to console not ready, key discarded.\n");
@@ -161 +152 @@
         }
         
-        async_obsolete_msg_4(multim_dev->console_phone, KBDEV_EVENT, ev.type, ev.key, 
-            ev.mods, ev.c);
-}
-
-/*----------------------------------------------------------------------------*/
-
-static void usb_multimedia_free(usb_multimedia_t **multim_dev)
-{
-        if (multim_dev == NULL || *multim_dev == NULL) {
-                return;
-        }
-        
-        // hangup phone to the console
-        async_obsolete_hangup((*multim_dev)->console_phone);
-
-        free(*multim_dev);
-        *multim_dev = NULL;
+        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);
 }
 
@@ -185 +162 @@
     usb_multimedia_t *multim_dev)
 {
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
             NAME);
@@ -205 +182 @@
         }
         
-        usb_log_debug("%s function created (jandle: %" PRIun ").\n",
+        usb_log_debug("%s function created (handle: %" PRIun ").\n",
             NAME, fun->handle);
         
-        rc = ddf_fun_add_to_class(fun, "keyboard");
+        rc = ddf_fun_add_to_category(fun, "keyboard");
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to class 'keyboard': %s.\n",
+                    "Could not add DDF function to category 'keyboard': %s.\n",
                     str_error(rc));
                 // TODO: Can / should I destroy the DDF function?
@@ -237 +214 @@
         }
         
-        multim_dev->console_phone = -1;
+        multim_dev->console_sess = NULL;
         
         /*! @todo Autorepeat */
@@ -247 +224 @@
         
         int rc = usb_multimedia_create_function(hid_dev, multim_dev);
-        if (rc != EOK) {
-                usb_multimedia_free(&multim_dev);
+        if (rc != EOK)
                 return rc;
-        }
         
         usb_log_debug(NAME " HID/multimedia structure initialized.\n");
@@ -267 +242 @@
         if (data != NULL) {
                 usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-                usb_multimedia_free(&multim_dev);
+                // hangup session to the console
+                async_hangup(multim_dev->console_sess);
         }
 }