aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-06-02 15:50:10 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-06-02 15:50:10 +0000
commit5ce60f25e68ef73e01c06409b31b75cfbac9ee3f (patch)
tree5d6824d6ebd22dfc100dc50d09cb91b3ed566202 /LUFA
parenta9bb2d5488f3ec6adff75299ce638673d56bb31b (diff)
downloadlufa-5ce60f25e68ef73e01c06409b31b75cfbac9ee3f.tar.gz
lufa-5ce60f25e68ef73e01c06409b31b75cfbac9ee3f.tar.bz2
lufa-5ce60f25e68ef73e01c06409b31b75cfbac9ee3f.zip
Ensure that USB_DEVICE_ONLY or USB_HOST_ONLY is properly set for devices that physically do not support a particular mode. Fix main LUFA library makefile default target.
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/Drivers/USB/Core/USBMode.h6
-rw-r--r--LUFA/makefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index f62c8c152..02c4ec321 100644
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -239,8 +239,12 @@
#define USB_CAN_BE_DEVICE
#endif
- #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
+ #if ( defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
#define USB_CAN_BE_BOTH
+ #elif ( defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
+ #define USB_DEVICE_ONLY
+ #elif (!defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
+ #define USB_HOST_ONLY
#endif
#if defined(USB_HOST_ONLY)
diff --git a/LUFA/makefile b/LUFA/makefile
index 8129befdf..fe1cc4f72 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -13,6 +13,8 @@ LUFA_VERSION_NUM = $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"'
EXCLUDE_FROM_EXPORT = Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.lss *.lst *.hex *.elf *.bin
DOXYGEN_OVERRIDE_PARAMS = PROJECT_NUMBER=$(LUFA_VERSION_NUM)
+all:
+
export_tar:
@echo Exporting LUFA library to a TAR archive...
@tar -cf LUFA_$(LUFA_VERSION_NUM).tar --directory=. $(EXCLUDE_FROM_EXPORT:%=--exclude=%) *
@@ -33,8 +35,6 @@ else
LUFA_PATH = .
ARCH = {AVR8,UC3,XMEGA}
- all:
-
clean:
rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)