Changes in uspace/drv/bus/usb/usbhid/multimedia/multimedia.c [9d58539:56fd7cf] in mainline

File:

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

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

@@ -54 +54 @@
 #define NAME  "multimedia-keys"
 
-/*----------------------------------------------------------------------------*/
+
 /**
  * Logitech UltraX device type.
@@ -70 +70 @@
 
 
-/*----------------------------------------------------------------------------*/
+
 /**
  * Default handler for IPC methods not handled by DDF.
@@ -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 =
@@ -106 +102 @@
                 async_answer_0(icallid, EINVAL);
 }
-/*----------------------------------------------------------------------------*/
+
 static ddf_dev_ops_t multimedia_ops = {
         .default_handler = default_connection_handler
 };
-/*----------------------------------------------------------------------------*/
+
 /**
  * Processes key events.
@@ -155 +151 @@
         }
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data)
 {
@@ -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);
@@ -216 +212 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 void usb_multimedia_deinit(struct usb_hid_dev *hid_dev, void *data)
 {
         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);
+        }
+}
+
 bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data)
 {
         // 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();