Remove deleted source files from the LUFA library makefile.

Renamed parameters of SI_Host_ConfigurePipes() to match other Host mode Class drivers.

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
-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
-       if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
+       if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration)\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
@@ -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
-               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
-               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

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h
index 6222cf5..d970594 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.h
@@ -117,8 +117,8 @@
                         *\r
                         *  \return A value from the \ref SIHost_EnumerationFailure_ErrorCodes_t enum\r
                         */\r
-                       uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                                           uint8_t* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1, 3);\r
+                       uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorLength,\r
+                                           uint8_t* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1, 3);\r
                                                          \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index b5f1590..8530f70 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -9,7 +9,7 @@
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX\r
   *\r
   *  <b>New:</b>\r
-  *  - Added new host class drivers and matching demos to the library for rapid application development\r
+  *  - Added new host mode class drivers and matching demos to the library for rapid application development\r
   *  - Added flag to the HID report parser to indicate if a device has multiple reports\r
   *  - Added new EVENT_USB_Device_StartOfFrame() event, controlled by the new USB_Device_EnableSOFEvents() and\r
   *    USB_Device_DisableSOFEvents() macros to give bus-synchronised millisecond interrupts when in USB device mode\r

diff --git a/LUFA/makefile b/LUFA/makefile
index d5829c6..64d0ede 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -24,11 +24,9 @@ LUFA_SRC_FILES =     ./Drivers/USB/LowLevel/DevChapter9.c        \
                      ./Drivers/USB/Class/Device/MIDI.c           \\r
                      ./Drivers/USB/Class/Device/MassStorage.c    \\r
                      ./Drivers/USB/Class/Device/RNDIS.c          \\r
-                     ./Drivers/USB/Class/Host/Audio.c            \\r
                      ./Drivers/USB/Class/Host/CDC.c              \\r
                      ./Drivers/USB/Class/Host/HID.c              \\r
                      ./Drivers/USB/Class/Host/HIDParser.c        \\r
-                     ./Drivers/USB/Class/Host/MIDI.c             \\r
                      ./Drivers/USB/Class/Host/MassStorage.c      \\r
                      ./Drivers/USB/Class/Host/StillImage.c       \\r
                      ./Drivers/Board/Temperature.c               \\r