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

File:

• uspace/drv/usbhid/mouse/mousedev.c (modified) (15 diffs)

uspace/drv/usbhid/mouse/mousedev.c

@@ -41 +41 @@
 #include <usb/hid/usages/core.h>
 #include <errno.h>
-#include <async.h>
-#include <async_obsolete.h>
 #include <str_error.h>
 #include <ipc/mouse.h>
 #include <io/console.h>
 
-#include <ipc/kbdev.h>
+#include <ipc/kbd.h>
 #include <io/keycode.h>
 
 #include "mousedev.h"
 #include "../usbhid.h"
-
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
 
 #define NAME "mouse"
@@ -186 +181 @@
         // hangup phone to the console
         if ((*mouse_dev)->mouse_phone >= 0) {
-                async_obsolete_hangup((*mouse_dev)->mouse_phone);
+                async_hangup((*mouse_dev)->mouse_phone);
         }
         
         if ((*mouse_dev)->wheel_phone >= 0) {
-                async_obsolete_hangup((*mouse_dev)->wheel_phone);
+                async_hangup((*mouse_dev)->wheel_phone);
         }
         
@@ -201 +196 @@
 static void usb_mouse_send_wheel(const usb_mouse_t *mouse_dev, int wheel)
 {
-        kbd_event_t ev;
+        console_event_t ev;
         
         ev.type = KEY_PRESS;
@@ -219 +214 @@
         for (i = 0; i < count * 3; ++i) {
                 usb_log_debug2("Sending key %d to the console\n", ev.key);
-                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT, ev.type, 
+                async_msg_4(mouse_dev->wheel_phone, KBD_EVENT, ev.type, 
                     ev.key, ev.mods, ev.c);
                 // send key release right away
-                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT, KEY_RELEASE, 
+                async_msg_4(mouse_dev->wheel_phone, KBD_EVENT, KEY_RELEASE, 
                     ev.key, ev.mods, ev.c);
         }
@@ -230 +225 @@
 
 static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, 
-                                     usb_mouse_t *mouse_dev, uint8_t *buffer,
-                                     size_t buffer_size)
+                                     usb_mouse_t *mouse_dev/*, uint8_t *buffer,
+                                     size_t buffer_size*/)
 {
         assert(mouse_dev != NULL);
         
-        usb_log_debug2("got buffer: %s.\n",
-            usb_debug_str_buffer(buffer, buffer_size, 0));
+//      usb_log_debug2("got buffer: %s.\n",
+//          usb_debug_str_buffer(buffer, buffer_size, 0));
         
         if (mouse_dev->mouse_phone < 0) {
@@ -247 +242 @@
          */
         
-        usb_log_debug(NAME " Calling usb_hid_parse_report() with "
-            "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 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_log_debug(NAME " Calling usb_hid_parse_report() with "
+//          "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 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;
+//      }
         
         /*
@@ -270 +265 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
 
-        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(
@@ -293 +288 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
 
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
 
         field = usb_hid_report_get_sibling(
@@ -308 +303 @@
         
         if ((shift_x != 0) || (shift_y != 0)) {
-                async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                async_req_2_0(mouse_dev->mouse_phone,
                     MEVENT_MOVE, shift_x, shift_y);
         }
@@ -321 +316 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
         
         field = usb_hid_report_get_sibling(
@@ -345 +340 @@
         path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
         
         field = usb_hid_report_get_sibling(
@@ -358 +353 @@
                 if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0
                     && field->value != 0) {
-                        async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                        async_req_2_0(mouse_dev->mouse_phone,
                             MEVENT_BUTTON, field->usage, 1);
                         mouse_dev->buttons[field->usage - field->usage_minimum]
@@ -365 +360 @@
                     mouse_dev->buttons[field->usage - field->usage_minimum] != 0
                     && field->value == 0) {
-                       async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                       async_req_2_0(mouse_dev->mouse_phone,
                            MEVENT_BUTTON, field->usage, 0);
                        mouse_dev->buttons[field->usage - field->usage_minimum]
@@ -510 +505 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data, 
-     uint8_t *buffer, size_t buffer_size)
+bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data/*, 
+     uint8_t *buffer, size_t buffer_size*/)
 {
         usb_log_debug("usb_mouse_polling_callback()\n");
-        usb_debug_str_buffer(buffer, buffer_size, 0);
+//      usb_debug_str_buffer(buffer, buffer_size, 0);
         
         if (hid_dev == NULL || data == NULL) {
@@ -524 +519 @@
         usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
                 
-        return usb_mouse_process_report(hid_dev, mouse_dev, buffer, 
-                                        buffer_size);
+        return usb_mouse_process_report(hid_dev, mouse_dev/*, buffer, 
+                                        buffer_size*/);
 }