diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-01-16 19:34:28 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-01-16 19:34:28 +0000 |
| commit | 323fc23eeb26580a43cd314ab004faadfdd1f90a (patch) | |
| tree | 78fdc14943524b87d6f779b4b00f9bbee7207e18 /Demos/Device/ClassDriver/GenericHID/Descriptors.c | |
| parent | 7bbfac48d27aa89d356ef9aee31f2e54de397840 (diff) | |
New HID report item macros (with HID_RI_ prefix) to allow for easy creation and editing of HID report descriptors.
Changed over all project and demo HID report descriptors to use the new HID report item macros.
Moved the HIDParser.c source file to the LUFA/Drivers/USB/Class/Common/ directory from the LUFA/Drivers/USB/Class/Host/.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1635 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Device/ClassDriver/GenericHID/Descriptors.c')
| -rw-r--r-- | Demos/Device/ClassDriver/GenericHID/Descriptors.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c index dd459327..0716ae9c 100644 --- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c +++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c @@ -45,22 +45,23 @@ */ USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] = { - 0x06, 0x9c, 0xff, /* Usage Page (Vendor Defined) */ - 0x09, 0x01, /* Usage (Vendor Defined) */ - 0xa1, 0x01, /* Collection (Vendor Defined) */ - 0x09, 0x02, /* Usage (Vendor Defined) */ - 0x75, 0x08, /* Report Size (8) */ - 0x95, GENERIC_REPORT_SIZE, /* Report Count (GENERIC_REPORT_SIZE) */ - 0x15, 0x80, /* Logical Minimum (-128) */ - 0x25, 0x7F, /* Logical Maximum (127) */ - 0x81, 0x02, /* Input (Data, Variable, Absolute) */ - 0x09, 0x03, /* Usage (Vendor Defined) */ - 0x75, 0x08, /* Report Size (8) */ - 0x95, GENERIC_REPORT_SIZE, /* Report Count (GENERIC_REPORT_SIZE) */ - 0x15, 0x00, /* Logical Minimum (0) */ - 0x25, 0xff, /* Logical Maximum (255) */ - 0x91, 0x02, /* Output (Data, Variable, Absolute) */ - 0xc0 /* End Collection */ + 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), }; /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall |