Changes in uspace/drv/usbhid/mouse/mousedev.c [37f87fa:faa44e58] in mainline

File:

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

uspace/drv/usbhid/mouse/mousedev.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
-#include <usb/classes/hidreq.h>
-#include <usb/classes/hidut.h>
+#include <usb/hid/hid.h>
+#include <usb/hid/request.h>
+#include <usb/hid/usages/core.h>
 #include <errno.h>
 #include <str_error.h>
@@ -122 +122 @@
         sysarg_t method = IPC_GET_IMETHOD(*icall);
         
-        usb_mouse_t *mouse_dev = (usb_mouse_t *)fun->driver_data;
-        
-        if (mouse_dev == NULL) {
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        if (hid_dev == NULL || hid_dev->data == NULL) {
                 usb_log_debug("default_connection_handler: Missing "
                     "parameters.\n");
@@ -131 +131 @@
         }
         
-        usb_log_debug("default_connection_handler: fun->name: %s\n",
-                      fun->name);
-        usb_log_debug("default_connection_handler: mouse_phone: %d, wheel "
-            "phone: %d\n", mouse_dev->mouse_phone, mouse_dev->wheel_phone);
+        assert(hid_dev != NULL);
+        assert(hid_dev->data != NULL);
+        usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data;
         
         int *phone = (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) 
@@ -146 +145 @@
                             "phone to mouse already set.\n");
                         async_answer_0(icallid, ELIMIT);
+                        //async_answer_0(icallid, EOK);
                         return;
                 }
 
                 *phone = callback;
-                usb_log_debug("Console phone to mouse set ok (%d).\n", *phone);
+                usb_log_debug("Console phone to mouse set ok (%d).\n", callback);
                 async_answer_0(icallid, EOK);
                 return;
@@ -224 +224 @@
 /*----------------------------------------------------------------------------*/
 
-static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, 
-                                     usb_mouse_t *mouse_dev, uint8_t *buffer,
-                                     size_t buffer_size)
-{
-        assert(mouse_dev != NULL);
+static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, uint8_t *buffer,
+    size_t buffer_size)
+{
+        usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data;
         
         usb_log_debug2("got buffer: %s.\n",
@@ -379 +378 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_mouse_create_function(usb_hid_dev_t *hid_dev, usb_mouse_t *mouse)
-{
-        assert(hid_dev != NULL);
-        assert(mouse != NULL);
-        
+static int usb_mouse_create_function(usb_hid_dev_t *hid_dev)
+{
         /* Create the function exposed under /dev/devices. */
         usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
@@ -393 +389 @@
         }
         
-        fun->ops = &mouse->ops;
-        fun->driver_data = mouse;   // TODO: maybe change to hid_dev->data
+        /*
+         * Store the initialized HID device and HID ops
+         * to the DDF function.
+         */
+        fun->ops = &hid_dev->ops;
+        fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
 
         int rc = ddf_fun_bind(fun);
@@ -431 +431 @@
          * to the DDF function.
          */
-        fun->ops = &mouse->ops;
-        fun->driver_data = mouse;   // TODO: maybe change to hid_dev->data
+        fun->ops = &hid_dev->ops;
+        fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
 
         rc = ddf_fun_bind(fun);
@@ -458 +458 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
+int usb_mouse_init(usb_hid_dev_t *hid_dev)
 {
         usb_log_debug("Initializing HID/Mouse structure...\n");
@@ -485 +485 @@
         
         // save the Mouse device structure into the HID device structure
-        *data = mouse_dev;
+        hid_dev->data = mouse_dev;
         
         // set handler for incoming calls
-        // TODO: must be one for each subdriver!!
-        mouse_dev->ops.default_handler = default_connection_handler;
+        hid_dev->ops.default_handler = default_connection_handler;
         
         // TODO: how to know if the device supports the request???
@@ -495 +494 @@
 //          hid_dev->usb_dev->interface_no, IDLE_RATE);
         
-        int rc = usb_mouse_create_function(hid_dev, mouse_dev);
+        int rc = usb_mouse_create_function(hid_dev);
         if (rc != EOK) {
                 usb_mouse_free(&mouse_dev);
@@ -506 +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, uint8_t *buffer,
+     size_t buffer_size)
 {
         usb_log_debug("usb_mouse_polling_callback()\n");
         usb_debug_str_buffer(buffer, buffer_size, 0);
         
-        if (hid_dev == NULL || data == NULL) {
+        if (hid_dev == NULL) {
                 usb_log_error("Missing argument to the mouse polling callback."
                     "\n");
@@ -518 +517 @@
         }
         
-        usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
-                
-        return usb_mouse_process_report(hid_dev, mouse_dev, buffer, 
-                                        buffer_size);
-}
-
-/*----------------------------------------------------------------------------*/
-
-void usb_mouse_deinit(usb_hid_dev_t *hid_dev, void *data)
-{
-        if (data != NULL) {
-                usb_mouse_free((usb_mouse_t **)&data);
-        }
+        if (hid_dev->data == NULL) {
+                usb_log_error("Wrong argument to the mouse polling callback."
+                    "\n");
+                return false;
+        }
+        
+        return usb_mouse_process_report(hid_dev, buffer, buffer_size);
+}
+
+/*----------------------------------------------------------------------------*/
+
+void usb_mouse_deinit(usb_hid_dev_t *hid_dev)
+{
+        usb_mouse_free((usb_mouse_t **)&hid_dev->data);
 }