Skip to content

Commit

Permalink
Add LUFA as submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
@iFreilicht
iFreilicht committed Jul 18, 2017
1 parent ea35bdc commit eca988a
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 59 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
@@ -0,0 +1,3 @@
[submodule "LUFA"]
path = LUFA
url = https://github.com/abcminiuser/lufa.git
1 change: 1 addition & 0 deletions LUFA
Submodule LUFA added at 2cde25
106 changes: 53 additions & 53 deletions LUFA.c.inc
View file
Expand Up @@ -18,7 +18,7 @@
#define __INCLUDE_FROM_USBTASK_C
#define __INCLUDE_FROM_USB_CONTROLLER_C
#include <LUFA/Drivers/USB/Core/USBMode.h>
#include <LUFA/LUFA/Drivers/USB/Core/USBMode.h>
#if defined(USB_CAN_BE_DEVICE)
# define __INCLUDE_FROM_AUDIO_DEVICE_C
Expand All @@ -40,90 +40,90 @@
# define __INCLUDE_FROM_STILLIMAGE_HOST_C
#endif
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/USB/Core/ConfigDescriptors.c>
#include <LUFA/Drivers/USB/Core/Events.c>
#include <LUFA/Drivers/USB/Core/USBTask.c>
#include <LUFA/Drivers/USB/Class/Common/HIDParser.c>
#include <LUFA/LUFA/Drivers/USB/Core/ConfigDescriptors.c>
#include <LUFA/LUFA/Drivers/USB/Core/Events.c>
#include <LUFA/LUFA/Drivers/USB/Core/USBTask.c>
#include <LUFA/LUFA/Drivers/USB/Class/Common/HIDParser.c>
#if defined(USB_CAN_BE_DEVICE)
# include <LUFA/Drivers/USB/Core/DeviceStandardReq.c>
# include <LUFA/Drivers/USB/Class/Device/AudioClassDevice.c>
# include <LUFA/Drivers/USB/Class/Device/CDCClassDevice.c>
# include <LUFA/Drivers/USB/Class/Device/HIDClassDevice.c>
# include <LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c>
# include <LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c>
# include <LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c>
# include <LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Core/DeviceStandardReq.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c>
# include <LUFA/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c>
#endif
#if defined(USB_CAN_BE_HOST)
# include <LUFA/Drivers/USB/Core/HostStandardReq.c>
# include <LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/AudioClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/CDCClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/HIDClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/MIDIClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/PrinterClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/RNDISClassHost.c>
# include <LUFA/Drivers/USB/Class/Host/StillImageClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Core/HostStandardReq.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/AudioClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/CDCClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/HIDClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c>
# include <LUFA/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c>
#endif
#if defined(USB_CAN_BE_BOTH)
# include <LUFA/Drivers/USB/Core/OTG.c>
# include <LUFA/LUFA/Drivers/USB/Core/OTG.c>
#endif
#if (ARCH == ARCH_AVR8)
# if defined(USB_CAN_BE_DEVICE)
# include<LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c>
# include <LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c>
# include <LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c>
# include<LUFA/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c>
# endif
# if defined(USB_CAN_BE_HOST)
# include <LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c>
# include <LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c>
# include <LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c>
# endif
# if defined(USB_CAN_BE_BOTH)
# include <LUFA/Drivers/USB/Core/OTG_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/OTG_AVR8.c>
# endif
# include <LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c>
# include <LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c>
# include <LUFA/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c>
#elif (ARCH == ARCH_XMEGA)
# if defined(USB_CAN_BE_DEVICE)
# include <LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.c>
# include <LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c>
# include <LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c>
# endif
# if defined(USB_CAN_BE_HOST)
# include <LUFA/Drivers/USB/Core/XMEGA/Host_XMEGA.c>
# include <LUFA/Drivers/USB/Core/XMEGA/Pipe_XMEGA.c>
# include <LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/Host_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/Pipe_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c>
# endif
# if defined(USB_CAN_BE_BOTH)
# include <LUFA/Drivers/USB/Core/OTG_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/OTG_XMEGA.c>
# endif
# include <LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c>
# include <LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c>
# include <LUFA/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c>
#elif (ARCH == ARCH_UC3)
# if defined(USB_CAN_BE_DEVICE)
# include <LUFA/Drivers/USB/Core/UC3/Device_UC3.c>
# include <LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c>
# include <LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/Device_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c>
# endif
# if defined(USB_CAN_BE_HOST)
# include <LUFA/Drivers/USB/Core/UC3/Host_UC3.c>
# include <LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c>
# include <LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/Host_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c>
# endif
# if defined(USB_CAN_BE_BOTH)
# include <LUFA/Drivers/USB/Core/OTG_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/OTG_UC3.c>
# endif
# include <LUFA/Drivers/USB/Core/UC3/USBController_UC3.c>
# include <LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c>
# include <LUFA/Platform/UC3/InterruptManagement.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c>
# include <LUFA/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c>
# include <LUFA/LUFA/Platform/UC3/InterruptManagement.c>
#endif
#endif
2 changes: 1 addition & 1 deletion LUFA.h
View file
Expand Up @@ -8,6 +8,6 @@
#include <Arduino.h>
#define F_USB F_CPU

#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/LUFA/Drivers/USB/USB.h>

#endif
Empty file removed LUFA/.keep
View file
Empty file.
2 changes: 1 addition & 1 deletion examples/LUFA_DualVirtualSerial/Descriptors.h
View file
Expand Up @@ -41,7 +41,7 @@

#include <avr/pgmspace.h>

#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/LUFA/Drivers/USB/USB.h>

/* Macros: */
/** Endpoint address of the first CDC interface's device-to-host data IN endpoint. */
Expand Down
8 changes: 4 additions & 4 deletions examples/LUFA_DualVirtualSerial/DualVirtualSerial.h
View file
Expand Up @@ -45,10 +45,10 @@

#include "Descriptors.h"

#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Board/Joystick.h>
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Platform/Platform.h>
#include <LUFA/LUFA/Drivers/Board/LEDs.h>
#include <LUFA/LUFA/Drivers/Board/Joystick.h>
#include <LUFA/LUFA/Drivers/USB/USB.h>
#include <LUFA/LUFA/Platform/Platform.h>

/* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
Expand Down

1 comment on commit eca988a

@Palatis
Copy link
Owner

@Palatis Palatis commented on eca988a Jul 20, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a header to include everything LUFA, and have client code include only that header might be a good idea.

Please sign in to comment.