Changeset 52c4264 in mainline for uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

Timestamp:

2012-08-17T12:23:52Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

267f235

Parents:

ae2c925 (diff), ad78054 (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) (6 diffs)

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

@@ -86 +86 @@
 {
         usb_log_debug(NAME " default_connection_handler()\n");
-        if (fun == NULL || fun->driver_data == NULL) {
-                async_answer_0(icallid, EINVAL);
-                return;
-        }
-
-        usb_multimedia_t *multim_dev = fun->driver_data;
+
+        usb_multimedia_t *multim_dev = ddf_fun_data_get(fun);
 
         async_sess_t *sess =
@@ -172 +168 @@
         }
 
-        fun->ops = &multimedia_ops;
+        ddf_fun_set_ops(fun, &multimedia_ops);
 
         usb_multimedia_t *multim_dev =
@@ -194 +190 @@
 
         usb_log_debug(NAME " function created (handle: %" PRIun ").\n",
-            fun->handle);
+            ddf_fun_get_handle(fun));
 
         rc = ddf_fun_add_to_category(fun, "keyboard");
@@ -203 +199 @@
                 if (ddf_fun_unbind(fun) != EOK) {
                         usb_log_error("Failed to unbind %s, won't destroy.\n",
-                            fun->name);
+                            ddf_fun_get_name(fun));
                 } else {
                         ddf_fun_destroy(fun);
@@ -220 +216 @@
 {
         ddf_fun_t *fun = data;
-        if (fun != NULL && fun->driver_data != NULL) {
-                usb_multimedia_t *multim_dev = fun->driver_data;
-                /* Hangup session to the console */
-                if (multim_dev->console_sess)
-                        async_hangup(multim_dev->console_sess);
-                if (ddf_fun_unbind(fun) != EOK) {
-                        usb_log_error("Failed to unbind %s, won't destroy.\n",
-                            fun->name);
-                } else {
-                        usb_log_debug2("%s unbound.\n", fun->name);
-                        /* This frees multim_dev too as it was stored in
-                         * fun->data */
-                        ddf_fun_destroy(fun);
-                }
+
+        usb_multimedia_t *multim_dev = ddf_fun_data_get(fun);
+
+        /* Hangup session to the console */
+        if (multim_dev->console_sess)
+                async_hangup(multim_dev->console_sess);
+        if (ddf_fun_unbind(fun) != EOK) {
+                usb_log_error("Failed to unbind %s, won't destroy.\n",
+                    ddf_fun_get_name(fun));
         } else {
-                usb_log_error(
-                    "Failed to deinit multimedia subdriver, data missing.\n");
+                usb_log_debug2("%s unbound.\n", ddf_fun_get_name(fun));
+                /* This frees multim_dev too as it was stored in
+                 * fun->data */
+                ddf_fun_destroy(fun);
         }
 }
@@ -244 +237 @@
         // TODO: checks
         ddf_fun_t *fun = data;
-        if (hid_dev == NULL || fun == NULL || fun->driver_data == NULL) {
+        if (hid_dev == NULL) {
                 return false;
         }
 
-        usb_multimedia_t *multim_dev = fun->driver_data;
+        usb_multimedia_t *multim_dev = ddf_fun_data_get(fun);
 
         usb_hid_report_path_t *path = usb_hid_report_path();