From e2822fb30dd3903e9be24b01d5874ba4123be8bc Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 30 Aug 2009 11:40:26 +0000 Subject: Remove deleted source files from the LUFA library makefile. Renamed parameters of SI_Host_ConfigurePipes() to match other Host mode Class drivers. --- LUFA/Drivers/USB/Class/Host/StillImage.c | 12 ++++++------ LUFA/Drivers/USB/Class/Host/StillImage.h | 4 ++-- LUFA/ManPages/ChangeLog.txt | 2 +- LUFA/makefile | 2 -- 4 files changed, 9 insertions(+), 11 deletions(-) (limited to 'LUFA') diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c index 876f3b11d..ed38eae10 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.c +++ b/LUFA/Drivers/USB/Class/Host/StillImage.c @@ -36,17 +36,17 @@ #warning The Still Image Host mode Class driver is currently incomplete and is for preview purposes only. -uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorSize, - uint8_t* ConfigDescriptorData) +uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorLength, + uint8_t* DeviceConfigDescriptor) { uint8_t FoundEndpoints = 0; memset(&SIInterfaceInfo->State, 0x00, sizeof(SIInterfaceInfo->State)); - if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration) + if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration) return SI_ENUMERROR_InvalidConfigDescriptor; - if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, + if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor, DComp_SI_Host_NextSIInterface) != DESCRIPTOR_SEARCH_COMP_Found) { return SI_ENUMERROR_NoSIInterfaceFound; @@ -54,13 +54,13 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_ while (FoundEndpoints != (SI_FOUND_EVENTS_IN | SI_FOUND_DATAPIPE_IN | SI_FOUND_DATAPIPE_OUT)) { - if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, + if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor, DComp_SI_Host_NextSIInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { return SI_ENUMERROR_EndpointsNotFound; } - USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t); + USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Endpoint_t); if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT) { diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h index 6222cf595..d970594b3 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.h +++ b/LUFA/Drivers/USB/Class/Host/StillImage.h @@ -117,8 +117,8 @@ * * \return A value from the \ref SIHost_EnumerationFailure_ErrorCodes_t enum */ - uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorSize, - uint8_t* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1, 3); + uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorLength, + uint8_t* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1, 3); /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index b5f1590ce..8530f705f 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -9,7 +9,7 @@ * \section Sec_ChangeLogXXXXXX Version XXXXXX * * New: - * - Added new host class drivers and matching demos to the library for rapid application development + * - Added new host mode class drivers and matching demos to the library for rapid application development * - Added flag to the HID report parser to indicate if a device has multiple reports * - Added new EVENT_USB_Device_StartOfFrame() event, controlled by the new USB_Device_EnableSOFEvents() and * USB_Device_DisableSOFEvents() macros to give bus-synchronised millisecond interrupts when in USB device mode diff --git a/LUFA/makefile b/LUFA/makefile index d5829c6e5..64d0edef7 100644 --- a/LUFA/makefile +++ b/LUFA/makefile @@ -24,11 +24,9 @@ LUFA_SRC_FILES = ./Drivers/USB/LowLevel/DevChapter9.c \ ./Drivers/USB/Class/Device/MIDI.c \ ./Drivers/USB/Class/Device/MassStorage.c \ ./Drivers/USB/Class/Device/RNDIS.c \ - ./Drivers/USB/Class/Host/Audio.c \ ./Drivers/USB/Class/Host/CDC.c \ ./Drivers/USB/Class/Host/HID.c \ ./Drivers/USB/Class/Host/HIDParser.c \ - ./Drivers/USB/Class/Host/MIDI.c \ ./Drivers/USB/Class/Host/MassStorage.c \ ./Drivers/USB/Class/Host/StillImage.c \ ./Drivers/Board/Temperature.c \ -- cgit v1.2.3