Index: uspace/lib/usbhid/include/usb/hid/hid_report_items.h =================================================================== --- uspace/lib/usbhid/include/usb/hid/hid_report_items.h (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/include/usb/hid/hid_report_items.h (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -38,5 +38,5 @@ #include -/*---------------------------------------------------------------------------*/ + /* * Item prefix @@ -56,5 +56,5 @@ #define USB_HID_ITEM_IS_LONG(data) (data == 0xFE) -/*---------------------------------------------------------------------------*/ + /* * Extended usage macros @@ -70,5 +70,5 @@ #define USB_HID_EXTENDED_USAGE(usage) (usage & 0xFFFF) -/*---------------------------------------------------------------------------*/ + /* * Input/Output/Feature Item flags @@ -142,5 +142,5 @@ #define USB_HID_ITEM_FLAG_BUFFERED(flags) ((flags & 0x100) == 0x100) -/*---------------------------------------------------------------------------*/ + /* MAIN ITEMS */ @@ -185,5 +185,5 @@ #define USB_HID_REPORT_TAG_END_COLLECTION 0xC -/*---------------------------------------------------------------------------*/ + /* GLOBAL ITEMS */ @@ -272,5 +272,5 @@ #define USB_HID_REPORT_TAG_POP 0xB -/*---------------------------------------------------------------------------*/ + /* LOCAL ITEMS */ @@ -347,5 +347,5 @@ #define USB_HID_REPORT_TAG_DELIMITER 0xA -/*---------------------------------------------------------------------------*/ + #endif Index: uspace/lib/usbhid/include/usb/hid/hidpath.h =================================================================== --- uspace/lib/usbhid/include/usb/hid/hidpath.h (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/include/usb/hid/hidpath.h (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -41,5 +41,5 @@ -/*---------------------------------------------------------------------------*/ + /* * Flags of usage paths comparison modes. @@ -73,5 +73,5 @@ #define USB_HID_PATH_COMPARE_ANYWHERE 8 -/*----------------------------------------------------------------------------*/ + /** * Item of usage path structure. Last item of linked list describes one item @@ -93,5 +93,5 @@ -/*---------------------------------------------------------------------------*/ + /** * USB HID usage path structure. @@ -112,5 +112,5 @@ } usb_hid_report_path_t; -/*---------------------------------------------------------------------------*/ + usb_hid_report_path_t *usb_hid_report_path(void); Index: uspace/lib/usbhid/include/usb/hid/hidtypes.h =================================================================== --- uspace/lib/usbhid/include/usb/hid/hidtypes.h (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/include/usb/hid/hidtypes.h (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -39,5 +39,5 @@ #include -/*---------------------------------------------------------------------------*/ + /** @@ -69,5 +69,5 @@ (((x) < 0 ) ? ((1 << (size)) + (x)) : (x)) -/*---------------------------------------------------------------------------*/ + /** @@ -86,5 +86,5 @@ } usb_hid_report_type_t; -/*---------------------------------------------------------------------------*/ + /** @@ -111,5 +111,5 @@ } usb_hid_report_t; -/*---------------------------------------------------------------------------*/ + /** @@ -135,5 +135,5 @@ link_t reports_link; } usb_hid_report_description_t; -/*---------------------------------------------------------------------------*/ + /** @@ -202,5 +202,5 @@ } usb_hid_report_field_t; -/*---------------------------------------------------------------------------*/ + /** @@ -287,5 +287,5 @@ int in_delimiter; } usb_hid_report_item_t; -/*---------------------------------------------------------------------------*/ + /** * Enum of the keyboard modifiers @@ -314,5 +314,5 @@ USB_HID_MOD_RGUI }; -/*---------------------------------------------------------------------------*/ + Index: uspace/lib/usbhid/include/usb/hid/request.h =================================================================== --- uspace/lib/usbhid/include/usb/hid/request.h (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/include/usb/hid/request.h (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -42,5 +42,5 @@ #include -/*----------------------------------------------------------------------------*/ + int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no, @@ -61,5 +61,5 @@ int usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration); -/*----------------------------------------------------------------------------*/ + #endif /* USB_KBD_HIDREQ_H_ */ Index: uspace/lib/usbhid/src/hiddescriptor.c =================================================================== --- uspace/lib/usbhid/src/hiddescriptor.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/src/hiddescriptor.c (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -41,5 +41,5 @@ #include -/*---------------------------------------------------------------------------*/ + /* * Constants defining current parsing mode for correct parsing of the set of @@ -61,5 +61,5 @@ #define INSIDE_DELIMITER_SET 2 -/*---------------------------------------------------------------------------*/ + /** The new report item flag. Used to determine when the item is completly @@ -78,5 +78,5 @@ #define USB_HID_UNKNOWN_TAG -99 -/*---------------------------------------------------------------------------*/ + /** * Checks if given collection path is already present in report structure and @@ -124,5 +124,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Initialize the report descriptor parser structure @@ -147,5 +147,5 @@ } -/*---------------------------------------------------------------------------*/ + /** @@ -314,5 +314,5 @@ return EOK; } -/*---------------------------------------------------------------------------*/ + /** * Finds description of report with given report_id and of given type in @@ -348,5 +348,5 @@ return NULL; } -/*---------------------------------------------------------------------------*/ + /** Parse HID report descriptor. @@ -536,5 +536,5 @@ } -/*---------------------------------------------------------------------------*/ + /** @@ -871,5 +871,5 @@ return EOK; } -/*---------------------------------------------------------------------------*/ + /** @@ -892,5 +892,5 @@ return result; } -/*---------------------------------------------------------------------------*/ + /** @@ -941,5 +941,5 @@ } -/*---------------------------------------------------------------------------*/ + /** @@ -972,5 +972,5 @@ } } -/*---------------------------------------------------------------------------*/ + @@ -1022,5 +1022,5 @@ return; } -/*---------------------------------------------------------------------------*/ + /** Index: uspace/lib/usbhid/src/hidparser.c =================================================================== --- uspace/lib/usbhid/src/hidparser.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/src/hidparser.c (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -41,5 +41,5 @@ #include -/*---------------------------------------------------------------------------*/ + /* * Data translation private functions @@ -52,5 +52,5 @@ int32_t value); -/*---------------------------------------------------------------------------*/ + static int usb_pow(int a, int b) @@ -68,5 +68,5 @@ } } -/*---------------------------------------------------------------------------*/ + /** Returns size of report of specified report id and type in items @@ -117,5 +117,5 @@ } } -/*---------------------------------------------------------------------------*/ + /** Parse and act upon a HID report. @@ -192,5 +192,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Translate data from the report as specified in report descriptor item @@ -274,5 +274,5 @@ } -/*---------------------------------------------------------------------------*/ + /* OUTPUT API */ @@ -431,5 +431,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Translate given data for putting them into the outoput report @@ -476,5 +476,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Clones given state table @@ -497,5 +497,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Function for sequence walking through the report. Returns next field in the @@ -552,5 +552,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Returns next report_id of report of specified type. If zero is given than @@ -600,5 +600,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Reset all local items in given state table Index: uspace/lib/usbhid/src/hidpath.c =================================================================== --- uspace/lib/usbhid/src/hidpath.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/src/hidpath.c (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -41,5 +41,5 @@ #include -/*---------------------------------------------------------------------------*/ + /** * Compares two usages if they are same or not or one of the usages is not @@ -63,5 +63,5 @@ ((page1 == page2) || (page1 == 0) || (page2 == 0)) -/*---------------------------------------------------------------------------*/ + /** * Appends one item (couple of usage_path and usage) into the usage path @@ -93,5 +93,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Removes last item from the usage path structure @@ -114,5 +114,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Nulls last item of the usage path structure. @@ -133,5 +133,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Modifies last item of usage path structure by given usage page or usage @@ -164,5 +164,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * @@ -188,5 +188,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Compares two usage paths structures @@ -354,5 +354,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Allocates and initializes new usage path structure. @@ -376,5 +376,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Releases given usage path structure. @@ -395,5 +395,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Clone content of given usage path to the new one @@ -441,5 +441,5 @@ } -/*---------------------------------------------------------------------------*/ + /** * Sets report id in usage path structure Index: uspace/lib/usbhid/src/hidreport.c =================================================================== --- uspace/lib/usbhid/src/hidreport.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/src/hidreport.c (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -50,5 +50,5 @@ #include -static int usb_hid_get_report_descriptor(usb_device_t *dev, +static int usb_hid_get_report_descriptor(usb_device_t *dev, uint8_t **report_desc, size_t *size) { @@ -69,6 +69,6 @@ * First nested descriptor of the configuration descriptor. */ - const uint8_t *d = - usb_dp_get_nested_descriptor(&parser, &parser_data, + const uint8_t *d = + usb_dp_get_nested_descriptor(&parser, &parser_data, dev->descriptors.configuration); @@ -78,5 +78,5 @@ int i = 0; while (d != NULL && i < dev->interface_no) { - d = usb_dp_get_sibling_descriptor(&parser, &parser_data, + d = usb_dp_get_sibling_descriptor(&parser, &parser_data, dev->descriptors.configuration, d); ++i; @@ -99,5 +99,5 @@ */ while (d != NULL && *(d + 1) != USB_DESCTYPE_HID) { - d = usb_dp_get_sibling_descriptor(&parser, &parser_data, + d = usb_dp_get_sibling_descriptor(&parser, &parser_data, iface_desc, d); } @@ -114,8 +114,8 @@ } - usb_standard_hid_descriptor_t *hid_desc = + usb_standard_hid_descriptor_t *hid_desc = (usb_standard_hid_descriptor_t *)d; - uint16_t length = hid_desc->report_desc_info.length; + uint16_t length = uint16_usb2host(hid_desc->report_desc_info.length); size_t actual_size = 0; @@ -161,5 +161,5 @@ } -/*----------------------------------------------------------------------------*/ + int usb_hid_process_report_descriptor(usb_device_t *dev, Index: uspace/lib/usbhid/src/hidreq.c =================================================================== --- uspace/lib/usbhid/src/hidreq.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/usbhid/src/hidreq.c (revision 9e279c48ddb0337aa8595dc7af9ed1c463708b0b) @@ -45,5 +45,5 @@ #include -/*----------------------------------------------------------------------------*/ + /** * Send Set Report request to the HID device. @@ -97,5 +97,5 @@ } -/*----------------------------------------------------------------------------*/ + /** * Send Set Protocol request to the HID device. @@ -145,5 +145,5 @@ } -/*----------------------------------------------------------------------------*/ + /** * Send Set Idle request to the HID device. @@ -195,5 +195,5 @@ } -/*----------------------------------------------------------------------------*/ + /** * Send Get Report request to the HID device. @@ -251,5 +251,5 @@ } -/*----------------------------------------------------------------------------*/ + /** * Send Get Protocol request to the HID device. @@ -310,5 +310,5 @@ } -/*----------------------------------------------------------------------------*/ + /** * Send Get Idle request to the HID device. @@ -373,5 +373,5 @@ } -/*----------------------------------------------------------------------------*/ + /**