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

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/kbd

Files:

• kbddev.c (modified) (2 diffs)
• kbddev.h (modified) (3 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -856 +856 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
-{
-        if (dev == NULL || buffer == NULL || arg == NULL) {
+bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, uint8_t *buffer,
+     size_t buffer_size)
+{
+        if (hid_dev == NULL || buffer == NULL) {
                 // do not continue polling (???)
                 return false;
         }
-        
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
         
         // TODO: add return value from this function
@@ -916 +914 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev)
+void usb_kbd_deinit(usb_hid_dev_t *hid_dev)
 {
         if (hid_dev == NULL) {

uspace/drv/usbhid/kbd/kbddev.h

@@ -49 +49 @@
 #include "kbdrepeat.h"
 
-struct usb_hid_dev_t;
+struct usb_hid_dev;
 
 /*----------------------------------------------------------------------------*/
@@ -115 +115 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_kbd_init(struct usb_hid_dev_t *hid_dev);
+int usb_kbd_init(struct usb_hid_dev *hid_dev);
 
-bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg);
+bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, uint8_t *buffer,
+    size_t buffer_size);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -126 +126 @@
 void usb_kbd_free(usb_kbd_t **kbd_dev);
 
-void usb_kbd_push_ev(struct usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev,
+void usb_kbd_push_ev(struct usb_hid_dev *hid_dev, usb_kbd_t *kbd_dev,
     int type, unsigned int key);
 
-void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev);
+void usb_kbd_deinit(struct usb_hid_dev *hid_dev);
 
-int usb_kbd_set_boot_protocol(struct usb_hid_dev_t *hid_dev);
+int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);
 
 #endif /* USB_KBDDEV_H_ */