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. --- Bootloaders/CDC/Descriptors.c | 2 +- Bootloaders/CDC/makefile | 2 +- Bootloaders/DFU/Descriptors.c | 2 +- Bootloaders/DFU/makefile | 2 +- Bootloaders/TeensyHID/Descriptors.c | 2 +- Bootloaders/TeensyHID/makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Bootloaders') diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index 0e2b3c79e..089bd7a93 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -61,7 +61,7 @@ USB_Descriptor_Device_t DeviceDescriptor = .ProductStrIndex = 0x01, .SerialNumStrIndex = NO_DESCRIPTOR, - .NumberOfConfigurations = 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in SRAM memory, describes the usage diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 43341a6d5..91c8845d3 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -119,7 +119,7 @@ LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 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_RAM_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D NO_INTERNAL_SERIAL diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index d8b734b12..1510c7e86 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -61,7 +61,7 @@ USB_Descriptor_Device_t DeviceDescriptor = .ProductStrIndex = 0x01, .SerialNumStrIndex = NO_DESCRIPTOR, - .NumberOfConfigurations = 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index dc275bc65..2f9444b34 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -120,7 +120,7 @@ LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D CONTROL_ONLY_DEVICE LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32 -LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1 +LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_RAM_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D NO_INTERNAL_SERIAL diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c index 99db8cac5..2a4eeb7ac 100644 --- a/Bootloaders/TeensyHID/Descriptors.c +++ b/Bootloaders/TeensyHID/Descriptors.c @@ -81,7 +81,7 @@ USB_Descriptor_Device_t DeviceDescriptor = .ProductStrIndex = 0x01, .SerialNumStrIndex = NO_DESCRIPTOR, - .NumberOfConfigurations = 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile index 9b6c5d7d4..e7e14e7d5 100644 --- a/Bootloaders/TeensyHID/makefile +++ b/Bootloaders/TeensyHID/makefile @@ -120,7 +120,7 @@ LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D CONTROL_ONLY_DEVICE LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 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_RAM_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D NO_INTERNAL_SERIAL -- cgit v1.2.3