Changeset 3b5d1535 in mainline for uspace/drv/usbhid/hid.h

Timestamp:

2011-02-23T10:28:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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 mainline changes

File:

• uspace/drv/usbhid/hid.h (modified) (2 diffs)

uspace/drv/usbhid/hid.h

@@ -38 +38 @@
 
 #include <usb/classes/hid.h>
-#include <driver.h>
+#include <ddf/driver.h>
 #include <usb/pipes.h>
 
@@ -67 +67 @@
  */
 typedef struct {
-        device_t *device;
+        ddf_dev_t *device;
         usb_hid_configuration_t *conf;
         usb_hid_report_parser_t *parser;