Remove deleted source files from the Device mode Class driver demos to enable them...

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

diff --git a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
index 1084969..a2d4d48 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/StillImageHost/ConfigDescriptor.c
@@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
        uint8_t  FoundEndpoints = 0;\r
        \r
        /* Get Configuration Descriptor size from the device */\r
-       if (USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)\r
+       if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)\r
          return ControlError;\r
        \r
        /* Ensure that the Configuration Descriptor isn't too large */\r
@@ -63,7 +63,7 @@ uint8_t ProcessConfigurationDescriptor(void)
        ConfigDescriptorData = alloca(ConfigDescriptorSize);\r
 \r
        /* Retrieve the entire configuration descriptor into the allocated buffer */\r
-       USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, ConfigDescriptorData);\r
+       USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData);\r
        \r
        /* Validate returned data - ensure first entry is a configuration header descriptor */\r
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
@@ -82,7 +82,7 @@ uint8_t ProcessConfigurationDescriptor(void)
        {\r
                /* Fetch the next endpoint from the current Still Image interface */\r
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
-                                             DComp_NextSImageInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                                             DComp_NextStillImageInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
                {\r
                        /* Descriptor not found, error out */\r
                        return NoEndpointFound;\r
@@ -101,7 +101,6 @@ uint8_t ProcessConfigurationDescriptor(void)
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                                                                   PIPE_BANK_DOUBLE);                   \r
 \r
-                               Pipe_SetInfiniteINRequests();\r
                                Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\r
                                \r
                                /* Set the flag indicating that the events pipe has been found */\r
@@ -118,8 +117,6 @@ uint8_t ProcessConfigurationDescriptor(void)
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                                                                   PIPE_BANK_DOUBLE);\r
 \r
-                               Pipe_SetInfiniteINRequests();\r
-\r
                                /* Set the flag indicating that the data IN pipe has been found */\r
                                FoundEndpoints |= (1 << SIMAGE_DATA_IN_PIPE);\r
                        }\r
@@ -173,7 +170,7 @@ uint8_t DComp_NextStillImageInterface(void* CurrentDescriptor)
  *\r
  *  \return A value from the DSEARCH_Return_ErrorCodes_t enum\r
  */\r
-uint8_t DComp_NextSImageInterfaceDataEndpoint(void* CurrentDescriptor)\r
+uint8_t DComp_NextStillImageInterfaceDataEndpoint(void* CurrentDescriptor)\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r