From 5ce60f25e68ef73e01c06409b31b75cfbac9ee3f Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sat, 2 Jun 2012 15:50:10 +0000
Subject: 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.

---
 LUFA/Drivers/USB/Core/USBMode.h | 6 +++++-
 LUFA/makefile                   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'LUFA')

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)
-- 
cgit v1.2.3