Ensure all demos now compile in C99 standards mode, and not GNU99 (C99 + GNU extensions).

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

diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.c b/Demos/Device/LowLevel/Keyboard/Descriptors.c
index baab8cf..4963c7b 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Descriptors.c
+++ b/Demos/Device/LowLevel/Keyboard/Descriptors.c
@@ -7,8 +7,8 @@
 */
 
 /*
 */
 
 /*

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

   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)

-      Based on code by 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


@@ -194,9 +194,9 @@ USB_Descriptor_String_t PROGMEM LanguageString =
  */
 USB_Descriptor_String_t PROGMEM ManufacturerString =
 {
  */
 USB_Descriptor_String_t PROGMEM ManufacturerString =
 {

-       .Header                 = {.Size = USB_STRING_LEN(16), .Type = DTYPE_String},
+       .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

                
                

-       .UnicodeString          = L"Denver Gingerich"
+       .UnicodeString          = L"Dean Camera"

 };
 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
 };
 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,


@@ -216,7 +216,9 @@ USB_Descriptor_String_t PROGMEM ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */

-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                    const uint8_t wIndex,
+                                    void** const DescriptorAddress)

 {
        const uint8_t  DescriptorType   = (wValue >> 8);
        const uint8_t  DescriptorNumber = (wValue & 0xFF);
 {
        const uint8_t  DescriptorType   = (wValue >> 8);
        const uint8_t  DescriptorNumber = (wValue & 0xFF);