X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Projects/Magstripe/Descriptors.c

diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 83de760ea..10312ab4d 100644
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -1,6 +1,6 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
@@ -8,7 +8,7 @@
 
 /*
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  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
@@ -44,31 +44,12 @@
  *
  *  See the HID class specification for more information on HID report descriptors.
  */
-USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
 {
-	0x05, 0x01,          /* Usage Page (Generic Desktop)                    */
-	0x09, 0x06,          /* Usage (Keyboard)                                */
-	0xa1, 0x01,          /* Collection (Application)                        */
-	0x05, 0x07,          /*   Usage Page (Key Codes)                        */
-	0x19, 0xe0,          /*   Usage Minimum (Keyboard LeftControl)          */
-	0x29, 0xe7,          /*   Usage Maximum (Keyboard Right GUI)            */
-	0x15, 0x00,          /*   Logical Minimum (0)                           */
-	0x25, 0x01,          /*   Logical Maximum (1)                           */
-	0x75, 0x01,          /*   Report Size (1)                               */
-	0x95, 0x08,          /*   Report Count (8)                              */
-	0x81, 0x02,          /*   Input (Data, Variable, Absolute)              */
-	0x95, 0x01,          /*   Report Count (1)                              */
-	0x75, 0x08,          /*   Report Size (8)                               */
-	0x81, 0x03,          /*   Input (Const, Variable, Absolute)             */
-	0x95, 0x01,          /*   Report Count (1)                              */
-	0x75, 0x08,          /*   Report Size (8)                               */
-	0x15, 0x00,          /*   Logical Minimum (0)                           */
-	0x25, 0x65,          /*   Logical Maximum (101)                         */
-	0x05, 0x07,          /*   Usage Page (Keyboard)                         */
-	0x19, 0x00,          /*   Usage Minimum (Reserved (no event indicated)) */
-	0x29, 0x65,          /*   Usage Maximum (Keyboard Application)          */
-	0x81, 0x00,          /*   Input (Data, Array, Absolute)                 */
-	0xc0                 /* End Collection                                  */
+	/* Use the HID class driver's standard Keyboard report.
+	 *   Max simultaneous keys: 6
+	 */
+	HID_DESCRIPTOR_KEYBOARD(6)
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
@@ -76,7 +57,7 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
  *  number of device configurations. The descriptor is read out by the USB host when the enumeration
  *  process begins.
  */
-USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 {
 	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
@@ -103,7 +84,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
  *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
  *  a configuration so that the host may correctly communicate with the USB device.
  */
-USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 {
 	.Config =
 		{
@@ -161,7 +142,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 /** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
  *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
  *  via the language ID table available at USB.org what languages the device supports for its string descriptors. */
-USB_Descriptor_String_t PROGMEM LanguageString =
+const USB_Descriptor_String_t PROGMEM LanguageString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
 
@@ -172,7 +153,7 @@ USB_Descriptor_String_t PROGMEM LanguageString =
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
-USB_Descriptor_String_t PROGMEM ManufacturerString =
+const USB_Descriptor_String_t PROGMEM ManufacturerString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(32), .Type = DTYPE_String},
 
@@ -183,7 +164,7 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
-USB_Descriptor_String_t PROGMEM ProductString =
+const USB_Descriptor_String_t PROGMEM ProductString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(20), .Type = DTYPE_String},