diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-02 23:14:30 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-02 23:14:30 +0000 |
| commit | 6f4cc344ab47b720651e5bbf7674951c32e210b1 (patch) | |
| tree | c004a065e075faa73c78c16ee02399e320b5cf1f /LUFA/Drivers/USB | |
| parent | bbf89d81fa225fedc5ab1190ebfa8c775612178c (diff) | |
| download | lufa-6f4cc344ab47b720651e5bbf7674951c32e210b1.tar.gz lufa-6f4cc344ab47b720651e5bbf7674951c32e210b1.tar.bz2 lufa-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 'LUFA/Drivers/USB')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/HID.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/DevChapter9.c | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/DevChapter9.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c index fbb45acd2..40f7d2f49 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.c +++ b/LUFA/Drivers/USB/Class/Device/HID.c @@ -136,8 +136,8 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
{
memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));
- HIDInterfaceInfo->State.IdleCount = 500;
HIDInterfaceInfo->State.UsingReportProtocol = true;
+ HIDInterfaceInfo->State.IdleCount = 500;
if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber, EP_TYPE_INTERRUPT,
ENDPOINT_DIR_IN, HIDInterfaceInfo->Config.ReportINEndpointSize, ENDPOINT_BANK_SINGLE)))
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index 793b55f9b..7fecd1f54 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -141,8 +141,8 @@ static void USB_Device_SetConfiguration(void) {
bool AlreadyConfigured = (USB_ConfigurationNumber != 0);
-#if defined(TOTAL_NUM_CONFIGURATIONS)
- if ((uint8_t)USB_ControlRequest.wValue > TOTAL_NUM_CONFIGURATIONS)
+#if defined(FIXED_NUM_CONFIGURATIONS)
+ if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
return;
#else
#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h index 55e3b8253..a856dede4 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h @@ -51,7 +51,7 @@ /* Public Interface - May be used in end-application: */
/* Macros: */
#if defined(USE_SINGLE_DEVICE_CONFIGURATION)
- #define TOTAL_NUM_CONFIGURATIONS 1
+ #define FIXED_NUM_CONFIGURATIONS 1
#endif
/* Enums: */
|