Commit eb2e883f authored by Dean Camera's avatar Dean Camera
Browse files

Added Class, ClassDevice, ClassHost and ClassCommon to the internal class...

Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities.
parent 3e044872
......@@ -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)
......
......@@ -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,
......
......@@ -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)
......
......@@ -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,
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -68,7 +68,7 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_HOST)
#include "Host/Printer.h"
#include "Host/PrinterClassHost.h"
#endif
#endif
......
......@@ -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
......
......@@ -66,7 +66,7 @@
#include "../Core/USBMode.h"
#if defined(USB_CAN_BE_HOST)
#include "Host/StillImage.h"
#include "Host/StillImageClassHost.h"
#endif
#endif
......
......@@ -388,14 +388,14 @@
#include "Core/OTG.h"
#endif
#include "Class/Audio.h"
#include "Class/CDC.h"
#include "Class/HID.h"
#include "Class/MassStorage.h"
#include "Class/MIDI.h"
#include "Class/Printer.h"
#include "Class/RNDIS.h"
#include "Class/StillImage.h"
#include "Class/AudioClass.h"
#include "Class/CDCClass.h"
#include "Class/HIDClass.h"
#include "Class/MassStorageClass.h"
#include "Class/MIDIClass.h"
#include "Class/PrinterClass.h"
#include "Class/RNDISClass.h"
#include "Class/StillImageClass.h"
#endif
......@@ -37,20 +37,20 @@ LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH
$(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c
LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDC.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HID.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorage.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDI.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDIS.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Audio.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDC.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HID.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorage.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDI.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Printer.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDIS.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImage.c
LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c
LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c
LUFA_SRC_SERIAL = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c
LUFA_SRC_TWI = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c
......
......@@ -50,7 +50,6 @@
#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Peripheral/ADC.h>
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/USB/Class/MIDI.h>
/* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
......
......@@ -77,7 +77,7 @@
#include "../../USBHostMode.h"
#include <LUFA/Drivers/USB/Class/RNDIS.h>
#include <LUFA/Drivers/USB/USB.h>
/**
* Handle outgoing packets.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment