Changeset 1f131fb9 in mainline for uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

Timestamp:

2011-10-16T19:38:53Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22ceff3a, e5291e0

Parents:

98fb010 (diff), 93d2684 (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:

Minor USB changes.

Add more const qualifiers where possible.
Do not limit the number possible usbhid subdrivers.
This should not break anything. If it does feel free to revert this merge.

File:

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

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

@@ -161 +161 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_multimedia_create_function(usb_hid_dev_t *hid_dev, 
-    usb_multimedia_t *multim_dev)
-{
+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");
+
         /* 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");
@@ -173 +178 @@
 
         fun->ops = &multimedia_ops;
-        fun->driver_data = multim_dev;   // TODO: maybe change to hid_dev->data
+
+        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?
 
         int rc = ddf_fun_bind(fun);
@@ -194 +210 @@
                 return rc;
         }
-        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
+
+        /* 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;
 }
@@ -272 +257 @@
 
         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);
 
@@ -293 +278 @@
 
                 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);