X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/039a714ee46268c07928c79b30403f29d4040fe8..9051d3beb0c5c4ec1e33749d8f806f5492fbe742:/Demos/Device/ClassDriver/GenericHID/Descriptors.c

diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
index 0716ae9ca..761e904ea 100644
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@ -45,23 +45,14 @@
  */
 USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
 {
-	HID_RI_USAGE_PAGE(16),               0x00, 0xFF, /* Vendor Page 1 */
-	HID_RI_USAGE(8),                     0x01, /* Vendor Usage 1 */
-	HID_RI_COLLECTION(8),                0x01, /* Vendor Usage 1 */
-	    HID_RI_USAGE(8),                 0x02, /* Vendor Usage 2 */
-	    HID_RI_LOGICAL_MINIMUM(8),       0x00,
-	    HID_RI_LOGICAL_MAXIMUM(8),       0xFF,
-	    HID_RI_REPORT_SIZE(8),           8,
-	    HID_RI_REPORT_COUNT(8),          GENERIC_REPORT_SIZE,
-	    HID_RI_INPUT(8),                 (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
-
-	    HID_RI_USAGE(8),                 0x03, /* Vendor Usage 3 */
-	    HID_RI_LOGICAL_MINIMUM(8),       0x00,
-	    HID_RI_LOGICAL_MAXIMUM(8),       0xFF,
-	    HID_RI_REPORT_SIZE(8),           8,
-	    HID_RI_REPORT_COUNT(8),          GENERIC_REPORT_SIZE,
-	    HID_RI_OUTPUT(8),                (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
-	HID_RI_END_COLLECTION(0),
+	/* Use the HID class driver's standard Vendor HID report.
+	 *  Vendor Usage Page: 1
+	 *  Vendor Collection Usage: 1
+	 *  Vendor Report IN Usage: 2
+	 *  Vendor Report OUT Usage: 3
+	 *  Vendor Report Size: GENERIC_REPORT_SIZE
+	 */
+	HID_DESCRIPTOR_VENDOR(0x00, 0x01, 0x02, 0x03, GENERIC_REPORT_SIZE)
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall