Changes in uspace/drv/usbhid/usbhid.h [faa44e58:8fb45e08] in mainline

File:

• uspace/drv/usbhid/usbhid.h (modified) (5 diffs)

uspace/drv/usbhid/usbhid.h

@@ -48 +48 @@
 struct usb_hid_dev;
 
-typedef int (*usb_hid_driver_init_t)(struct usb_hid_dev *);
-typedef void (*usb_hid_driver_deinit_t)(struct usb_hid_dev *);
-typedef bool (*usb_hid_driver_poll)(struct usb_hid_dev *, uint8_t *, size_t);
-typedef int (*usb_hid_driver_poll_ended)(struct usb_hid_dev *, bool reason);
+typedef int (*usb_hid_driver_init_t)(struct usb_hid_dev *, void **data);
+typedef void (*usb_hid_driver_deinit_t)(struct usb_hid_dev *, void *data);
+typedef bool (*usb_hid_driver_poll)(struct usb_hid_dev *, void *data, uint8_t *,
+                                    size_t);
+typedef int (*usb_hid_driver_poll_ended)(struct usb_hid_dev *, void *data, 
+                                         bool reason);
 
 // TODO: add function and class name??
@@ -63 +65 @@
         /** Function to be called when polling ends. */
         usb_hid_driver_poll_ended poll_end;
+        /** Arbitrary data needed by the subdriver. */
+        void *data;
 } usb_hid_subdriver_t;
 
@@ -72 +76 @@
         /** Structure holding generic USB device information. */
         usb_device_t *usb_dev;
-        
-        /** @todo What is this actually? */
-        ddf_dev_ops_t ops;
         
         /** Index of the polling pipe in usb_hid_endpoints array. */
@@ -97 +98 @@
         
         size_t input_report_size;
+        size_t max_input_report_size;
         
-        /** Arbitrary data (e.g. a special structure for handling keyboard). */
-        void *data;
+        int report_nr;
 } usb_hid_dev_t;
 
@@ -129 +130 @@
 //const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev);
 
-void usb_hid_new_report(void);
+void usb_hid_new_report(usb_hid_dev_t *hid_dev);
 
-void usb_hid_report_received(void);
+int usb_hid_report_number(usb_hid_dev_t *hid_dev);
 
-bool usb_hid_report_ready(void);
+//void usb_hid_report_received(void);
+
+//bool usb_hid_report_ready(void);
 
 void usb_hid_free(usb_hid_dev_t **hid_dev);