Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities.

This commit is contained in:
Dean Camera 2011-11-18 06:26:51 +00:00
parent 3e04487279
commit eb2e883fd3
54 changed files with 76 additions and 72 deletions

View file

@ -67,11 +67,11 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "Device/Audio.h"
#include "Device/AudioClassDevice.h"
#endif
#if defined(USB_CAN_BE_HOST)
#include "Host/Audio.h"
#include "Host/AudioClassHost.h"
#endif
#endif

View file

@ -67,11 +67,11 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "Device/CDC.h"
#include "Device/CDCClassDevice.h"
#endif
#if defined(USB_CAN_BE_HOST)
#include "Host/CDC.h"
#include "Host/CDCClassHost.h"
#endif
#endif

View file

@ -70,7 +70,7 @@
#include "../../../../Common/Common.h"
#include "HIDReportData.h"
#include "../Common/HID.h"
#include "HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../Core/StdDescriptors.h"
#include "Audio.h"
#include "AudioClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../Core/StdDescriptors.h"
#include "CDC.h"
#include "CDCClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_AUDIO_DRIVER
#define __INCLUDE_FROM_AUDIO_DEVICE_C
#include "Audio.h"
#include "AudioClassDevice.h"
void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
{

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/Audio.h"
#include "../Common/AudioClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_CDC_DRIVER
#define __INCLUDE_FROM_CDC_DEVICE_C
#include "CDC.h"
#include "CDCClassDevice.h"
void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
{

View file

@ -72,7 +72,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/CDC.h"
#include "../Common/CDCClassCommon.h"
#include <stdio.h>

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_HID_DRIVER
#define __INCLUDE_FROM_HID_DEVICE_C
#include "HID.h"
#include "HIDClassDevice.h"
void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
{

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/HID.h"
#include "../Common/HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MIDI_DRIVER
#define __INCLUDE_FROM_MIDI_DEVICE_C
#include "MIDI.h"
#include "MIDIClassDevice.h"
bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
{

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/MIDI.h"
#include "../Common/MIDIClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MS_DRIVER
#define __INCLUDE_FROM_MASSSTORAGE_DEVICE_C
#include "MassStorage.h"
#include "MassStorageClassDevice.h"
void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
{

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/MassStorage.h"
#include "../Common/MassStorageClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_RNDIS_DRIVER
#define __INCLUDE_FROM_RNDIS_DEVICE_C
#include "RNDIS.h"
#include "RNDISClassDevice.h"
static const uint32_t PROGMEM AdapterSupportedOIDList[] =
{

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/RNDIS.h"
#include "../Common/RNDISClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -68,11 +68,11 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "Device/HID.h"
#include "Device/HIDClassDevice.h"
#endif
#if defined(USB_CAN_BE_HOST)
#include "Host/HID.h"
#include "Host/HIDClassHost.h"
#endif
#endif

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_AUDIO_DRIVER
#define __INCLUDE_FROM_AUDIO_HOST_C
#include "Audio.h"
#include "AudioClassHost.h"
uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/Audio.h"
#include "../Common/AudioClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_CDC_DRIVER
#define __INCLUDE_FROM_CDC_HOST_C
#include "CDC.h"
#include "CDCClassHost.h"
uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/CDC.h"
#include "../Common/CDCClassCommon.h"
#include <stdio.h>

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_HID_DRIVER
#define __INCLUDE_FROM_HID_HOST_C
#include "HID.h"
#include "HIDClassHost.h"
uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/HID.h"
#include "../Common/HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MIDI_DRIVER
#define __INCLUDE_FROM_MIDI_HOST_C
#include "MIDI.h"
#include "MIDIClassHost.h"
uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/MIDI.h"
#include "../Common/MIDIClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MS_DRIVER
#define __INCLUDE_FROM_MASSSTORAGE_HOST_C
#include "MassStorage.h"
#include "MassStorageClassHost.h"
uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/MassStorage.h"
#include "../Common/MassStorageClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_PRINTER_DRIVER
#define __INCLUDE_FROM_PRINTER_HOST_C
#include "Printer.h"
#include "PrinterClassHost.h"
uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/Printer.h"
#include "../Common/PrinterClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_RNDIS_DRIVER
#define __INCLUDE_FROM_RNDIS_HOST_C
#include "RNDIS.h"
#include "RNDISClassHost.h"
uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -56,7 +56,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/RNDIS.h"
#include "../Common/RNDISClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_SI_DRIVER
#define __INCLUDE_FROM_STILLIMAGE_HOST_C
#include "StillImage.h"
#include "StillImageClassHost.h"
uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
uint16_t ConfigDescriptorSize,

View file

@ -55,7 +55,7 @@
/* Includes: */
#include "../../USB.h"
#include "../Common/StillImage.h"
#include "../Common/StillImageClassCommon.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)

View file

@ -70,11 +70,11 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "Device/MIDI.h"
#include "Device/MIDIClassDevice.h"
#endif
#if defined(USB_CAN_BE_HOST)
#include "Host/MIDI.h"
#include "Host/MIDIClassHost.h"
#endif
#endif

View file

@ -67,11 +67,11 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "Device/MassStorage.h"
#include "Device/MassStorageClassDevice.h"
#endif
#if defined(USB_CAN_BE_HOST)
#include "Host/MassStorage.h"
#include "Host/MassStorageClassHost.h"
#endif
#endif

View file

@ -68,7 +68,7 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_HOST)
#include "Host/Printer.h"
#include "Host/PrinterClassHost.h"
#endif
#endif

View file

@ -67,11 +67,11 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE)
#include "Device/RNDIS.h"
#include "Device/RNDISClassDevice.h"
#endif
#if defined(USB_CAN_BE_HOST)
#include "Host/RNDIS.h"
#include "Host/RNDISClassHost.h"
#endif
#endif

View file

@ -66,7 +66,7 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_HOST)
#include "Host/StillImage.h"
#include "Host/StillImageClassHost.h"
#endif
#endif