From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 22 Jul 2010 12:34:32 +0000 (+0000)
Subject: Future proof the XPROG protocol of the AVRISP-MKII project, so that non PDI and TPI... 
X-Git-Tag: LUFA-110528-BETA~323
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/2461ae508c32914ff8aa0920ed99d4fceb18b141?ds=inline

Future proof the XPROG protocol of the AVRISP-MKII project, so that non PDI and TPI requests return failure.
---

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
index 84d82bc5f..0f5269db9 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -115,7 +115,7 @@ static void XPROGProtocol_EnterXPROGMode(void)
 	Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
-	bool NVMBusEnabled;
+	bool NVMBusEnabled = false;
 
 	if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
 	{
@@ -138,7 +138,7 @@ static void XPROGProtocol_EnterXPROGMode(void)
 		/* Wait until the NVM bus becomes active */
 		NVMBusEnabled = XMEGANVM_WaitWhileNVMBusBusy();
 	}
-	else
+	else if (XPROG_SelectedProtocol == XPRG_PROTOCOL_TPI)
 	{
 		/* Enable TPI programming mode with the attached target */
 		XPROGTarget_EnableTargetTPI();