gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 21:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors in the SingleUSBModeTest build test. Fix logic errors in USBMode.h.

Browse Source
This commit is contained in:
Dean Camera 2012-06-06 19:39:38 +00:00
parent 0c012ede5f
commit 940145ca6d
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BuildTests/SingleUSBModeTest/Dummy.S
View File

@ -34,7 +34,8 @@
# Mandatory entry point for successful compilation and link # Mandatory entry point for successful compilation and link
.global main .global main
main: main:
# Force code generation of the base USB stack
call USB_Init
# Mandatory callback needed for base compile of the USB driver # Mandatory callback needed for base compile of the USB driver
.global CALLBACK_USB_GetDescriptor .global CALLBACK_USB_GetDescriptor

10
BuildTests/SingleUSBModeTest/makefile
View File

@ -25,13 +25,13 @@ end:
@echo @echo
compile: compile:
$(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CCFLAGS='-D USB_DEVICE_ONLY' $(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_DEVICE_ONLY'
$(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CCFLAGS='-D USB_HOST_ONLY' $(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_HOST_ONLY'
$(MAKE) -s -f makefile.test clean elf ARCH=XMEGA MCU=atxmega128a1u CCFLAGS='-D USB_DEVICE_ONLY' $(MAKE) -s -f makefile.test clean elf ARCH=XMEGA MCU=atxmega128a1u CC_FLAGS='-D USB_DEVICE_ONLY'
$(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CCFLAGS='-D USB_DEVICE_ONLY' $(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_DEVICE_ONLY'
$(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CCFLAGS='-D USB_HOST_ONLY' $(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_HOST_ONLY'
clean: clean:
$(MAKE) -s -f makefile.test clean ARCH=AVR8 MCU=at90usb1287 $(MAKE) -s -f makefile.test clean ARCH=AVR8 MCU=at90usb1287

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

@ -239,12 +239,14 @@
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#endif #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 #if !defined(USB_DEVICE_ONLY)
#elif ( defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST)) #define USB_DEVICE_ONLY
#define USB_DEVICE_ONLY #endif
#elif (!defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST)) #elif (!defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
#define USB_HOST_ONLY #if !defined(USB_HOST_ONLY)
#define USB_HOST_ONLY
#endif
#endif #endif
#if defined(USB_HOST_ONLY) #if defined(USB_HOST_ONLY)