Changeset 65b458c4 in mainline for uspace/drv/usbhid/kbd/kbddev.h

Timestamp:

2011-05-13T12:44:37Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

37f87fa

Parents:

97cb542

Message:

Subdriver-specific data moved to the subdriver structure.

+ DDF ops removed from hid_dev_t.

Should fix #225

File:

• uspace/drv/usbhid/kbd/kbddev.h (modified) (3 diffs)

uspace/drv/usbhid/kbd/kbddev.h

@@ -83 +83 @@
         int console_phone;
         
+        /** @todo What is this actually? */
+        ddf_dev_ops_t ops;
+        
         /** Information for auto-repeat of keys. */
         usb_kbd_repeat_t repeat;
@@ -117 +120 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_kbd_init(struct usb_hid_dev *hid_dev);
+int usb_kbd_init(struct usb_hid_dev *hid_dev, void **data);
 
-bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, uint8_t *buffer,
-    size_t buffer_size);
+bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data, 
+                              uint8_t *buffer, size_t buffer_size);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -131 +134 @@
     int type, unsigned int key);
 
-void usb_kbd_deinit(struct usb_hid_dev *hid_dev);
+void usb_kbd_deinit(struct usb_hid_dev *hid_dev, void *data);
 
 int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);