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

File:

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

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

@@ -161 +161 @@
 /*----------------------------------------------------------------------------*/
 
-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");
@@ -178 +173 @@
 
         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);
@@ -210 +194 @@
                 return rc;
         }
-
-        /* Save the KBD device structure into the HID device structure. */
+        multim_dev->fun = fun;
+
+        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;
 }
@@ -257 +272 @@
 
         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);
 
@@ -278 +293 @@
 
                 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);