Changeset 30f9f8f in mainline for uspace/drv/usbhid/usbhid.h

Timestamp:

2011-05-06T09:29:03Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9a884ed

Parents:

c709eb0 (diff), 310c4df (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 development/ changes

File:

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

uspace/drv/usbhid/usbhid.h

@@ -91 +91 @@
         
         /** HID Report parser. */
-        usb_hid_report_parser_t *parser;
+        usb_hid_report_t *report;
+        
+        uint8_t *input_report;
+        
+        size_t input_report_size;
         
         /** Arbitrary data (e.g. a special structure for handling keyboard). */
@@ -120 +124 @@
      void *arg);
 
-const char *usb_hid_get_function_name(const usb_hid_dev_t *hid_dev);
+//const char *usb_hid_get_function_name(const usb_hid_dev_t *hid_dev);
 
-const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev);
+//const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev);
 
 void usb_hid_free(usb_hid_dev_t **hid_dev);