X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d4ca7fb44c7d326b96cf391f0275dc323dbe24de..a9e0935a90346beb0c981924becc1f55d969a08b:/Projects/AVRISP-MKII/Lib/V2Protocol.h?ds=sidebyside

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 7ed8a0e55..7ad896da8 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this 
   software and its documentation for any purpose is hereby granted
@@ -37,14 +37,16 @@
 #define _V2_PROTOCOL_
 
 	/* Includes: */
-		#include <LUFA/Drivers/USB/USB.h>
-		#include <LUFA/Drivers/Peripheral/SPI.h>
-		
-		#include "../Descriptors.h"
-		#include "V2ProtocolConstants.h"
-		#include "V2ProtocolParams.h"
-		#include "ISP/ISPProtocol.h"
-		#include "XPROG/XPROGProtocol.h"
+		#if !defined(__ASSEMBLER__)
+			#include <LUFA/Drivers/USB/USB.h>
+			#include <LUFA/Drivers/Peripheral/SPI.h>
+			
+			#include "../Descriptors.h"
+			#include "V2ProtocolConstants.h"
+			#include "V2ProtocolParams.h"
+			#include "ISP/ISPProtocol.h"
+			#include "XPROG/XPROGProtocol.h"
+		#endif
 
 	/* Preprocessor Checks: */
 		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
@@ -56,28 +58,47 @@
 		#endif
 
 	/* Macros: */
+		#if !defined(__DOXYGEN__)
+			#define _GETADCMUXMASK2(x, y)       x ## y
+			#define _GETADCMUXMASK(x, y)        _GETADCMUXMASK2(x, y)
+		#endif
+
 		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
-		#define PROGRAMMER_ID       "AVRISP_MK2"
+		#define PROGRAMMER_ID              "AVRISP_MK2"
 		
 		/** Timeout period for each issued command from the host before it is aborted */
-		#define COMMAND_TIMEOUT_MS   200
+		#define COMMAND_TIMEOUT_MS         200
 		
 		/** Command timeout counter register, GPIOR for speed */
-		#define TimeoutMSRemaining   GPIOR0
+		#define TimeoutMSRemaining         GPIOR0
+
+		/** MUX mask for the VTARGET ADC channel number */
+		#define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)
+		
+		#if !defined(WIN_AVRDUDE_COMPAT)
+			#define SELECT_DATA_OUT_ENDPOINT() Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);
+		#else
+			#define SELECT_DATA_OUT_ENDPOINT() Endpoint_SelectEndpoint();
+		#endif
 
 	/* External Variables: */
-		extern uint32_t CurrentAddress;
-		extern bool     MustSetAddress;
+		#if !defined(__ASSEMBLER__)
+			extern uint32_t CurrentAddress;
+			extern bool     MustSetAddress;
+		#endif
 
 	/* Function Prototypes: */
-		void V2Protocol_ProcessCommand(void);
-		
-		#if defined(INCLUDE_FROM_V2PROTOCOL_C)
-			static void V2Protocol_UnknownCommand(uint8_t V2Command);
-			static void V2Protocol_SignOn(void);
-			static void V2Protocol_GetSetParam(uint8_t V2Command);
-			static void V2Protocol_ResetProtection(void);
-			static void V2Protocol_LoadAddress(void);
+		#if !defined(__ASSEMBLER__)
+			void V2Protocol_Init(void);
+			void V2Protocol_ProcessCommand(void);
+			
+			#if defined(INCLUDE_FROM_V2PROTOCOL_C)
+				static void V2Protocol_UnknownCommand(const uint8_t V2Command);
+				static void V2Protocol_SignOn(void);
+				static void V2Protocol_GetSetParam(const uint8_t V2Command);
+				static void V2Protocol_ResetProtection(void);
+				static void V2Protocol_LoadAddress(void);
+			#endif
 		#endif
 
 #endif