diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-06-02 15:50:10 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-06-02 15:50:10 +0000 |
| commit | 6ee07926c92c48b06442b053ced49d8525765756 (patch) | |
| tree | 5d6824d6ebd22dfc100dc50d09cb91b3ed566202 | |
| parent | efc2126330227af8eb9894cf16ad4908e14fbc22 (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2283 d5102386-fcda-11dd-9fdb-3debd5008f28
| -rw-r--r-- | LUFA/Drivers/USB/Core/USBMode.h | 6 | ||||
| -rw-r--r-- | LUFA/makefile | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h index f62c8c15..02c4ec32 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 8129befd..fe1cc4f7 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) |