From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 13 Aug 2013 19:01:42 +0000 (+0200)
Subject: Fixed re-enumeration issue of XMEGA architecture targets.
X-Git-Tag: LUFA-130901-BETA~13
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/ea5851355892fceefc28181c14307c481b30e354?hp=-c

Fixed re-enumeration issue of XMEGA architecture targets.
---

ea5851355892fceefc28181c14307c481b30e354
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,