Ensure that USB_DEVICE_ONLY or USB_HOST_ONLY is properly set for devices that physica...

diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index f62c8c1..02c4ec3 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -239,8 +239,12 @@
                                #define USB_CAN_BE_DEVICE
                        #endif
 
                                #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
                                #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)
                        #endif
 
                        #if defined(USB_HOST_ONLY)

diff --git a/LUFA/makefile b/LUFA/makefile
index 8129bef..fe1cc4f 100644 (file)
--- 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)
 
 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=%) *
 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}
   
   LUFA_PATH           = .
   ARCH                = {AVR8,UC3,XMEGA}
   

-  all:
-

   clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)
   clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)