eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

This commit is contained in:
Dean Camera 2012-06-02 15:50:10 +00:00
parent a9bb2d5488
commit 5ce60f25e6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LUFA/Drivers/USB/Core/USBMode.h
View File

@ -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)

4
LUFA/makefile
View File

@ -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)