Changeset 8ff0bd2 in mainline for uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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 (moved) (moved from uspace/drv/usbhid/multimedia/multimedia.c ) (7 diffs)

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

@@ -50 +50 @@
 #include <str_error.h>
 
-#include <ipc/kbd.h>
+#include <ipc/kbdev.h>
 #include <io/console.h>
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "multimedia-keys"
@@ -94 +94 @@
         
         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) {
@@ -162 +161 @@
         }
         
-        async_obsolete_msg_4(multim_dev->console_phone, KBD_EVENT, ev.type, ev.key, 
+        async_obsolete_msg_4(multim_dev->console_phone, KBDEV_EVENT, ev.type, ev.key, 
             ev.mods, ev.c);
-}
-
-/*----------------------------------------------------------------------------*/
-
-static void usb_multimedia_free(usb_multimedia_t **multim_dev)
-{
-        if (multim_dev == NULL || *multim_dev == NULL) {
-                return;
-        }
-        
-        // hangup phone to the console
-        async_obsolete_hangup((*multim_dev)->console_phone);
-
-        free(*multim_dev);
-        *multim_dev = NULL;
 }
 
@@ -186 +170 @@
     usb_multimedia_t *multim_dev)
 {
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
             NAME);
@@ -206 +190 @@
         }
         
-        usb_log_debug("%s function created (jandle: %" PRIun ").\n",
+        usb_log_debug("%s function created (handle: %" PRIun ").\n",
             NAME, fun->handle);
         
-        rc = ddf_fun_add_to_class(fun, "keyboard");
+        rc = ddf_fun_add_to_category(fun, "keyboard");
         if (rc != EOK) {
                 usb_log_error(
-                    "Could not add DDF function to class 'keyboard': %s.\n",
+                    "Could not add DDF function to category 'keyboard': %s.\n",
                     str_error(rc));
                 // TODO: Can / should I destroy the DDF function?
@@ -248 +232 @@
         
         int rc = usb_multimedia_create_function(hid_dev, multim_dev);
-        if (rc != EOK) {
-                usb_multimedia_free(&multim_dev);
+        if (rc != EOK)
                 return rc;
-        }
         
         usb_log_debug(NAME " HID/multimedia structure initialized.\n");
@@ -268 +250 @@
         if (data != NULL) {
                 usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-                usb_multimedia_free(&multim_dev);
-        }
-}
-
-/*----------------------------------------------------------------------------*/
-
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data, 
-    uint8_t *buffer, size_t buffer_size)
+                // hangup phone to the console
+                async_obsolete_hangup(multim_dev->console_phone);
+        }
+}
+
+/*----------------------------------------------------------------------------*/
+
+bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data)
 {
         // TODO: checks
-        if (hid_dev == NULL || data == NULL || buffer == NULL) {
+        if (hid_dev == NULL || data == NULL) {
                 return false;
         }
-        
-        usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
-            hid_dev, buffer, buffer_size);
-        
+
         usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
-
-        usb_log_debug(NAME " Calling usb_hid_parse_report() with "
-            "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
         
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
 
-        uint8_t report_id;
-        
-        int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
-            &report_id);
-        
-        if (rc != EOK) {
-                usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
-                    str_error(rc));
-                return true;
-        }
-        
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(