Changeset cd83f25 in mainline for uspace/drv/usbhid/usbhid.h

Timestamp:

2011-05-27T09:58:08Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e89bb50

Parents:

63d4d4fd (diff), 848dafc (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 from usb/development

File:

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

uspace/drv/usbhid/usbhid.h

@@ -98 +98 @@
         
         size_t input_report_size;
+        size_t max_input_report_size;
+        
+        int report_nr;
 } usb_hid_dev_t;
 
@@ -127 +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);