Changeset 4fe3b6d in mainline for uspace/drv/usbhid/usbhid.h

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with development

File:

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

uspace/drv/usbhid/usbhid.h

@@ -39 +39 @@
 #include <stdint.h>
 
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <ddf/driver.h>
-#include <usb/pipes.h>
-#include <usb/devdrv.h>
-#include <usb/classes/hid.h>
+#include <usb/dev/pipes.h>
+#include <usb/dev/driver.h>
+#include <usb/hid/hid.h>
 #include <bool.h>
 
 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;
-        
-        /** Arbitrary data (e.g. a special structure for handling keyboard). */
-        void *data;
 } usb_hid_dev_t;