From 0e4ece1d1d5626371059ab00bc502fb05a9df125 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 19 Feb 2012 13:30:08 +0000 Subject: [PATCH] Update build test "ModuleTest" to check platform drivers where possible. Add missing copyright/license headers. --- BuildTests/ModuleTest/Dummy.S | 33 +++++++++++++++++++++++++ BuildTests/ModuleTest/Modules.h | 35 ++++++++++++++++++++++++++- BuildTests/ModuleTest/Test_C.c | 30 +++++++++++++++++++++++ BuildTests/ModuleTest/Test_CPP.cpp | 30 +++++++++++++++++++++++ BuildTests/ModuleTest/makefile | 6 +++++ BuildTests/ModuleTest/makefile.uc3 | 5 ++-- BuildTests/SingleUSBModeTest/Dummy.S | 3 +++ BuildTests/SingleUSBModeTest/makefile | 6 +++++ LUFA.pnproj | 2 +- makefile | 2 -- 10 files changed, 146 insertions(+), 6 deletions(-) diff --git a/BuildTests/ModuleTest/Dummy.S b/BuildTests/ModuleTest/Dummy.S index 560ca53dc5..bc13b31eb1 100644 --- a/BuildTests/ModuleTest/Dummy.S +++ b/BuildTests/ModuleTest/Dummy.S @@ -1,3 +1,36 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2012. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2012 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 disclaim 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: diff --git a/BuildTests/ModuleTest/Modules.h b/BuildTests/ModuleTest/Modules.h index 9de4d7860f..6f50a996c8 100644 --- a/BuildTests/ModuleTest/Modules.h +++ b/BuildTests/ModuleTest/Modules.h @@ -1,3 +1,33 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2012. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2012 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 disclaim 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 #include @@ -14,6 +44,9 @@ #include #include #include -#elif (ARCH == ARCH_UC3) + #include +#elif (ARCH == ARCH_UC3) + #include + #include #endif \ No newline at end of file diff --git a/BuildTests/ModuleTest/Test_C.c b/BuildTests/ModuleTest/Test_C.c index f15315647a..6cbf8fac54 100644 --- a/BuildTests/ModuleTest/Test_C.c +++ b/BuildTests/ModuleTest/Test_C.c @@ -1 +1,31 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2012. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2012 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 disclaim 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 "Modules.h" \ No newline at end of file diff --git a/BuildTests/ModuleTest/Test_CPP.cpp b/BuildTests/ModuleTest/Test_CPP.cpp index f15315647a..6cbf8fac54 100644 --- a/BuildTests/ModuleTest/Test_CPP.cpp +++ b/BuildTests/ModuleTest/Test_CPP.cpp @@ -1 +1,31 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2012. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2012 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 disclaim 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 "Modules.h" \ No newline at end of file diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile index fafdbc0bf4..7706ca6166 100644 --- a/BuildTests/ModuleTest/makefile +++ b/BuildTests/ModuleTest/makefile @@ -13,6 +13,9 @@ # application. all: + @echo Executing build test "ModuleTest". + @echo + $(MAKE) -f makefile.avr8 clean $(MAKE) -f makefile.avr8 @@ -22,6 +25,9 @@ all: $(MAKE) -f makefile.uc3 clean $(MAKE) -f makefile.uc3 + @echo Build test "ModuleTest" complete. + @echo + clean: $(MAKE) -f makefile.avr8 clean $(MAKE) -f makefile.xmega clean diff --git a/BuildTests/ModuleTest/makefile.uc3 b/BuildTests/ModuleTest/makefile.uc3 index 5f5941deb4..610de46ede 100644 --- a/BuildTests/ModuleTest/makefile.uc3 +++ b/BuildTests/ModuleTest/makefile.uc3 @@ -120,7 +120,8 @@ CPPSRC = Test_CPP.cpp # Even though the DOS/Win* filesystem matches both .s and .S the same, # it will preserve the spelling of the filenames, and gcc itself does # care about how the name is spelled on its command-line. -ASRC = Dummy.S +ASRC = Dummy.S \ + $(LUFA_PATH)/LUFA/Platform/UC3/Exception.S # Optimization level, can be [0, 1, 2, 3, s]. @@ -225,7 +226,7 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) # files -- see avr-libc docs [FIXME: not yet described there] # -listing-cont-lines: Sets the maximum number of continuation lines of hex # dump that will be displayed for a given single line of source input. -ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100 +ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst) #---------------- Linker Options ---------------- diff --git a/BuildTests/SingleUSBModeTest/Dummy.S b/BuildTests/SingleUSBModeTest/Dummy.S index 9739e921fb..bc13b31eb1 100644 --- a/BuildTests/SingleUSBModeTest/Dummy.S +++ b/BuildTests/SingleUSBModeTest/Dummy.S @@ -28,6 +28,9 @@ this software. */ +.section .text + + # Mandatory entry point for successful compilation and link .global main main: diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile index 9697ee6bfb..c147d6236c 100644 --- a/BuildTests/SingleUSBModeTest/makefile +++ b/BuildTests/SingleUSBModeTest/makefile @@ -13,6 +13,9 @@ # application. all: + @echo Executing build test "SingleUSBModeTest". + @echo + $(MAKE) -f makefile.avr8 clean $(MAKE) -f makefile.avr8 LUFA_OPTS='-D USB_DEVICE_ONLY' $(MAKE) -f makefile.avr8 clean @@ -26,6 +29,9 @@ all: $(MAKE) -f makefile.uc3 clean $(MAKE) -f makefile.uc3 LUFA_OPTS='-D USB_HOST_ONLY' + @echo Build test "SingleUSBModeTest" complete. + @echo + clean: $(MAKE) -f makefile.avr8 clean $(MAKE) -f makefile.xmega clean diff --git a/LUFA.pnproj b/LUFA.pnproj index 6b7ad172ac..6911934e07 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/makefile b/makefile index 7ca9cc3781..fd7e5c0e87 100644 --- a/makefile +++ b/makefile @@ -21,7 +21,5 @@ all: $(MAKE) -C Demos $@ -s $(MAKE) -C Projects $@ -s $(MAKE) -C Bootloaders $@ -s - $(MASK) -C BuildTests $@ -s @echo @echo LUFA \"make $@\" operation complete. -