Fixed programming errors in the AVRISP-MKII project when the programming packet is...

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

diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
index 8591195..4e0e2b7 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.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
@@ -57,32 +57,15 @@
  */
 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                           */
+       /* Use the HID class driver's standard Mouse report.
+        *   Min X/Y Axis values: -1
+        *   Max X/Y Axis values:  1
+        *   Min physical X/Y Axis values (used to determine resolution): -1
+        *   Max physical X/Y Axis values (used to determine resolution):  1
+        *   Buttons: 3
+        *   Absolute screen coordinates: false
+        */
+       HID_DESCRIPTOR_MOUSE(-1, 1, -1, 1, 3, false)
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
@@ -95,9 +78,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),
-       .Class                  = 0xEF,
-       .SubClass               = 0x02,
-       .Protocol               = 0x01,
+       .Class                  = USB_CSCP_IADDeviceClass,
+       .SubClass               = USB_CSCP_IADDeviceSubclass,
+       .Protocol               = USB_CSCP_IADDeviceProtocol,
 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
@@ -141,9 +124,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .FirstInterfaceIndex    = 0,
                        .TotalInterfaces        = 2,
 
-                       .Class                  = 0x02,
-                       .SubClass               = 0x02,
-                       .Protocol               = 0x01,
+                       .Class                  = CDC_CSCP_CDCClass,
+                       .SubClass               = CDC_CSCP_ACMSubclass,
+                       .Protocol               = CDC_CSCP_ATCommandProtocol,
 
                        .IADStrIndex            = NO_DESCRIPTOR
                },
@@ -157,9 +140,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 1,
 
-                       .Class                  = 0x02,
-                       .SubClass               = 0x02,
-                       .Protocol               = 0x01,
+                       .Class                  = CDC_CSCP_CDCClass,
+                       .SubClass               = CDC_CSCP_ACMSubclass,
+                       .Protocol               = CDC_CSCP_ATCommandProtocol,
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
@@ -208,9 +191,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 2,
 
-                       .Class                  = 0x0A,
-                       .SubClass               = 0x00,
-                       .Protocol               = 0x00,
+                       .Class                  = CDC_CSCP_CDCDataClass,
+                       .SubClass               = CDC_CSCP_NoDataSubclass,
+                       .Protocol               = CDC_CSCP_NoDataProtocol,
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
@@ -222,7 +205,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = CDC_TXRX_EPSIZE,
-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01
                },
 
        .CDC_DataInEndpoint =
@@ -232,7 +215,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = CDC_TXRX_EPSIZE,
-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01
                },
 
        .HID_Interface =
@@ -244,9 +227,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 1,
 
-                       .Class                  = 0x03,
-                       .SubClass               = 0x01,
-                       .Protocol               = HID_BOOTP_MouseBootProtocol,
+                       .Class                  = HID_CSCP_HIDClass,
+                       .SubClass               = HID_CSCP_BootSubclass,
+                       .Protocol               = HID_CSCP_MouseBootProtocol,
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
@@ -269,7 +252,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MOUSE_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = MOUSE_EPSIZE,
-                       .PollingIntervalMS      = 0x0A
+                       .PollingIntervalMS      = 0x01
                }
 };