X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/25ddbb9e3bcf184ebf1c17ea254b3c0c924327e2..c58c53dba90fdc19d38f5e5d6957f2ede2a740f3:/Demos/Device/LowLevel/Joystick/Descriptors.c

diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.c b/Demos/Device/LowLevel/Joystick/Descriptors.c
index 63f3adce2..dcc5d6901 100644
--- a/Demos/Device/LowLevel/Joystick/Descriptors.c
+++ b/Demos/Device/LowLevel/Joystick/Descriptors.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Copyright 2010  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
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -58,18 +58,18 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
 	0x75, 0x08,          /*     Report Size (8)                                */
 	0x95, 0x02,          /*     Report Count (2)                               */
 	0x81, 0x82,          /*     Input (Data, Variable, Absolute, Volatile)     */
-	0x05, 0x09,          /*     Usage Page (Button)                            */
-	0x09, 0x02,          /*     Usage (Button 2)                               */
-	0x09, 0x01,          /*     Usage (Button 1)                               */
-	0x15, 0x00,          /*     Logical Minimum (0)                            */
-	0x25, 0x01,          /*     Logical Maximum (1)                            */
-	0x75, 0x01,          /*     Report Size (1)                                */
-	0x95, 0x02,          /*     Report Count (2)                               */
-	0x81, 0x02,          /*     Input (Data, Variable, Absolute)               */
-	0x75, 0x06,          /*     Report Size (6)                                */
-	0x95, 0x01,          /*     Report Count (1)                               */
-	0x81, 0x01,          /*     Input (Constant)                               */
 	0xc0,                /*   End Collection                                   */
+	0x05, 0x09,          /*   Usage Page (Button)                              */
+	0x09, 0x02,          /*   Usage (Button 2)                                 */
+	0x09, 0x01,          /*   Usage (Button 1)                                 */
+	0x15, 0x00,          /*   Logical Minimum (0)                              */
+	0x25, 0x01,          /*   Logical Maximum (1)                              */
+	0x75, 0x01,          /*   Report Size (1)                                  */
+	0x95, 0x02,          /*   Report Count (2)                                 */
+	0x81, 0x02,          /*   Input (Data, Variable, Absolute)                 */
+	0x75, 0x06,          /*   Report Size (6)                                  */
+	0x95, 0x01,          /*   Report Count (1)                                 */
+	0x81, 0x01,          /*   Input (Constant)                                 */
 	0xc0                 /* End Collection                                     */
 };
 
@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
 		},
 		
-	.Interface = 
+	.HID_Interface = 
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
@@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR
 		},
 
-	.JoystickHID = 
+	.HID_JoystickHID = 
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
 									 
@@ -149,7 +149,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(JoystickReport)
 		},
 
-	.JoystickEndpoint = 
+	.HID_ReportINEndpoint = 
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 										 
@@ -236,7 +236,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			
 			break;
 		case DTYPE_HID: 
-			Address = (void*)&ConfigurationDescriptor.JoystickHID;
+			Address = (void*)&ConfigurationDescriptor.HID_JoystickHID;
 			Size    = sizeof(USB_Descriptor_HID_t);
 			break;
 		case DTYPE_Report: