Make sure that the NVM bus/controller busy waits in the AVRISP MKII clone project...

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

diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.c b/Demos/Device/LowLevel/Joystick/Descriptors.c
index 63f3adc..dcc5d69 100644 (file)
--- a/Demos/Device/LowLevel/Joystick/Descriptors.c
+++ b/Demos/Device/LowLevel/Joystick/Descriptors.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -58,18 +58,18 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
        0x75, 0x08,          /*     Report Size (8)                                */\r
        0x95, 0x02,          /*     Report Count (2)                               */\r
        0x81, 0x82,          /*     Input (Data, Variable, Absolute, Volatile)     */\r
        0x75, 0x08,          /*     Report Size (8)                                */\r
        0x95, 0x02,          /*     Report Count (2)                               */\r
        0x81, 0x82,          /*     Input (Data, Variable, Absolute, Volatile)     */\r

-       0x05, 0x09,          /*     Usage Page (Button)                            */\r
-       0x09, 0x02,          /*     Usage (Button 2)                               */\r
-       0x09, 0x01,          /*     Usage (Button 1)                               */\r
-       0x15, 0x00,          /*     Logical Minimum (0)                            */\r
-       0x25, 0x01,          /*     Logical Maximum (1)                            */\r
-       0x75, 0x01,          /*     Report Size (1)                                */\r
-       0x95, 0x02,          /*     Report Count (2)                               */\r
-       0x81, 0x02,          /*     Input (Data, Variable, Absolute)               */\r
-       0x75, 0x06,          /*     Report Size (6)                                */\r
-       0x95, 0x01,          /*     Report Count (1)                               */\r
-       0x81, 0x01,          /*     Input (Constant)                               */\r

        0xc0,                /*   End Collection                                   */\r
        0xc0,                /*   End Collection                                   */\r

+       0x05, 0x09,          /*   Usage Page (Button)                              */\r
+       0x09, 0x02,          /*   Usage (Button 2)                                 */\r
+       0x09, 0x01,          /*   Usage (Button 1)                                 */\r
+       0x15, 0x00,          /*   Logical Minimum (0)                              */\r
+       0x25, 0x01,          /*   Logical Maximum (1)                              */\r
+       0x75, 0x01,          /*   Report Size (1)                                  */\r
+       0x95, 0x02,          /*   Report Count (2)                                 */\r
+       0x81, 0x02,          /*   Input (Data, Variable, Absolute)                 */\r
+       0x75, 0x06,          /*   Report Size (6)                                  */\r
+       0x95, 0x01,          /*   Report Count (1)                                 */\r
+       0x81, 0x01,          /*   Input (Constant)                                 */\r

        0xc0                 /* End Collection                                     */\r
 };\r
 \r
        0xc0                 /* End Collection                                     */\r
 };\r
 \r


@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r

-       .Interface = \r
+       .HID_Interface = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r


@@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r

-       .JoystickHID = \r
+       .HID_JoystickHID = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
                                                                         \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
                                                                         \r


@@ -149,7 +149,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .HIDReportLength        = sizeof(JoystickReport)\r
                },\r
 \r
                        .HIDReportLength        = sizeof(JoystickReport)\r
                },\r
 \r

-       .JoystickEndpoint = \r
+       .HID_ReportINEndpoint = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r


@@ -236,7 +236,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                        \r
                        break;\r
                case DTYPE_HID: \r
                        \r
                        break;\r
                case DTYPE_HID: \r

-                       Address = (void*)&ConfigurationDescriptor.JoystickHID;\r
+                       Address = (void*)&ConfigurationDescriptor.HID_JoystickHID;\r

                        Size    = sizeof(USB_Descriptor_HID_t);\r
                        break;\r
                case DTYPE_Report: \r
                        Size    = sizeof(USB_Descriptor_HID_t);\r
                        break;\r
                case DTYPE_Report: \r