mirror/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-09-10 17:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed default value for the reset polarity parameter in the AVRISP-MKII project so that it defaults to active low drive.

Browse Source 
Fixed incorrect USB_DeviceState value when unconfiguring the device without an address set.
This commit is contained in:
Dean Camera
2010-09-29 13:56:52 +00:00
parent c0e4f52e8f
commit a509729b2d
7 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
View File

@@ -191,7 +191,10 @@ static void USB_Device_SetConfiguration(void)
Endpoint_ClearStatusStage();
USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
if (USB_ConfigurationNumber)
USB_DeviceState = DEVICE_STATE_Configured;
else
USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
EVENT_USB_Device_ConfigurationChanged();
}

8
LUFA/Drivers/USB/LowLevel/Device.h
View File

@@ -223,7 +223,13 @@
{
UDADDR = ((UDADDR & (1 << ADDEN)) | (Address & 0x7F));
UDADDR |= (1 << ADDEN);
}
}
static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE;
static inline bool USB_Device_IsAddressSet(void)
{
return (UDADDR & (1 << ADDEN));
}
#endif
#endif

7
LUFA/Drivers/USB/LowLevel/USBInterrupt.c
View File

@@ -128,11 +128,14 @@ ISR(USB_GEN_vect, ISR_BLOCK)
USB_INT_Disable(USB_INT_WAKEUPI);
USB_INT_Enable(USB_INT_SUSPI);
if (USB_ConfigurationNumber)
USB_DeviceState = DEVICE_STATE_Configured;
else
USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
EVENT_USB_Device_Connect();
#else
USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
EVENT_USB_Device_WakeUp();
#endif
}