Changes in uspace/drv/usbhid/multimedia/multimedia.c [65c3794:5f88293] in mainline

File:

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

uspace/drv/usbhid/multimedia/multimedia.c

@@ -46 +46 @@
 
 #include <errno.h>
+#include <async.h>
+#include <async_obsolete.h>
 #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>
 
 #define NAME "multimedia-keys"
@@ -143 +148 @@
         assert(multim_dev != NULL);
         
-        console_event_t ev;
+        kbd_event_t ev;
         
         ev.type = type;
@@ -157 +162 @@
         }
         
-        async_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);
 }
@@ -170 +175 @@
         
         // hangup phone to the console
-        async_hangup((*multim_dev)->console_phone);
+        async_obsolete_hangup((*multim_dev)->console_phone);
 
         free(*multim_dev);
@@ -269 +274 @@
 /*----------------------------------------------------------------------------*/
 
-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, 
+    uint8_t *buffer, size_t buffer_size)
 {
         // TODO: checks
-        if (hid_dev == NULL || data == NULL/* || buffer == NULL*/) {
+        if (hid_dev == NULL || data == NULL || buffer == NULL) {
                 return false;
         }
         
-//      usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
-//          hid_dev, buffer, buffer_size);
+        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_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, hid_dev->report_id);
+        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_field_t *field = usb_hid_report_get_sibling(