Remove deleted source files from the LUFA library makefile.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / StillImage.c

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c
index 876f3b1..ed38eae 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.c
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.c
@@ -36,17 +36,17 @@
 \r
 #warning The Still Image Host mode Class driver is currently incomplete and is for preview purposes only.\r
 \r
 \r
 #warning The Still Image Host mode Class driver is currently incomplete and is for preview purposes only.\r
 \r

-uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                              uint8_t* ConfigDescriptorData)\r
+uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorLength,\r
+                              uint8_t* DeviceConfigDescriptor)\r

 {\r
        uint8_t  FoundEndpoints = 0;\r
        \r
        memset(&SIInterfaceInfo->State, 0x00, sizeof(SIInterfaceInfo->State));\r
        \r
 {\r
        uint8_t  FoundEndpoints = 0;\r
        \r
        memset(&SIInterfaceInfo->State, 0x00, sizeof(SIInterfaceInfo->State));\r
        \r

-       if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
+       if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration)\r

          return SI_ENUMERROR_InvalidConfigDescriptor;\r
        \r
          return SI_ENUMERROR_InvalidConfigDescriptor;\r
        \r

-       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
+       if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,\r

                                      DComp_SI_Host_NextSIInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
        {\r
                return SI_ENUMERROR_NoSIInterfaceFound;\r
                                      DComp_SI_Host_NextSIInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
        {\r
                return SI_ENUMERROR_NoSIInterfaceFound;\r


@@ -54,13 +54,13 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_
 \r
        while (FoundEndpoints != (SI_FOUND_EVENTS_IN | SI_FOUND_DATAPIPE_IN | SI_FOUND_DATAPIPE_OUT))\r
        {\r
 \r
        while (FoundEndpoints != (SI_FOUND_EVENTS_IN | SI_FOUND_DATAPIPE_IN | SI_FOUND_DATAPIPE_OUT))\r
        {\r

-               if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
+               if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,\r

                                              DComp_SI_Host_NextSIInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
                {\r
                        return SI_ENUMERROR_EndpointsNotFound;\r
                }\r
                \r
                                              DComp_SI_Host_NextSIInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
                {\r
                        return SI_ENUMERROR_EndpointsNotFound;\r
                }\r
                \r

-               USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);\r
+               USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Endpoint_t);\r

 \r
                if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)\r
                {\r
 \r
                if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)\r
                {\r