From 6f4cc344ab47b720651e5bbf7674951c32e210b1 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 2 Aug 2009 23:14:30 +0000 Subject: Rename TOTAL_NUM_CONFIGURATIONS to FIXED_NUM_CONFIGURATIONS, to match the existing FIXED_CONTROL_ENDPOINT_SIZE compile time option. Add FIXED_NUM_CONFIGURATIONS to the descriptors of each project using the option. --- Projects/Benito/Descriptors.c | 2 +- Projects/Benito/makefile | 2 +- Projects/Magstripe/Descriptors.c | 2 +- Projects/Magstripe/makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Projects') diff --git a/Projects/Benito/Descriptors.c b/Projects/Benito/Descriptors.c index 79261e7e04..b66c991b6e 100644 --- a/Projects/Benito/Descriptors.c +++ b/Projects/Benito/Descriptors.c @@ -61,7 +61,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .ProductStrIndex = 0x02, .SerialNumStrIndex = USE_INTERNAL_SERIAL, - .NumberOfConfigurations = 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile index 634d56bb98..88c62e9e82 100644 --- a/Projects/Benito/makefile +++ b/Projects/Benito/makefile @@ -126,7 +126,7 @@ LUFA_PATH = ../../ LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D USB_DEVICE_ONLY LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1 +LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c index 7aa646613b..d4c5472d08 100644 --- a/Projects/Magstripe/Descriptors.c +++ b/Projects/Magstripe/Descriptors.c @@ -95,7 +95,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .ProductStrIndex = 0x02, .SerialNumStrIndex = USE_INTERNAL_SERIAL, - .NumberOfConfigurations = 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile index b308d833cf..474a827a5d 100644 --- a/Projects/Magstripe/makefile +++ b/Projects/Magstripe/makefile @@ -126,7 +126,7 @@ LUFA_PATH = ../.. LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D USB_DEVICE_ONLY LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1 +LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -- cgit v1.2.3