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

File:

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

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

@@ -64 +64 @@
         //int32_t *keys;
         /** Count of stored keys (i.e. number of keys in the report). */
-        //size_t key_count;
+        //size_t key_count;     
         /** IPC session to the console device (for sending key events). */
         async_sess_t *console_sess;
-        /** DDF function */
-        ddf_fun_t *fun;
 } usb_multimedia_t;
 
@@ -88 +86 @@
 {
         usb_log_debug(NAME " default_connection_handler()\n");
-
+        
         usb_multimedia_t *multim_dev = (usb_multimedia_t *)fun->driver_data;
-
+        
         if (multim_dev == NULL) {
                 async_answer_0(icallid, EINVAL);
                 return;
         }
-
+        
         async_sess_t *sess =
             async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
@@ -139 +137 @@
         assert(hid_dev != NULL);
         assert(multim_dev != NULL);
-
+        
         kbd_event_t ev;
-
+        
         ev.type = type;
         ev.key = key;
@@ -153 +151 @@
                 return;
         }
-
+        
         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);
@@ -161 +159 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data)
-{
-        if (hid_dev == NULL || hid_dev->usb_dev == NULL) {
-                return EINVAL; /*! @todo Other return code? */
-        }
-
-        usb_log_debug(NAME " Initializing HID/multimedia structure...\n");
-
+static int usb_multimedia_create_function(usb_hid_dev_t *hid_dev, 
+    usb_multimedia_t *multim_dev)
+{
         /* Create the exposed function. */
-        ddf_fun_t *fun = ddf_fun_create(
-            hid_dev->usb_dev->ddf_dev, fun_exposed, NAME);
+        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
+            NAME);
         if (fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");
                 return ENOMEM;
         }
-
+        
         fun->ops = &multimedia_ops;
-
-        usb_multimedia_t *multim_dev =
-            ddf_fun_data_alloc(fun, sizeof(usb_multimedia_t));
-        if (multim_dev == NULL) {
-                ddf_fun_destroy(fun);
-                return ENOMEM;
-        }
-
-        multim_dev->console_sess = NULL;
-        multim_dev->fun = fun;
-
-        //todo Autorepeat?
-
+        fun->driver_data = multim_dev;   // TODO: maybe change to hid_dev->data
+        
         int rc = ddf_fun_bind(fun);
         if (rc != EOK) {
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
+                // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(fun);
                 return rc;
         }
-
+        
         usb_log_debug("%s function created (handle: %" PRIun ").\n",
             NAME, fun->handle);
-
+        
         rc = ddf_fun_add_to_category(fun, "keyboard");
         if (rc != EOK) {
@@ -207 +190 @@
                     "Could not add DDF function to category 'keyboard': %s.\n",
                     str_error(rc));
+                // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(fun);
                 return rc;
         }
-
-        /* Save the KBD device structure into the HID device structure. */
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data)
+{
+        if (hid_dev == NULL || hid_dev->usb_dev == NULL) {
+                return EINVAL; /*! @todo Other return code? */
+        }
+        
+        usb_log_debug(NAME " Initializing HID/multimedia structure...\n");
+        
+        usb_multimedia_t *multim_dev = (usb_multimedia_t *)malloc(
+            sizeof(usb_multimedia_t));
+        if (multim_dev == NULL) {
+                return ENOMEM;
+        }
+        
+        multim_dev->console_sess = NULL;
+        
+        /*! @todo Autorepeat */
+        
+        // save the KBD device structure into the HID device structure
         *data = multim_dev;
-
+        
+        usb_log_debug(NAME " HID/multimedia device structure initialized.\n");
+        
+        int rc = usb_multimedia_create_function(hid_dev, multim_dev);
+        if (rc != EOK)
+                return rc;
+        
         usb_log_debug(NAME " HID/multimedia structure initialized.\n");
+        
         return EOK;
 }
@@ -225 +239 @@
                 return;
         }
-
+        
         if (data != NULL) {
                 usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
                 // hangup session to the console
                 async_hangup(multim_dev->console_sess);
-                const int ret = ddf_fun_unbind(multim_dev->fun);
-                if (ret != EOK) {
-                        usb_log_error("Failed to unbind multim function.\n");
-                } else {
-                        usb_log_debug2("%s unbound.\n", multim_dev->fun->name);
-                        ddf_fun_destroy(multim_dev->fun);
-                }
         }
 }
@@ -250 +257 @@
 
         usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-
+        
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
@@ -257 +264 @@
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-            &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
-            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+            hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END 
+            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
             USB_HID_REPORT_TYPE_INPUT);
 
@@ -276 +283 @@
                                                key);
                 }
-
+                
                 field = usb_hid_report_get_sibling(
-                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
+                    hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
                     | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
                     USB_HID_REPORT_TYPE_INPUT);
-        }
+        }       
 
         usb_hid_report_path_free(path);
-
+        
         return true;
 }