X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/071e02c6b6b4837fa9cf0b6d4c749994e02638d7..6bda628718f67c04ed43e8328f55bdce5319c504:/Projects/AVRISP-MKII/Lib/V2Protocol.h

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 0f0794b5c..a4248ddec 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -63,16 +63,16 @@
 			#define _GETADCMUXMASK(x, y)        _GETADCMUXMASK2(x, y)
 		#endif
 
-		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
+		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing. */
 		#define PROGRAMMER_ID              "AVRISP_MK2"
 		
-		/** Timeout period for each issued command from the host before it is aborted */
-		#define COMMAND_TIMEOUT_MS         200
+		/** Timeout period for each issued command from the host before it is aborted (in 10ms ticks). */
+		#define COMMAND_TIMEOUT_TICKS      100
 		
-		/** Command timeout counter register, GPIOR for speed */
-		#define TimeoutMSRemaining         GPIOR0
+		/** Command timeout counter register, GPIOR for speed. */
+		#define TimeoutTicksRemaining      GPIOR1
 
-		/** MUX mask for the VTARGET ADC channel number */
+		/** MUX mask for the VTARGET ADC channel number. */
 		#define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)
 		
 		#if !defined(WIN_AVRDUDE_COMPAT)
@@ -84,7 +84,7 @@
 	/* External Variables: */
 		#if !defined(__ASSEMBLER__)
 			extern uint32_t CurrentAddress;
-			extern bool     MustSetAddress;
+			extern bool     MustLoadExtendedAddress;
 		#endif
 
 	/* Function Prototypes: */