Changeset 60c0573 in mainline for uspace/drv/usbhid/mouse/mousedev.c

Timestamp:

2011-04-10T15:17:22Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

ba358ed

Parents:

dc4c19e

Message:

Preparation for HID subdrivers.

• Preparation for registering subdriver callbacks based on some device identifiers.
• HID driver now uses one general callback which calls all the registered subdriver callbacks.
• Other callbacks for init, deinit and polling ended.
• Setting boot keyboard and mouse callbacks separately (special cases).

TODO maybe also functions and function classes may be per-subdriver

(so a hybrid keyboard/pointing device may register itself as

both keyboard and mouse).

TODO the current keyboard and mouse subdrivers should fall back to the

booot protocol by default.

File:

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

uspace/drv/usbhid/mouse/mousedev.c

@@ -231 +231 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_mouse_init(struct usb_hid_dev_t *hid_dev)
+int usb_mouse_init(usb_hid_dev_t *hid_dev)
 {
         usb_log_debug("Initializing HID/Mouse structure...\n");
@@ -252 +252 @@
         
         // set handler for incoming calls
-        // TODO: now does this behave when we have more such handlers in
-        //       one actual driver??
         hid_dev->ops.default_handler = default_connection_handler;
         
         // TODO: how to know if the device supports the request???
-//      usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
-//          hid_dev->usb_dev->interface_no, IDLE_RATE);
+        usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
+            hid_dev->usb_dev->interface_no, IDLE_RATE);
         
         return EOK;
@@ -265 +263 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_mouse_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
+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 (arg == NULL) {
+        if (hid_dev == NULL) {
                 usb_log_error("Missing argument to the mouse polling callback."
                     "\n");
@@ -277 +275 @@
         }
         
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
         if (hid_dev->data == NULL) {
                 usb_log_error("Wrong argument to the mouse polling callback."
@@ -290 +287 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_mouse_deinit(struct usb_hid_dev_t *hid_dev)
+void usb_mouse_deinit(usb_hid_dev_t *hid_dev)
 {
         usb_mouse_free((usb_mouse_t **)&hid_dev->data);
@@ -297 +294 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_mouse_set_boot_protocol(struct usb_hid_dev_t *hid_dev)
+int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {
         int rc = usb_hid_parse_report_descriptor(hid_dev->parser,