Changeset ce2a1c2 in mainline

Timestamp:

2011-10-15T14:29:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9c5fd7a

Parents:

a8c4e871

Message:

usbhid: multimedia; unite init and create_function functions.

File:

• uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (3 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;
 }