X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7ae91099e9b356d3f9fe14b41a53a6af1161690c..12a01ed72d0d6dbf243160302314870e7b29cc07:/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
index 24305dc20..805eaa31f 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -124,9 +124,9 @@ static void XPROGProtocol_EnterXPROGMode(void)
 		XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);	
 		XPROGTarget_SendByte(PDI_RESET_KEY);
 
-		/* Lower direction change guard time to 8 USART bits */
+		/* Lower direction change guard time to 0 USART bits */
 		XPROGTarget_SendByte(PDI_CMD_STCS | PDI_CTRL_REG);	
-		XPROGTarget_SendByte(0x04);
+		XPROGTarget_SendByte(0x07);
 
 		/* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */
 		XPROGTarget_SendByte(PDI_CMD_KEY);	
@@ -141,9 +141,9 @@ static void XPROGProtocol_EnterXPROGMode(void)
 		/* Enable TPI programming mode with the attached target */
 		XPROGTarget_EnableTargetTPI();
 		
-		/* Lower direction change guard time to 8 USART bits */
+		/* Lower direction change guard time to 0 USART bits */
 		XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_CTRL_REG);
-		XPROGTarget_SendByte(0x04);
+		XPROGTarget_SendByte(0x07);
 		
 		/* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */
 		XPROGTarget_SendByte(TPI_CMD_SKEY);	
@@ -208,10 +208,10 @@ static void XPROGProtocol_Erase(void)
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	
+	uint8_t EraseCommand;
+
 	if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
-	{
-		uint8_t EraseCommand = XMEGA_NVM_CMD_NOOP;
-	
+	{	
 		/* Determine which NVM command to send to the device depending on the memory to erase */
 		switch (Erase_XPROG_Params.MemoryType)
 		{
@@ -239,6 +239,9 @@ static void XPROGProtocol_Erase(void)
 			case XPRG_ERASE_USERSIG:
 				EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;
 				break;
+			default:
+				EraseCommand = XMEGA_NVM_CMD_NOOP;
+				break;
 		}
 		
 		/* Erase the target memory, indicate timeout if ocurred */
@@ -247,8 +250,13 @@ static void XPROGProtocol_Erase(void)
 	}
 	else
 	{
+		if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)
+		  EraseCommand = TINY_NVM_CMD_CHIPERASE;
+		else
+		  EraseCommand = TINY_NVM_CMD_SECTIONERASE;
+	
 		/* Erase the target memory, indicate timeout if ocurred */
-		if (!(TINYNVM_EraseMemory(TINY_NVM_CMD_CHIPERASE, Erase_XPROG_Params.Address)))
+		if (!(TINYNVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))
 		  ReturnStatus = XPRG_ERR_TIMEOUT;
 	}