summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-04-24 11:26:06 +0900
committertmk <nobody@nowhere>2014-04-24 11:26:06 +0900
commit3c5add5f800daaeaf0abc28eae8b3c244bcc1126 (patch)
treef7d73e5d114e8964e30c32d7a9f66d1ef08eeb22
parenta5d4a1f3e1f09a79ad949e7e90199548992f0e37 (diff)
Change LUFA build options
-rw-r--r--keyboard/hhkb/Makefile2
-rw-r--r--protocol/lufa.mk10
-rw-r--r--protocol/lufa/descriptor.c4
3 files changed, 10 insertions, 6 deletions
diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 89d05ba159..0a256874b4 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -102,7 +102,7 @@ ARCH = AVR8
F_USB = $(F_CPU)
# Interrupt driven control endpoint task
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes*
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 3489f19c2c..10a922f902 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -2,6 +2,7 @@ LUFA_DIR = protocol/lufa
# Path to the LUFA library
LUFA_PATH ?= protocol/lufa/LUFA-120730
+#LUFA_PATH ?= protocol/lufa/LUFA-130901
# Create the LUFA source path variables by including the LUFA makefile
ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
@@ -30,9 +31,12 @@ VPATH += $(TOP_DIR)/$(LUFA_PATH)
#endif
# LUFA library compile-time options and predefined tokens
-LUFA_OPTS = -D USB_DEVICE_ONLY
-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS = -DUSB_DEVICE_ONLY
+LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
+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 += -DARCH=ARCH_$(ARCH)
diff --git a/protocol/lufa/descriptor.c b/protocol/lufa/descriptor.c
index d97f5d86a8..d88b59654c 100644
--- a/protocol/lufa/descriptor.c
+++ b/protocol/lufa/descriptor.c
@@ -235,7 +235,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.SubClass = USB_CSCP_NoDeviceSubclass,
.Protocol = USB_CSCP_NoDeviceProtocol,
- .Endpoint0Size = 8,
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
/* specified in config.h */
.VendorID = VENDOR_ID,
@@ -246,7 +246,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.ProductStrIndex = 0x02,
.SerialNumStrIndex = NO_DESCRIPTOR,
- .NumberOfConfigurations = 1
+ .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
/*******************************************************************************