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

[pub/USBasp.git] / Demos / Device / ClassDriver / KeyboardMouseMultiReport / Descriptors.c

diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c
index 6fa6dc5..19f282f 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c
@@ -61,7 +61,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM HIDReport[] =
                HID_RI_LOGICAL_MAXIMUM(8, 0x01),\r
                HID_RI_REPORT_COUNT(8, 0x03),\r
                HID_RI_REPORT_SIZE(8, 0x01),\r
                HID_RI_LOGICAL_MAXIMUM(8, 0x01),\r
                HID_RI_REPORT_COUNT(8, 0x03),\r
                HID_RI_REPORT_SIZE(8, 0x01),\r

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

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


@@ -74,7 +74,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM HIDReport[] =
                HID_RI_PHYSICAL_MAXIMUM(8, 1),\r
                HID_RI_REPORT_COUNT(8, 0x02),\r
                HID_RI_REPORT_SIZE(8, 0x08),\r
                HID_RI_PHYSICAL_MAXIMUM(8, 1),\r
                HID_RI_REPORT_COUNT(8, 0x02),\r
                HID_RI_REPORT_SIZE(8, 0x08),\r

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

            HID_RI_END_COLLECTION(0),\r
        HID_RI_END_COLLECTION(0),\r
        \r
            HID_RI_END_COLLECTION(0),\r
        HID_RI_END_COLLECTION(0),\r
        \r


@@ -90,7 +90,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM HIDReport[] =
            HID_RI_LOGICAL_MAXIMUM(8, 0x01),\r
            HID_RI_REPORT_SIZE(8, 0x01),\r
            HID_RI_REPORT_COUNT(8, 0x08),\r
            HID_RI_LOGICAL_MAXIMUM(8, 0x01),\r
            HID_RI_REPORT_SIZE(8, 0x01),\r
            HID_RI_REPORT_COUNT(8, 0x08),\r

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

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


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

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

        HID_RI_END_COLLECTION(0),\r
 };\r
 \r
        HID_RI_END_COLLECTION(0),\r
 };\r
 \r