Changeset 4fe3b6d in mainline for uspace/lib/usbhid/include/usb/hid/hidparser.h

Timestamp:

2011-05-20T11:07:00Z (13 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/lib/usbhid/include/usb/hid/hidparser.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidparser.h ) (4 diffs)

uspace/lib/usbhid/include/usb/hid/hidparser.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb
+/** @addtogroup libusbhid
  * @{
  */
@@ -33 +33 @@
  * USB HID report descriptor and report data parser
  */
-#ifndef LIBUSB_HIDPARSER_H_
-#define LIBUSB_HIDPARSER_H_
+#ifndef LIBUSBHID_HIDPARSER_H_
+#define LIBUSBHID_HIDPARSER_H_
 
 #include <stdint.h>
 #include <adt/list.h>
-#include <usb/classes/hid_report_items.h>
-#include <usb/classes/hidpath.h>
-#include <usb/classes/hidtypes.h>
-#include <usb/classes/hiddescriptor.h>
+#include <usb/hid/hid_report_items.h>
+#include <usb/hid/hidpath.h>
+#include <usb/hid/hidtypes.h>
+#include <usb/hid/hiddescriptor.h>
 
 
@@ -50 +50 @@
 int usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data, 
                          size_t size, uint8_t *report_id);
-
-/** */
-size_t usb_hid_report_input_length(const usb_hid_report_t *report,
-        usb_hid_report_path_t *path, int flags);
 
 /*
@@ -65 +61 @@
 void usb_hid_report_output_free(uint8_t *output);
 
-/** Returns size of output for given usage path */
-size_t usb_hid_report_output_size(usb_hid_report_t *report,
-                                  usb_hid_report_path_t *path, int flags);
+/** Returns size of report in items */
+size_t usb_hid_report_size(usb_hid_report_t *report, uint8_t report_id, 
+                           usb_hid_report_type_t type);
 
 /** Makes the output report buffer by translated given data */