Changeset 65b458c4 in mainline for uspace/drv/usbhid/multimedia/multimedia.c

Timestamp:

2011-05-13T12:44:37Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

37f87fa

Parents:

97cb542

Message:

Subdriver-specific data moved to the subdriver structure.

+ DDF ops removed from hid_dev_t.

Should fix #225

File:

• uspace/drv/usbhid/multimedia/multimedia.c (modified) (10 diffs)

uspace/drv/usbhid/multimedia/multimedia.c

@@ -87 +87 @@
         sysarg_t method = IPC_GET_IMETHOD(*icall);
         
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-        
-        if (hid_dev == NULL || hid_dev->data == NULL) {
+        usb_multimedia_t *multim_dev = (usb_multimedia_t *)fun->driver_data;
+        //usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        if (multim_dev == NULL) {
                 async_answer_0(icallid, EINVAL);
                 return;
         }
-        
-        assert(hid_dev != NULL);
-        assert(hid_dev->data != NULL);
-        usb_multimedia_t *multim_dev = (usb_multimedia_t *)hid_dev->data;
 
         if (method == IPC_M_CONNECT_TO_ME) {
@@ -139 +136 @@
  * @param key Key code of the key according to HID Usage Tables.
  */
-static void usb_multimedia_push_ev(usb_hid_dev_t *hid_dev, int type, 
-    unsigned int key)
+static void usb_multimedia_push_ev(usb_hid_dev_t *hid_dev, 
+    usb_multimedia_t *multim_dev, int type, unsigned int key)
 {
         assert(hid_dev != NULL);
-        assert(hid_dev->data != NULL);
-        
-        usb_multimedia_t *multim_dev = (usb_multimedia_t *)hid_dev->data;
+        assert(multim_dev != NULL);
+        
+//      usb_multimedia_t *multim_dev = (usb_multimedia_t *)hid_dev->data;
         
         console_event_t ev;
@@ -190 +187 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_multimedia_create_function(usb_hid_dev_t *hid_dev)
+static int usb_multimedia_create_function(usb_hid_dev_t *hid_dev, 
+    usb_multimedia_t *multim_dev)
 {
         /* Create the function exposed under /dev/devices. */
@@ -200 +198 @@
         }
         
-        /*
-         * Store the initialized HID device and HID ops
-         * to the DDF function.
-         */
         fun->ops = &multimedia_ops;
-        fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
+        fun->driver_data = multim_dev;   // TODO: maybe change to hid_dev->data
         
         int rc = ddf_fun_bind(fun);
@@ -231 +225 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_multimedia_init(struct usb_hid_dev *hid_dev)
+int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data)
 {
         if (hid_dev == NULL || hid_dev->usb_dev == NULL) {
@@ -282 +276 @@
         
         // save the KBD device structure into the HID device structure
-        hid_dev->data = multim_dev;
+        *data = multim_dev;
         
         usb_log_debug(NAME " HID/multimedia device structure initialized.\n");
         
-        int rc = usb_multimedia_create_function(hid_dev);
+        int rc = usb_multimedia_create_function(hid_dev, multim_dev);
         if (rc != EOK) {
                 usb_multimedia_free(&multim_dev);
@@ -299 +293 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_multimedia_deinit(struct usb_hid_dev *hid_dev)
+void usb_multimedia_deinit(struct usb_hid_dev *hid_dev, void *data)
 {
         if (hid_dev == NULL) {
@@ -305 +299 @@
         }
         
-        if (hid_dev->data != NULL) {
-                usb_multimedia_t *multim_dev = 
-                    (usb_multimedia_t *)hid_dev->data;
+        if (data != NULL) {
+                usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
                 usb_multimedia_free(&multim_dev);
-                hid_dev->data = NULL;
-        }
-}
-
-/*----------------------------------------------------------------------------*/
-
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, 
+        }
+}
+
+/*----------------------------------------------------------------------------*/
+
+bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data, 
     uint8_t *buffer, size_t buffer_size)
 {
@@ -322 +314 @@
         usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
             hid_dev, buffer, buffer_size);
+        
+        if (data == NULL) {
+                return EINVAL;  // TODO: other error code?
+        }
+        
+        usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
 
         usb_log_debug(NAME " Calling usb_hid_parse_report() with "
@@ -361 +359 @@
                             usb_multimedia_usage_to_str(field->usage);
                         usb_log_info("Pressed key: %s\n", key_str);
-                        usb_multimedia_push_ev(hid_dev, KEY_PRESS, key);
+                        usb_multimedia_push_ev(hid_dev, multim_dev, KEY_PRESS, 
+                                               key);
                 }