forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deleted source files from the LUFA library makefile.

Browse Source 
Renamed parameters of SI_Host_ConfigurePipes() to match other Host mode Class drivers.
pull/1469/head
Dean Camera 16 years ago
parent 3dce79d68c
commit e2822fb30d
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File

12
LUFA/Drivers/USB/Class/Host/StillImage.c
Unescape View File

@ -36,17 +36,17 @@
#warning The Still Image Host mode Class driver is currently incomplete and is for preview purposes only. #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 SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorLength,
uint8_t* ConfigDescriptorData) uint8_t* DeviceConfigDescriptor)
{ {
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
memset(&SIInterfaceInfo->State, 0x00, sizeof(SIInterfaceInfo->State)); memset(&SIInterfaceInfo->State, 0x00, sizeof(SIInterfaceInfo->State));
if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration) if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration)
return SI_ENUMERROR_InvalidConfigDescriptor; return SI_ENUMERROR_InvalidConfigDescriptor;
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,
DComp_SI_Host_NextSIInterface) != DESCRIPTOR_SEARCH_COMP_Found) DComp_SI_Host_NextSIInterface) != DESCRIPTOR_SEARCH_COMP_Found)
{ {
return SI_ENUMERROR_NoSIInterfaceFound; 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)) 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) DComp_SI_Host_NextSIInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
{ {
return SI_ENUMERROR_EndpointsNotFound; 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) if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)
{ {

4
LUFA/Drivers/USB/Class/Host/StillImage.h
Unescape View File

@ -117,8 +117,8 @@
* *
* \return A value from the \ref SIHost_EnumerationFailure_ErrorCodes_t enum * \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 SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, uint16_t ConfigDescriptorLength,
uint8_t* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1, 3); uint8_t* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1, 3);
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)

2
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -9,7 +9,7 @@
* \section Sec_ChangeLogXXXXXX Version XXXXXX * \section Sec_ChangeLogXXXXXX Version XXXXXX
* *
* <b>New:</b> * <b>New:</b>
* - 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 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 * - 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 * USB_Device_DisableSOFEvents() macros to give bus-synchronised millisecond interrupts when in USB device mode

2
LUFA/makefile
Unescape View File

@ -24,11 +24,9 @@ LUFA_SRC_FILES = ./Drivers/USB/LowLevel/DevChapter9.c \
./Drivers/USB/Class/Device/MIDI.c \ ./Drivers/USB/Class/Device/MIDI.c \
./Drivers/USB/Class/Device/MassStorage.c \ ./Drivers/USB/Class/Device/MassStorage.c \
./Drivers/USB/Class/Device/RNDIS.c \ ./Drivers/USB/Class/Device/RNDIS.c \
./Drivers/USB/Class/Host/Audio.c \
./Drivers/USB/Class/Host/CDC.c \ ./Drivers/USB/Class/Host/CDC.c \
./Drivers/USB/Class/Host/HID.c \ ./Drivers/USB/Class/Host/HID.c \
./Drivers/USB/Class/Host/HIDParser.c \ ./Drivers/USB/Class/Host/HIDParser.c \
./Drivers/USB/Class/Host/MIDI.c \
./Drivers/USB/Class/Host/MassStorage.c \ ./Drivers/USB/Class/Host/MassStorage.c \
./Drivers/USB/Class/Host/StillImage.c \ ./Drivers/USB/Class/Host/StillImage.c \
./Drivers/Board/Temperature.c \ ./Drivers/Board/Temperature.c \

Write Preview
Loading…
Cancel
Save