Board Reset BugFix (#1)

Prevent a Bug that seems to be caused by re-configuration of the usb device.

Manifestation of the bug is that (in the worst-case) only one download to the target can be performed. After that, the programmer is unresponsive and a reset of the programmer/target is required.

Author: KillerLink

src/CUSBCommunication.cpp

@@ -33,6 +33,7 @@ CUSBCommunication::CUSBCommunication(string device) : transfer(NULL), isoReceive
 	libusb_device **deviceList;
 	int busNr = 0;
 	int deviceNr = 0;
+	int currentConfig = -1;
 
 	// parse device string, should look like "bus:device"
 	if (device.length() != 0) {
@@ -119,10 +120,22 @@ CUSBCommunication::CUSBCommunication(string device) : transfer(NULL), isoReceive
 		throw USBCommunicationException("Device not found");
 	}
 
-	// configure the device
-	ret = libusb_set_configuration(dev, 1);
+	// get current device configuration
+	ret = libusb_get_configuration(dev, &currentConfig);
 	if (ret != LIBUSB_SUCCESS) {
-		throw USBCommunicationException("Setting Configuration failed");
+		throw USBCommunicationException("Getting Configuration failed");
+	}
+
+	// configure the device, if necessary
+	if (currentConfig != USB_DEVICE_TARGET_CONFIGURATION) {
+		COut::d("Updating USB configuration from " 
+			+ CFormat::intToString(currentConfig)
+			+ " to " 
+			+ CFormat::intToString(USB_DEVICE_TARGET_CONFIGURATION));	
+		ret = libusb_set_configuration(dev, USB_DEVICE_TARGET_CONFIGURATION);
+		if (ret != LIBUSB_SUCCESS) {
+			throw USBCommunicationException("Setting Configuration failed");
+		}
 	}
 
 	// connect to interface 0

src/CUSBCommunication.h

@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "avrprog.h"
 #include "ExceptionBase.h"
 
+#define	USB_DEVICE_TARGET_CONFIGURATION (1)
+
 using namespace std;
 
 /**