g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change LUFA build options

daktil_thumb_popravljen
tmk 2014-04-24 11:26:06 +09:00
parent a5d4a1f3e1
commit 3c5add5f80
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboard/hhkb/Makefile
View File

@ -102,7 +102,7 @@ ARCH = AVR8
F_USB = $(F_CPU) F_USB = $(F_CPU)
# Interrupt driven control endpoint task # Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Boot Section Size in *bytes*

10
protocol/lufa.mk
View File

@ -2,6 +2,7 @@ LUFA_DIR = protocol/lufa
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH ?= protocol/lufa/LUFA-120730 LUFA_PATH ?= protocol/lufa/LUFA-120730
#LUFA_PATH ?= protocol/lufa/LUFA-130901
# Create the LUFA source path variables by including the LUFA makefile # Create the LUFA source path variables by including the LUFA makefile
ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
@ -30,9 +31,12 @@ VPATH += $(TOP_DIR)/$(LUFA_PATH)
#endif #endif
# LUFA library compile-time options and predefined tokens # LUFA library compile-time options and predefined tokens
LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS = -DUSB_DEVICE_ONLY
LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
#LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
OPT_DEFS += -DF_USB=$(F_USB)UL OPT_DEFS += -DF_USB=$(F_USB)UL
OPT_DEFS += -DARCH=ARCH_$(ARCH) OPT_DEFS += -DARCH=ARCH_$(ARCH)

4
protocol/lufa/descriptor.c
View File

@ -235,7 +235,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.SubClass = USB_CSCP_NoDeviceSubclass, .SubClass = USB_CSCP_NoDeviceSubclass,
.Protocol = USB_CSCP_NoDeviceProtocol, .Protocol = USB_CSCP_NoDeviceProtocol,
.Endpoint0Size = 8, .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
/* specified in config.h */ /* specified in config.h */
.VendorID = VENDOR_ID, .VendorID = VENDOR_ID,
@ -246,7 +246,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.ProductStrIndex = 0x02, .ProductStrIndex = 0x02,
.SerialNumStrIndex = NO_DESCRIPTOR, .SerialNumStrIndex = NO_DESCRIPTOR,
.NumberOfConfigurations = 1 .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
}; };
/******************************************************************************* /*******************************************************************************