diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-08-02 23:14:30 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-08-02 23:14:30 +0000 |
| commit | dd9759b75d0391b7d407f12444b5b4f041b5a336 (patch) | |
| tree | c004a065e075faa73c78c16ee02399e320b5cf1f /Projects | |
| parent | d210bc9ddc438699cc31a365a6ede821dac8331e (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@712 d5102386-fcda-11dd-9fdb-3debd5008f28
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 79261e7e..b66c991b 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 634d56bb..88c62e9e 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 7aa64661..d4c5472d 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 b308d833..474a827a 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)" |