Changeset 92574f4 in mainline for uspace/drv/usbhid/hid.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/drv/usbhid/hid.h

@@ -40 +40 @@
 
 #include <usb/classes/hid.h>
-#include <driver.h>
+#include <ddf/driver.h>
 #include <usb/pipes.h>
 
@@ -69 +69 @@
  */
 typedef struct {
-        device_t *device;
+        ddf_dev_t *device;
         usb_hid_configuration_t *conf;
-        usb_address_t address;
         usb_hid_report_parser_t *parser;
 
         usb_device_connection_t wire;
+        usb_endpoint_pipe_t ctrl_pipe;
         usb_endpoint_pipe_t poll_pipe;