Add new HID_DESCRIPTOR_VENDOR() macro, change over all projects and Device ClassDrive...

[pub/USBasp.git] / Demos / Device / LowLevel / KeyboardMouse / Descriptors.c

diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
index 55cf30d..5de7afb 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
@@ -60,7 +60,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =
                HID_RI_LOGICAL_MAXIMUM(8, 0x01),
                HID_RI_REPORT_COUNT(8, 0x03),
                HID_RI_REPORT_SIZE(8, 0x01),
                HID_RI_LOGICAL_MAXIMUM(8, 0x01),
                HID_RI_REPORT_COUNT(8, 0x03),
                HID_RI_REPORT_SIZE(8, 0x01),

-               HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
+               HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),

                HID_RI_REPORT_COUNT(8, 0x01),
                HID_RI_REPORT_SIZE(8, 0x05),
                HID_RI_INPUT(8, HID_IOF_CONSTANT),
                HID_RI_REPORT_COUNT(8, 0x01),
                HID_RI_REPORT_SIZE(8, 0x05),
                HID_RI_INPUT(8, HID_IOF_CONSTANT),


@@ -73,7 +73,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =
                HID_RI_PHYSICAL_MAXIMUM(8, 1),
                HID_RI_REPORT_COUNT(8, 0x02),
                HID_RI_REPORT_SIZE(8, 0x08),
                HID_RI_PHYSICAL_MAXIMUM(8, 1),
                HID_RI_REPORT_COUNT(8, 0x02),
                HID_RI_REPORT_SIZE(8, 0x08),

-               HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE | HID_IOF_NON_VOLATILE),
+               HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),

            HID_RI_END_COLLECTION(0),
        HID_RI_END_COLLECTION(0),
 };
            HID_RI_END_COLLECTION(0),
        HID_RI_END_COLLECTION(0),
 };


@@ -91,7 +91,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
            HID_RI_LOGICAL_MAXIMUM(8, 0x01),
            HID_RI_REPORT_SIZE(8, 0x01),
            HID_RI_REPORT_COUNT(8, 0x08),
            HID_RI_LOGICAL_MAXIMUM(8, 0x01),
            HID_RI_REPORT_SIZE(8, 0x01),
            HID_RI_REPORT_COUNT(8, 0x08),

-           HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+           HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),

            HID_RI_REPORT_COUNT(8, 0x01),
            HID_RI_REPORT_SIZE(8, 0x08),
            HID_RI_INPUT(8, HID_IOF_CONSTANT),
            HID_RI_REPORT_COUNT(8, 0x01),
            HID_RI_REPORT_SIZE(8, 0x08),
            HID_RI_INPUT(8, HID_IOF_CONSTANT),


@@ -111,7 +111,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
            HID_RI_USAGE_MAXIMUM(8, 0x65), /* Keyboard Application */
            HID_RI_REPORT_COUNT(8, 0x06),
            HID_RI_REPORT_SIZE(8, 0x08),
            HID_RI_USAGE_MAXIMUM(8, 0x65), /* Keyboard Application */
            HID_RI_REPORT_COUNT(8, 0x06),
            HID_RI_REPORT_SIZE(8, 0x08),

-           HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+           HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),

        HID_RI_END_COLLECTION(0),
 };
 
        HID_RI_END_COLLECTION(0),
 };