diff options
author | Drashna Jaelre <drashna@live.com> | 2019-08-02 14:02:40 -0700 |
---|---|---|
committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-10-01 10:21:12 +0900 |
commit | 9f184ab5da8be4a0d11e28a9e5fc78ed64bf678f (patch) | |
tree | 65535fef5627256c2f96c5e30c148f2ecd314821 /lib/lufa/BuildTests/SingleUSBModeTest | |
parent | d5212f4739795842e0b7c4f1f9a911c7717524c4 (diff) |
Fix the LUFA lib to use a submodule instead of just files (#6245)
* Remove LUFA files
* Update descriptions for newer version of LUFA
* Create PR6245.md
* Fix CDC(Serial) type errors
* Fix missed merge conflict for AUDIO_DTYPE_CSInterface
Diffstat (limited to 'lib/lufa/BuildTests/SingleUSBModeTest')
-rw-r--r-- | lib/lufa/BuildTests/SingleUSBModeTest/Dummy.S | 42 | ||||
-rw-r--r-- | lib/lufa/BuildTests/SingleUSBModeTest/Test.c | 32 | ||||
-rw-r--r-- | lib/lufa/BuildTests/SingleUSBModeTest/makefile | 57 | ||||
-rw-r--r-- | lib/lufa/BuildTests/SingleUSBModeTest/makefile.test | 75 |
4 files changed, 0 insertions, 206 deletions
diff --git a/lib/lufa/BuildTests/SingleUSBModeTest/Dummy.S b/lib/lufa/BuildTests/SingleUSBModeTest/Dummy.S deleted file mode 100644 index 1be4228d2d..0000000000 --- a/lib/lufa/BuildTests/SingleUSBModeTest/Dummy.S +++ /dev/null @@ -1,42 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, distribute, and sell this - software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in - all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -.section .text - - -# Mandatory entry point for successful compilation and link -.global main -main: - # Force code generation of the base USB stack - call USB_Init - -# Mandatory callback needed for base compile of the USB driver -.global CALLBACK_USB_GetDescriptor -CALLBACK_USB_GetDescriptor: diff --git a/lib/lufa/BuildTests/SingleUSBModeTest/Test.c b/lib/lufa/BuildTests/SingleUSBModeTest/Test.c deleted file mode 100644 index 7ac2e008f3..0000000000 --- a/lib/lufa/BuildTests/SingleUSBModeTest/Test.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, distribute, and sell this - software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in - all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -#include <LUFA/Common/Common.h> -#include <LUFA/Drivers/USB/USB.h> diff --git a/lib/lufa/BuildTests/SingleUSBModeTest/makefile b/lib/lufa/BuildTests/SingleUSBModeTest/makefile deleted file mode 100644 index 7921ab6ca2..0000000000 --- a/lib/lufa/BuildTests/SingleUSBModeTest/makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# LUFA Library -# Copyright (C) Dean Camera, 2017. -# -# dean [at] fourwalledcubicle [dot] com -# www.lufa-lib.org -# - -# Makefile for the single USB mode build test. -# This test attempts to build the USB module -# under fixed device and fixed host modes under -# all supported architectures - -# Path to the LUFA library core -LUFA_PATH := ../../LUFA/ - -# Build test cannot be run with multiple parallel jobs -.NOTPARALLEL: - -all: begin compile clean end - -begin: - @echo Executing build test "SingleUSBModeTest". - @echo - -end: - @echo Build test "SingleUSBModeTest" complete. - @echo - -compile: - @echo Building SingleUSBModeTest for ARCH=AVR8 in device only mode... - $(MAKE) -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_DEVICE_ONLY' - - @echo Building SingleUSBModeTest for ARCH=AVR8 in host only mode... - $(MAKE) -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_HOST_ONLY' - - @echo Building SingleUSBModeTest for ARCH=XMEGA in device only mode... - $(MAKE) -f makefile.test clean elf ARCH=XMEGA MCU=atxmega128a1u CC_FLAGS='-D USB_DEVICE_ONLY' - - @echo Building SingleUSBModeTest for ARCH=UC3 in device only mode... - $(MAKE) -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_DEVICE_ONLY' - - @echo Building SingleUSBModeTest for ARCH=UC3 in host only mode... - $(MAKE) -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_HOST_ONLY' - -clean: - $(MAKE) -f makefile.test clean ARCH=AVR8 MCU=at90usb1287 - $(MAKE) -f makefile.test clean ARCH=XMEGA MCU=atxmega128a1u - $(MAKE) -f makefile.test clean ARCH=UC3 MCU=uc3a0256 - -%: - -.PHONY: begin end compile clean - -# Include common DMBS build system modules -DMBS_PATH ?= $(LUFA_PATH)/Build/DMBS/DMBS -include $(DMBS_PATH)/core.mk diff --git a/lib/lufa/BuildTests/SingleUSBModeTest/makefile.test b/lib/lufa/BuildTests/SingleUSBModeTest/makefile.test deleted file mode 100644 index 365c7d00b5..0000000000 --- a/lib/lufa/BuildTests/SingleUSBModeTest/makefile.test +++ /dev/null @@ -1,75 +0,0 @@ -# -# LUFA Library -# Copyright (C) Dean Camera, 2017. -# -# dean [at] fourwalledcubicle [dot] com -# www.lufa-lib.org -# -# -------------------------------------- -# LUFA Project Makefile. -# -------------------------------------- - -# Run "make help" for target help. - -MCU = -ARCH = -BOARD = NONE -F_CPU = $(F_USB) -DEBUG_LEVEL = 0 - -ifeq ($(ARCH), AVR8) - F_USB = 8000000 -else ifeq ($(ARCH), XMEGA) - F_USB = 48000000 -else ifeq ($(ARCH), UC3) - F_USB = 48000000 -endif - -OPTIMIZATION = 1 -TARGET = Test -SRC = Test.c Dummy.S $(LUFA_SRC_USB) -LUFA_PATH = ../../LUFA - -# Generic C/C++ compiler flags -CC_FLAGS = -Wextra -CC_FLAGS += -Werror -CC_FLAGS += -Wformat=2 -CC_FLAGS += -Winit-self -CC_FLAGS += -Wswitch-enum -CC_FLAGS += -Wunused -CC_FLAGS += -Wundef -CC_FLAGS += -Wpointer-arith -CC_FLAGS += -Wcast-align -CC_FLAGS += -Wwrite-strings -CC_FLAGS += -Wlogical-op -CC_FLAGS += -Wmissing-declarations -CC_FLAGS += -Wmissing-field-initializers -CC_FLAGS += -Wmissing-format-attribute -CC_FLAGS += -Woverlength-strings - -# Only enable rendundant declaration warnings for AVR8 target (FIXME) -ifeq ($(ARCH), AVR8) - CC_FLAGS += -Wredundant-decls -endif - -# C compiler only flags -C_FLAGS += -Wmissing-parameter-type -C_FLAGS += -Wnested-externs - -# Potential additional warnings to enable in the future (FIXME) -#CC_FLAGS += -Wswitch-default -#CC_FLAGS += -Wc++-compat -#CC_FLAGS += -Wcast-qual -#CC_FLAGS += -Wconversion -#CC_FLAGS += -Wjump-misses-init -#CC_FLAGS += -pedantic - -# Include LUFA-specific DMBS extension modules -DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA -include $(DMBS_LUFA_PATH)/lufa-sources.mk -include $(DMBS_LUFA_PATH)/lufa-gcc.mk - -# Include common DMBS build system modules -DMBS_PATH ?= $(LUFA_PATH)/Build/DMBS/DMBS -include $(DMBS_PATH)/core.mk -include $(DMBS_PATH)/gcc.mk |