aboutsummaryrefslogtreecommitdiff
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2010-05-13 12:57:49 +0000
committerDean Camera <[email protected]>2010-05-13 12:57:49 +0000
commit34047efc7ee3bd765574d2ce709712ff27c7b2fd (patch)
tree9eb5d158adb51bdeaf0a93a230ebb50f7cab11a6 /LUFA
parent571159df1b9b86fc76d12a02fc1e172bd202305a (diff)
downloadqmk_firmware-34047efc7ee3bd765574d2ce709712ff27c7b2fd.tar.gz
qmk_firmware-34047efc7ee3bd765574d2ce709712ff27c7b2fd.zip
Remove incorrect check for the current device state in the Set Configuration request handler of DevChapter9, which broke Set Configuration requests to the device under most circumstances.
Move out the SPI prescaler list to a PROGMEM module-level variable in ISPTarget.c.
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/Drivers/USB/LowLevel/DevChapter9.c3
-rw-r--r--LUFA/ManPages/ChangeLog.txt2
2 files changed, 2 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index f44cf0ba41..1529b6f138 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -145,9 +145,6 @@ static void USB_Device_SetAddress(void)
static void USB_Device_SetConfiguration(void)
{
- if (USB_DeviceState != DEVICE_STATE_Addressed)
- return;
-
#if defined(FIXED_NUM_CONFIGURATIONS)
if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
return;
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index eb8c1e4a6c..f04fbe437f 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -20,6 +20,8 @@
* - Fixed AVRISP-MKII clone project not correctly issuing LOAD EXTENDED ADDRESS commands when the extended address
* boundary is crossed during programming or readback (thanks to Gerard Sexton)
* - Fixed warnings when building the AVRISP-MKII clone project with the ENABLE_XPROG_PROTOCOL compile time option disabled
+ * - Remove incorrect check for the current device state in the Set Configuration request handler of DevChapter9, which broke
+ * Set Configuration requests to the device under most circumstances.
*
* \section Sec_ChangeLog100512 Version 100512
*