Minor documentation corrections for the new HID report item constant defines.

[pub/USBasp.git] / Demos / DualRole / ClassDriver / MouseHostDevice / Descriptors.c

diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
index d5d7ca8..314953e 100644 (file)
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -45,32 +45,34 @@
  */
 USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =
 {
  */
 USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =
 {

-       0x05, 0x01,          /* Usage Page (Generic Desktop)             */
-       0x09, 0x02,          /* Usage (Mouse)                            */
-       0xA1, 0x01,          /* Collection (Application)                 */
-       0x09, 0x01,          /*   Usage (Pointer)                        */
-       0xA1, 0x00,          /*   Collection (Application)               */
-       0x95, 0x03,          /*     Report Count (3)                     */
-       0x75, 0x01,          /*     Report Size (1)                      */
-       0x05, 0x09,          /*     Usage Page (Button)                  */
-       0x19, 0x01,          /*     Usage Minimum (Button 1)             */
-       0x29, 0x03,          /*     Usage Maximum (Button 3)             */
-       0x15, 0x00,          /*     Logical Minimum (0)                  */
-       0x25, 0x01,          /*     Logical Maximum (1)                  */
-       0x81, 0x02,          /*     Input (Data, Variable, Absolute)     */
-       0x95, 0x01,          /*     Report Count (1)                     */
-       0x75, 0x05,          /*     Report Size (5)                      */
-       0x81, 0x01,          /*     Input (Constant)                     */
-       0x75, 0x08,          /*     Report Size (8)                      */
-       0x95, 0x02,          /*     Report Count (2)                     */
-       0x05, 0x01,          /*     Usage Page (Generic Desktop Control) */
-       0x09, 0x30,          /*     Usage X                              */
-       0x09, 0x31,          /*     Usage Y                              */
-       0x15, 0x81,          /*     Logical Minimum (-127)               */
-       0x25, 0x7F,          /*     Logical Maximum (127)                */
-       0x81, 0x06,          /*     Input (Data, Variable, Relative)     */
-       0xC0,                /*   End Collection                         */
-       0xC0                 /* End Collection                           */
+       HID_RI_USAGE_PAGE(8),                0x01, /* Generic Desktop */
+       HID_RI_USAGE(8),                     0x02, /* Mouse */
+       HID_RI_COLLECTION(8),                0x01, /* Application */
+           HID_RI_USAGE(8),                 0x01, /* Pointer */
+           HID_RI_COLLECTION(8),            0x00, /* Physical */
+               HID_RI_USAGE_PAGE(8),        0x09, /* Button */
+               HID_RI_USAGE_MINIMUM(8),     0x01,
+               HID_RI_USAGE_MAXIMUM(8),     0x03,
+               HID_RI_LOGICAL_MINIMUM(8),   0,
+               HID_RI_LOGICAL_MAXIMUM(8),   1,
+               HID_RI_REPORT_COUNT(8),      3,
+               HID_RI_REPORT_SIZE(8),       1,
+               HID_RI_INPUT(8),             (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
+
+               HID_RI_REPORT_COUNT(8),      1,
+               HID_RI_REPORT_SIZE(8),       5,
+               HID_RI_INPUT(8),             HID_IOF_CONSTANT,
+
+               HID_RI_USAGE_PAGE(8),        0x01, /* Generic Desktop */
+               HID_RI_USAGE(8),             0x30, /* Usage X */
+               HID_RI_USAGE(8),             0x31, /* Usage Y */
+               HID_RI_LOGICAL_MINIMUM(8),   -128,
+               HID_RI_LOGICAL_MAXIMUM(8),   127,
+               HID_RI_REPORT_COUNT(8),      2,
+               HID_RI_REPORT_SIZE(8),       8,
+               HID_RI_INPUT(8),             (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE | HID_IOF_NON_VOLATILE),
+           HID_RI_END_COLLECTION(0),
+       HID_RI_END_COLLECTION(0),

 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall