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

Timestamp:

2011-07-13T22:39:18Z (15 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

• uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (moved) (moved from uspace/drv/usbhid/multimedia/multimedia.c ) (4 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>
 
@@ -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);
 }
@@ -274 +273 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data, 
-    uint8_t *buffer, size_t buffer_size)
+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(