Re-add Webserver uIP application polling, apply patch to uIP by Andrew Ruder to fix...

[pub/USBasp.git] / Demos / Host / LowLevel / StillImageHost / ConfigDescriptor.c

diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
index 8163beb..7fb3cec 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.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


@@ -48,12 +48,12 @@
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r
        uint8_t  ConfigDescriptorData[512];\r
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r
        uint8_t  ConfigDescriptorData[512];\r

-       uint8_t* CurrConfigLocation = ConfigDescriptorData;\r
+       void*    CurrConfigLocation = ConfigDescriptorData;\r

        uint16_t CurrConfigBytesRem;\r
        uint8_t  FoundEndpoints = 0;\r
 \r
        /* Retrieve the entire configuration descriptor into the allocated buffer */\r
        uint16_t CurrConfigBytesRem;\r
        uint8_t  FoundEndpoints = 0;\r
 \r
        /* Retrieve the entire configuration descriptor into the allocated buffer */\r

-       switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+       switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r

        {\r
                case HOST_GETCONFIG_Successful:\r
                        break;\r
        {\r
                case HOST_GETCONFIG_Successful:\r
                        break;\r


@@ -139,7 +139,7 @@ uint8_t ProcessConfigurationDescriptor(void)
  *\r
  *  This comparator searches for the next Interface descriptor of the correct Still Image Class, Subclass and Protocol values.\r
  *\r
  *\r
  *  This comparator searches for the next Interface descriptor of the correct Still Image Class, Subclass and Protocol values.\r
  *\r

- *  \return A value from the \ref DSEARCH_Return_ErrorCodes_t enum\r
+ *  \return A value from the DSEARCH_Return_ErrorCodes_t enum\r

  */\r
 uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor)\r
 {\r
  */\r
 uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor)\r
 {\r


@@ -164,7 +164,7 @@ uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor)
  *  This comparator searches for the next Interrupt or Bulk Endpoint descriptor of the current SI interface, aborting the\r
  *  search if another interface descriptor is found before the next endpoint.\r
  *\r
  *  This comparator searches for the next Interrupt or Bulk Endpoint descriptor of the current SI interface, aborting the\r
  *  search if another interface descriptor is found before the next endpoint.\r
  *\r

- *  \return A value from the \ref DSEARCH_Return_ErrorCodes_t enum\r
+ *  \return A value from the DSEARCH_Return_ErrorCodes_t enum\r

  */\r
 uint8_t DComp_NextStillImageInterfaceDataEndpoint(void* CurrentDescriptor)\r
 {\r
  */\r
 uint8_t DComp_NextStillImageInterfaceDataEndpoint(void* CurrentDescriptor)\r
 {\r