diff options
author | Dean Camera <[email protected]> | 2009-08-02 23:14:30 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-08-02 23:14:30 +0000 |
commit | 6f4cc344ab47b720651e5bbf7674951c32e210b1 (patch) | |
tree | c004a065e075faa73c78c16ee02399e320b5cf1f /Projects | |
parent | bbf89d81fa225fedc5ab1190ebfa8c775612178c (diff) | |
download | qmk_firmware-6f4cc344ab47b720651e5bbf7674951c32e210b1.tar.gz qmk_firmware-6f4cc344ab47b720651e5bbf7674951c32e210b1.zip |
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.
Diffstat (limited to 'Projects')
-rw-r--r-- | Projects/Benito/Descriptors.c | 2 | ||||
-rw-r--r-- | Projects/Benito/makefile | 2 | ||||
-rw-r--r-- | Projects/Magstripe/Descriptors.c | 2 | ||||
-rw-r--r-- | Projects/Magstripe/makefile | 2 |
4 files changed, 4 insertions, 4 deletions
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)" |