Changes in uspace/drv/usbhid/kbd/kbddev.h [faa44e58:65b458c4] in mainline

File:

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

uspace/drv/usbhid/kbd/kbddev.h

@@ -41 +41 @@
 #include <fibril_synch.h>
 
-#include <usb/hid/hid.h>
-#include <usb/hid/hidparser.h>
+#include <usb/classes/hid.h>
+#include <usb/classes/hidparser.h>
 #include <ddf/driver.h>
-#include <usb/dev/pipes.h>
-#include <usb/dev/driver.h>
+#include <usb/pipes.h>
+#include <usb/devdrv.h>
 
 #include "kbdrepeat.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);