Changeset 60c0573 in mainline for uspace/drv/usbhid/generic

Timestamp:

2011-04-10T15:17:22Z (15 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.

Location:

uspace/drv/usbhid/generic

Files:

• hiddev.c (modified) (2 diffs)
• hiddev.h (modified) (2 diffs)

uspace/drv/usbhid/generic/hiddev.c

@@ -39 +39 @@
 
 #include "hiddev.h"
+#include "usbhid.h"
 
 /*----------------------------------------------------------------------------*/
@@ -54 +55 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
+bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, 
+    uint8_t *buffer, size_t buffer_size)
 {
-        usb_log_debug("usb_hid_polling_callback(%p, %p, %zu, %p)\n",
-            dev, buffer, buffer_size, arg);
+        usb_log_debug("usb_hid_polling_callback(%p, %p, %zu)\n",
+            hid_dev, buffer, buffer_size);
         usb_debug_str_buffer(buffer, buffer_size, 0);
         return true;

uspace/drv/usbhid/generic/hiddev.h

@@ -39 +39 @@
 #include <usb/devdrv.h>
 
+struct usb_hid_dev;
+
 usb_endpoint_description_t usb_hid_generic_poll_endpoint_description;
 
@@ -44 +46 @@
 const char *HID_GENERIC_CLASS_NAME;
 
-bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg);
+bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev,
+    uint8_t *buffer, size_t buffer_size);
 
 #endif // USB_HIDDDEV_H_