aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-08-13 21:01:42 +0200
committerDean Camera <dean@fourwalledcubicle.com>2013-08-13 21:01:42 +0200
commitea5851355892fceefc28181c14307c481b30e354 (patch)
treeb38e94ab51692d4d062635755b7ba374acc704b4
parenta4a6958524adab55b5306df7c9a5de70b359dfa1 (diff)
downloadlufa-ea5851355892fceefc28181c14307c481b30e354.tar.gz
lufa-ea5851355892fceefc28181c14307c481b30e354.tar.bz2
lufa-ea5851355892fceefc28181c14307c481b30e354.zip
Fixed re-enumeration issue of XMEGA architecture targets.
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt1
-rw-r--r--LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 673cb7d93..924aebf91 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -41,6 +41,7 @@
* under some circumstances
* - Fixed incorrect USB device state set when a suspended LUFA device is woken while addressed but not configured (thanks to Balaji Krishnan)
* - Fixed broken USART SPI driver for the AVR8 architecture due to incorrect initialization
+ * - Fixed re-enumeration issue of XMEGA architecture targets (thanks to xjedlins)
* - Library Applications:
* - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an
* unknown SCSI command
diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c
index 209bf9491..9651193a3 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c
+++ b/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c
@@ -93,7 +93,7 @@ ISR(USB_BUSEVENT_vect)
USB_DeviceState = DEVICE_STATE_Default;
USB_Device_ConfigurationNumber = 0;
- USB_Device_SetDeviceAddress(0);
+ USB_Device_EnableDeviceAddress(0);
Endpoint_ClearEndpoints();
Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,