Partial Commit: Move AVRISP project out of the Projects\Incomplete directory.

7 files changed, 1283 insertions, 0 deletions

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
new file mode 100644
index 000000000..248c50d24
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -0,0 +1,608 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  V2Protocol handler, to process V2 Protocol commands used in Atmel programmer devices.

+ */

+

+#define  INCLUDE_FROM_V2PROTOCOL_C

+#include "V2Protocol.h"

+

+/** Master V2 Protocol packet handler, for receieved V2 Protocol packets from a connected host.

+ *  This routine decodes the issued command and passes off the handling of the command to the

+ *  appropriate function.

+ */

+void V2Protocol_ProcessCommand(void)
+{
+	uint8_t V2Command = Endpoint_Read_Byte();

+		  

+	switch (V2Command)

+	{

+		case CMD_SIGN_ON:

+			V2Protocol_Command_SignOn();

+			break;

+		case CMD_SET_PARAMETER:

+		case CMD_GET_PARAMETER:

+			V2Protocol_Command_GetSetParam(V2Command);

+			break;

+		case CMD_LOAD_ADDRESS:

+			V2Protocol_Command_LoadAddress();

+			break;

+		case CMD_RESET_PROTECTION:

+			V2Protocol_Command_ResetProtection();

+			break;

+		case CMD_ENTER_PROGMODE_ISP:

+			V2Protocol_Command_EnterISPMode();

+			break;

+		case CMD_LEAVE_PROGMODE_ISP:

+			V2Protocol_Command_LeaveISPMode();

+			break;

+		case CMD_PROGRAM_FLASH_ISP:

+		case CMD_PROGRAM_EEPROM_ISP:

+			V2Protocol_Command_ProgramMemory(V2Command);			

+			break;

+		case CMD_READ_FLASH_ISP:

+		case CMD_READ_EEPROM_ISP:

+			V2Protocol_Command_ReadMemory(V2Command);

+			break;

+		case CMD_CHIP_ERASE_ISP:

+			V2Protocol_Command_ChipErase();

+			break;

+		case CMD_READ_FUSE_ISP:

+		case CMD_READ_LOCK_ISP:

+		case CMD_READ_SIGNATURE_ISP:

+		case CMD_READ_OSCCAL_ISP:

+			V2Protocol_Command_ReadFuseLockSigOSCCAL(V2Command);

+			break;

+		case CMD_PROGRAM_FUSE_ISP:

+		case CMD_PROGRAM_LOCK_ISP:

+			V2Protocol_Command_WriteFuseLock(V2Command);

+			break;

+		case CMD_SPI_MULTI:

+			V2Protocol_Command_SPIMulti();

+			break;

+		default:

+			V2Protocol_Command_Unknown(V2Command);

+			break;

+	}

+	

+	Endpoint_WaitUntilReady();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);
+}
+

+/** Handler for unknown V2 protocol commands. This discards all sent data and returns a

+ *  STATUS_CMD_UNKNOWN status back to the host.

+ *

+ *  \param V2Command  Issued V2 Protocol command byte from the host

+ */

+static void V2Protocol_Command_Unknown(uint8_t V2Command)

+{

+	/* Discard all incomming data */

+	while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)

+	{

+		Endpoint_ClearOUT();

+		Endpoint_WaitUntilReady();

+	}

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	Endpoint_Write_Byte(V2Command);

+	Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_SIGN_ON command, returning the programmer ID string to the host. */
+static void V2Protocol_Command_SignOn(void)

+{

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	Endpoint_Write_Byte(CMD_SIGN_ON);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_Write_Byte(sizeof(PROGRAMMER_ID) - 1);

+	Endpoint_Write_Stream_LE(PROGRAMMER_ID, (sizeof(PROGRAMMER_ID) - 1));

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_SET_PARAMETER and CMD_GET_PARAMETER commands from the host, setting or

+ *  getting a device parameter's value from the parameter table.

+ *

+ *  \param V2Command  Issued V2 Protocol command byte from the host

+ */

+static void V2Protocol_Command_GetSetParam(uint8_t V2Command)

+{

+	uint8_t ParamID = Endpoint_Read_Byte();

+	uint8_t ParamValue;

+	

+	if (V2Command == CMD_SET_PARAMETER)

+	  ParamValue = Endpoint_Read_Byte();

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	Endpoint_Write_Byte(V2Command);

+	

+	uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);

+	

+	if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))

+	{

+		Endpoint_Write_Byte(STATUS_CMD_OK);

+		V2Params_SetParameterValue(ParamID, ParamValue);

+	}

+	else if ((V2Command == CMD_GET_PARAMETER) && (ParamPrivs & PARAM_PRIV_READ))

+	{

+		Endpoint_Write_Byte(STATUS_CMD_OK);

+		Endpoint_Write_Byte(V2Params_GetParameterValue(ParamID));

+	}

+	else

+	{	

+		Endpoint_Write_Byte(STATUS_CMD_FAILED);

+	}

+

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_LOAD_ADDRESS command, loading the given device address into a

+ *  global storage variable for later use, and issuing LOAD EXTENDED ADDRESS commands

+ *  to the attached device as required.

+ */

+static void V2Protocol_Command_LoadAddress(void)

+{

+	Endpoint_Read_Stream_BE(&CurrentAddress, sizeof(CurrentAddress));

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	if (CurrentAddress & (1UL << 31))

+	  V2Protocol_LoadExtendedAddress();

+

+	Endpoint_Write_Byte(CMD_LOAD_ADDRESS);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_RESET_PROTECTION command, currently implemented as a dummy ACK function

+ *  as no ISP short-circuit protection is currently implemented.

+ */

+static void V2Protocol_Command_ResetProtection(void)

+{

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	Endpoint_Write_Byte(CMD_RESET_PROTECTION);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_ClearIN();	

+}

+

+/** Handler for the CMD_ENTER_PROGMODE_ISP command, which attempts to enter programming mode on

+ *  the attached device, returning success or failure back to the host.

+ */

+static void V2Protocol_Command_EnterISPMode(void)

+{

+	struct

+	{

+		uint8_t TimeoutMS;

+		uint8_t PinStabDelayMS;

+		uint8_t ExecutionDelayMS;

+		uint8_t SynchLoops;

+		uint8_t ByteDelay;

+		uint8_t PollValue;

+		uint8_t PollIndex;

+		uint8_t EnterProgBytes[4];

+	} Enter_ISP_Params;

+	

+	Endpoint_Read_Stream_LE(&Enter_ISP_Params, sizeof(Enter_ISP_Params));

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	uint8_t ResponseStatus = STATUS_CMD_FAILED;

+	

+	CurrentAddress = 0;

+

+	V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);	  

+	SPI_Init(V2Protocol_GetSPIPrescalerMask() | SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING | SPI_MODE_MASTER);

+		

+	while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))

+	{

+		uint8_t ResponseBytes[4];

+

+		V2Protocol_ChangeTargetResetLine(true);

+		V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);

+

+		for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)

+		{

+			V2Protocol_DelayMS(Enter_ISP_Params.ByteDelay);

+			ResponseBytes[RByte] = SPI_TransferByte(Enter_ISP_Params.EnterProgBytes[RByte]);

+		}

+		

+		/* Check if polling disabled, or if the polled value matches the expected value */

+		if (!(Enter_ISP_Params.PollIndex) || (ResponseBytes[Enter_ISP_Params.PollIndex - 1] == Enter_ISP_Params.PollValue))

+		{

+			ResponseStatus = STATUS_CMD_OK;

+		}

+		else

+		{

+			V2Protocol_ChangeTargetResetLine(false);

+			V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);

+		}

+	}

+

+	Endpoint_Write_Byte(CMD_ENTER_PROGMODE_ISP);

+	Endpoint_Write_Byte(ResponseStatus);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_LEAVE_ISP command, which releases the target from programming mode. */

+static void V2Protocol_Command_LeaveISPMode(void)

+{

+	struct

+	{

+		uint8_t PreDelayMS;

+		uint8_t PostDelayMS;

+	} Leave_ISP_Params;

+

+	Endpoint_Read_Stream_LE(&Leave_ISP_Params, sizeof(Leave_ISP_Params));

+	

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	V2Protocol_DelayMS(Leave_ISP_Params.PreDelayMS);

+	V2Protocol_ChangeTargetResetLine(false);

+	SPI_ShutDown();

+	V2Protocol_DelayMS(Leave_ISP_Params.PostDelayMS);

+

+	Endpoint_Write_Byte(CMD_LEAVE_PROGMODE_ISP);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_PROGRAM_FLASH_ISP and CMD_PROGRAM_EEPROM_ISP commands, writing out bytes,

+ *  words or pages of data to the attached device.

+ *

+ *  \param V2Command  Issued V2 Protocol command byte from the host

+ */

+static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)

+{

+	struct

+	{

+		uint16_t BytesToWrite;

+		uint8_t  ProgrammingMode;

+		uint8_t  DelayMS;

+		uint8_t  ProgrammingCommands[3];

+		uint8_t  PollValue1;

+		uint8_t  PollValue2;

+		uint8_t  ProgData[512];

+	} Write_Memory_Params;

+	

+	uint8_t* NextWriteByte = Write_Memory_Params.ProgData;

+

+	Endpoint_Read_Stream_LE(&Write_Memory_Params, sizeof(Write_Memory_Params) - sizeof(Write_Memory_Params.ProgData));

+	Write_Memory_Params.BytesToWrite = SwapEndian_16(Write_Memory_Params.BytesToWrite);

+	Endpoint_Read_Stream_LE(&Write_Memory_Params.ProgData, Write_Memory_Params.BytesToWrite);

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	uint8_t  ProgrammingStatus = STATUS_CMD_OK;	

+	uint16_t PollAddress       = 0;

+	uint8_t  PollValue         = (V2Command == CMD_PROGRAM_FLASH_ISP) ? Write_Memory_Params.PollValue1 :

+	                                                                    Write_Memory_Params.PollValue2;

+	if (Write_Memory_Params.ProgrammingMode & PROG_MODE_PAGED_WRITES_MASK)

+	{

+		uint16_t StartAddress = (CurrentAddress & 0xFFFF);

+	

+		/* Paged mode memory programming */

+		for (uint16_t CurrentByte = 0; CurrentByte < Write_Memory_Params.BytesToWrite; CurrentByte++)

+		{

+			bool    IsOddByte   = (CurrentByte & 0x01);

+			uint8_t ByteToWrite = *(NextWriteByte++);

+		

+			if (IsOddByte && (V2Command == CMD_PROGRAM_FLASH_ISP))

+			  Write_Memory_Params.ProgrammingCommands[0] |=  READ_WRITE_HIGH_BYTE_MASK;

+			else

+			  Write_Memory_Params.ProgrammingCommands[0] &= ~READ_WRITE_HIGH_BYTE_MASK;

+			  

+			SPI_SendByte(Write_Memory_Params.ProgrammingCommands[0]);

+			SPI_SendByte(CurrentAddress >> 8);

+			SPI_SendByte(CurrentAddress & 0xFF);

+			SPI_SendByte(ByteToWrite);

+			

+			if (!(PollAddress) && (ByteToWrite != PollValue))

+			{

+				if (IsOddByte && (V2Command == CMD_PROGRAM_FLASH_ISP))

+				  Write_Memory_Params.ProgrammingCommands[2] |= READ_WRITE_HIGH_BYTE_MASK;

+				  

+				PollAddress = (CurrentAddress & 0xFFFF);				

+			}		

+

+			if (IsOddByte || (V2Command == CMD_PROGRAM_EEPROM_ISP))

+			  CurrentAddress++;

+		}

+		

+		/* If the current page must be committed, send the PROGRAM PAGE command to the target */

+		if (Write_Memory_Params.ProgrammingMode & PROG_MODE_COMMIT_PAGE_MASK)

+		{

+			SPI_SendByte(Write_Memory_Params.ProgrammingCommands[1]);

+			SPI_SendByte(StartAddress >> 8);

+			SPI_SendByte(StartAddress & 0xFF);

+			SPI_SendByte(0x00);

+			

+			/* Check if polling is possible, if not switch to timed delay mode */

+			if (!(PollAddress))

+			{

+				Write_Memory_Params.ProgrammingMode &= ~PROG_MODE_PAGED_VALUE_MASK;

+				Write_Memory_Params.ProgrammingMode |=  PROG_MODE_PAGED_TIMEDELAY_MASK;				

+			}

+

+			ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,

+															   Write_Memory_Params.DelayMS, Write_Memory_Params.ProgrammingCommands[2]);

+		}

+	}

+	else

+	{

+		/* Word/byte mode memory programming */

+		for (uint16_t CurrentByte = 0; CurrentByte < Write_Memory_Params.BytesToWrite; CurrentByte++)

+		{

+			bool    IsOddByte   = (CurrentByte & 0x01);

+			uint8_t ByteToWrite = *(NextWriteByte++);

+		

+			if (IsOddByte && (V2Command == CMD_READ_FLASH_ISP))

+			  Write_Memory_Params.ProgrammingCommands[0] |=  READ_WRITE_HIGH_BYTE_MASK;

+			else

+			  Write_Memory_Params.ProgrammingCommands[0] &= ~READ_WRITE_HIGH_BYTE_MASK;			

+			  

+			SPI_SendByte(Write_Memory_Params.ProgrammingCommands[0]);

+			SPI_SendByte(CurrentAddress >> 8);

+			SPI_SendByte(CurrentAddress & 0xFF);

+			SPI_SendByte(ByteToWrite);

+			

+			if (ByteToWrite != PollValue)

+			{

+				if (IsOddByte && (V2Command == CMD_PROGRAM_FLASH_ISP))

+				  Write_Memory_Params.ProgrammingCommands[2] |= READ_WRITE_HIGH_BYTE_MASK;

+				  

+				PollAddress = (CurrentAddress & 0xFFFF);

+			}

+

+			if (IsOddByte || (V2Command == CMD_PROGRAM_EEPROM_ISP))

+			  CurrentAddress++;

+			

+			ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,

+			                                                   Write_Memory_Params.DelayMS, Write_Memory_Params.ProgrammingCommands[2]);

+			  

+			if (ProgrammingStatus != STATUS_CMD_OK)

+			  break;

+		}

+	}

+

+	Endpoint_Write_Byte(V2Command);

+	Endpoint_Write_Byte(ProgrammingStatus);

+	

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_READ_FLASH_ISP and CMD_READ_EEPROM_ISP commands, reading in bytes,

+ *  words or pages of data from the attached device.

+ *

+ *  \param V2Command  Issued V2 Protocol command byte from the host

+ */

+static void V2Protocol_Command_ReadMemory(uint8_t V2Command)

+{

+	struct

+	{

+		uint16_t BytesToRead;

+		uint8_t  ReadMemoryCommand;

+	} Read_Memory_Params;

+	

+	Endpoint_Read_Stream_LE(&Read_Memory_Params, sizeof(Read_Memory_Params));

+	Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead);

+	

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	Endpoint_Write_Byte(V2Command);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	

+	for (uint16_t CurrentByte = 0; CurrentByte < Read_Memory_Params.BytesToRead; CurrentByte++)

+	{

+		bool IsOddByte = (CurrentByte & 0x01);

+

+		if (IsOddByte && (V2Command == CMD_READ_FLASH_ISP))

+		  Read_Memory_Params.ReadMemoryCommand |=  READ_WRITE_HIGH_BYTE_MASK;

+		else

+		  Read_Memory_Params.ReadMemoryCommand &= ~READ_WRITE_HIGH_BYTE_MASK;

+

+		SPI_SendByte(Read_Memory_Params.ReadMemoryCommand);

+		SPI_SendByte(CurrentAddress >> 8);

+		SPI_SendByte(CurrentAddress & 0xFF);

+		Endpoint_Write_Byte(SPI_ReceiveByte());

+		

+		/* Check if the endpoint bank is currently full */

+		if (!(Endpoint_IsReadWriteAllowed()))

+		{

+			Endpoint_ClearIN();

+			Endpoint_WaitUntilReady();

+		}

+		

+		if ((IsOddByte && (V2Command == CMD_READ_FLASH_ISP)) || (V2Command == CMD_READ_EEPROM_ISP))

+		  CurrentAddress++;

+	}

+

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+

+	bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());

+	Endpoint_ClearIN();

+	

+	/* Ensure last packet is a short packet to terminate the transfer */

+	if (IsEndpointFull)

+	{

+		Endpoint_WaitUntilReady();	

+		Endpoint_ClearIN();

+		Endpoint_WaitUntilReady();	

+	}

+}

+

+/** Handler for the CMD_CHI_ERASE_ISP command, clearing the target's FLASH memory. */

+static void V2Protocol_Command_ChipErase(void)

+{

+	struct

+	{

+		uint8_t EraseDelayMS;

+		uint8_t PollMethod;

+		uint8_t EraseCommandBytes[4];

+	} Erase_Chip_Params;

+	

+	Endpoint_Read_Stream_LE(&Erase_Chip_Params, sizeof(Erase_Chip_Params));

+	

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	uint8_t ResponseStatus = STATUS_CMD_OK;

+	

+	for (uint8_t SByte = 0; SByte < sizeof(Erase_Chip_Params.EraseCommandBytes); SByte++)

+	  SPI_SendByte(Erase_Chip_Params.EraseCommandBytes[SByte]);

+

+	if (!(Erase_Chip_Params.PollMethod))

+	  V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS);

+	else

+	  ResponseStatus = V2Protocol_WaitWhileTargetBusy();

+	  

+	Endpoint_Write_Byte(CMD_CHIP_ERASE_ISP);

+	Endpoint_Write_Byte(ResponseStatus);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_READ_FUSE_ISP, CMD_READ_LOCK_ISP, CMD_READ_SIGNATURE_ISP and CMD_READ_OSCCAL commands,

+ *  reading the requested configuration byte from the device.

+ *

+ *  \param V2Command  Issued V2 Protocol command byte from the host

+ */

+static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)

+{

+	struct

+	{

+		uint8_t RetByte;

+		uint8_t ReadCommandBytes[4];

+	} Read_FuseLockSigOSCCAL_Params;

+	

+	Endpoint_Read_Stream_LE(&Read_FuseLockSigOSCCAL_Params, sizeof(Read_FuseLockSigOSCCAL_Params));

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	uint8_t ResponseBytes[4];

+		

+	for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)

+	  ResponseBytes[RByte] = SPI_TransferByte(Read_FuseLockSigOSCCAL_Params.ReadCommandBytes[RByte]);

+		

+	Endpoint_Write_Byte(V2Command);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_Write_Byte(ResponseBytes[Read_FuseLockSigOSCCAL_Params.RetByte - 1]);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_WRITE_FUSE_ISP and CMD_WRITE_LOCK_ISP commands, writing the requested configuration

+ *  byte to the device.

+ *

+ *  \param V2Command  Issued V2 Protocol command byte from the host

+ */

+static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command)

+{

+	struct

+	{

+		uint8_t WriteCommandBytes[4];

+	} Write_FuseLockSig_Params;

+	

+	Endpoint_Read_Stream_LE(&Write_FuseLockSig_Params, sizeof(Write_FuseLockSig_Params));

+

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	for (uint8_t SByte = 0; SByte < sizeof(Write_FuseLockSig_Params.WriteCommandBytes); SByte++)

+	  SPI_SendByte(Write_FuseLockSig_Params.WriteCommandBytes[SByte]);

+		

+	Endpoint_Write_Byte(V2Command);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_ClearIN();

+}

+

+/** Handler for the CMD_SPI_MULTI command, writing and reading arbitrary SPI data to and from the attached device. */

+static void V2Protocol_Command_SPIMulti(void)

+{

+	struct

+	{

+		uint8_t TxBytes;

+		uint8_t RxBytes;

+		uint8_t RxStartAddr;

+		uint8_t TxData[255];

+	} SPI_Multi_Params;

+	

+	Endpoint_Read_Stream_LE(&SPI_Multi_Params, sizeof(SPI_Multi_Params) - sizeof(SPI_Multi_Params.TxData));

+	Endpoint_Read_Stream_LE(&SPI_Multi_Params.TxData, SPI_Multi_Params.TxBytes);

+	

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	Endpoint_Write_Byte(CMD_SPI_MULTI);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+

+	uint8_t CurrTxPos = 0;

+	uint8_t CurrRxPos = 0;

+

+	/* Write out bytes to transmit until the start of the bytes to receive is met */

+	while (CurrTxPos < SPI_Multi_Params.RxStartAddr)

+	{

+		if (CurrTxPos < SPI_Multi_Params.TxBytes)

+		  SPI_SendByte(SPI_Multi_Params.TxData[CurrTxPos]);

+		else

+		  SPI_SendByte(0);

+		

+		CurrTxPos++;

+	}

+

+	/* Transmit remaining bytes with padding as needed, read in response bytes */

+	while (CurrRxPos < SPI_Multi_Params.RxBytes)

+	{

+		if (CurrTxPos < SPI_Multi_Params.TxBytes)

+		  Endpoint_Write_Byte(SPI_TransferByte(SPI_Multi_Params.TxData[CurrTxPos++]));

+		else

+		  Endpoint_Write_Byte(SPI_ReceiveByte());

+		

+		CurrRxPos++;

+	}	

+	

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_ClearIN();

+}

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
new file mode 100644
index 000000000..5c8bd7513
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -0,0 +1,84 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Header file for V2Protocol.c.

+ */

+

+#ifndef _V2_PROTOCOL_
+#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 "V2ProtocolTarget.h"

+
+	/* Macros: */

+		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
+		#define PROGRAMMER_ID                   "AVRISP_MK2"

+		

+		/** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */

+		#define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)

+

+		#define PROG_MODE_PAGED_WRITES_MASK     (1 << 0)

+		#define PROG_MODE_WORD_TIMEDELAY_MASK   (1 << 1)

+		#define PROG_MODE_WORD_VALUE_MASK       (1 << 2)

+		#define PROG_MODE_WORD_READYBUSY_MASK   (1 << 3)

+		#define PROG_MODE_PAGED_TIMEDELAY_MASK  (1 << 4)

+		#define PROG_MODE_PAGED_VALUE_MASK      (1 << 5)

+		#define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)

+		#define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)

+
+	/* Function Prototypes: */

+		void V2Protocol_ProcessCommand(void);

+		

+		#if defined(INCLUDE_FROM_V2PROTOCOL_C)

+			static void V2Protocol_Command_Unknown(uint8_t V2Command);

+			static void V2Protocol_Command_SignOn(void);

+			static void V2Protocol_Command_GetSetParam(uint8_t V2Command);

+			static void V2Protocol_Command_LoadAddress(void);

+			static void V2Protocol_Command_ResetProtection(void);

+			static void V2Protocol_Command_EnterISPMode(void);

+			static void V2Protocol_Command_LeaveISPMode(void);

+			static void V2Protocol_Command_ProgramMemory(uint8_t V2Command);

+			static void V2Protocol_Command_ReadMemory(uint8_t V2Command);

+			static void V2Protocol_Command_ChipErase(void);

+			static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);

+			static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);

+			static void V2Protocol_Command_SPIMulti(void);

+		#endif
+
+#endif
+
diff --git a/Projects/AVRISP/Lib/V2ProtocolConstants.h b/Projects/AVRISP/Lib/V2ProtocolConstants.h
new file mode 100644
index 000000000..dce660a73
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2ProtocolConstants.h
@@ -0,0 +1,86 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Macros for the V2 Protocol Packet Commands and Responses.

+ */

+

+#ifndef _V2_PROTOCOL_CONSTANTS_

+#define _V2_PROTOCOL_CONSTANTS_

+

+	/* Macros: */

+		#define CMD_SIGN_ON                 0x01

+		#define CMD_SET_PARAMETER           0x02

+		#define CMD_GET_PARAMETER           0x03

+		#define CMD_OSCCAL                  0x05

+		#define CMD_LOAD_ADDRESS            0x06

+		#define CMD_FIRMWARE_UPGRADE        0x07

+		#define CMD_RESET_PROTECTION        0x0A

+		#define CMD_ENTER_PROGMODE_ISP      0x10

+		#define CMD_LEAVE_PROGMODE_ISP      0x11

+		#define CMD_CHIP_ERASE_ISP          0x12

+		#define CMD_PROGRAM_FLASH_ISP       0x13

+		#define CMD_READ_FLASH_ISP          0x14

+		#define CMD_PROGRAM_EEPROM_ISP      0x15

+		#define CMD_READ_EEPROM_ISP         0x16

+		#define CMD_PROGRAM_FUSE_ISP        0x17

+		#define CMD_READ_FUSE_ISP           0x18

+		#define CMD_PROGRAM_LOCK_ISP        0x19

+		#define CMD_READ_LOCK_ISP           0x1A

+		#define CMD_READ_SIGNATURE_ISP      0x1B

+		#define CMD_READ_OSCCAL_ISP         0x1C

+		#define CMD_SPI_MULTI               0x1D

+

+		#define STATUS_CMD_OK               0x00

+		#define STATUS_CMD_TOUT             0x80

+		#define STATUS_RDY_BSY_TOUT         0x81

+		#define STATUS_SET_PARAM_MISSING    0x82

+		#define STATUS_CMD_FAILED           0xC0

+		#define STATUS_CMD_UNKNOWN          0xC9

+		#define STATUS_ISP_READY            0x00

+		#define STATUS_CONN_FAIL_MOSI       0x01

+		#define STATUS_CONN_FAIL_RST        0x02

+		#define STATUS_CONN_FAIL_SCK        0x04

+		#define STATUS_TGT_NOT_DETECTED     0x10

+		#define STATUS_TGT_REVERSE_INSERTED 0x20

+

+		#define PARAM_BUILD_NUMBER_LOW      0x80

+		#define PARAM_BUILD_NUMBER_HIGH     0x81

+		#define PARAM_HW_VER                0x90

+		#define PARAM_SW_MAJOR              0x91

+		#define PARAM_SW_MINOR              0x92

+		#define PARAM_VTARGET               0x94

+		#define PARAM_SCK_DURATION          0x98

+		#define PARAM_RESET_POLARITY        0x9E

+		#define PARAM_STATUS_TGT_CONN       0xA1

+		#define PARAM_DISCHARGEDELAY        0xA4

+

+#endif

diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.c b/Projects/AVRISP/Lib/V2ProtocolParams.c
new file mode 100644
index 000000000..9914c085e
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2ProtocolParams.c
@@ -0,0 +1,166 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  V2Protocol parameter handler, to process V2 Protocol device parameters.

+ */

+

+#define  INCLUDE_FROM_V2PROTOCOL_PARAMS_C

+#include "V2ProtocolParams.h"

+

+/* Non-Volatile Parameter Values for EEPROM storage */

+uint8_t EEMEM EEPROM_Rest_Polarity = 0x00;

+

+/* Volatile Parameter Values for RAM storage */

+static ParameterItem_t ParameterTable[] = 

+	{

+		{ .ParamID          = PARAM_BUILD_NUMBER_LOW,

+		  .ParamValue       = (LUFA_VERSION_INTEGER >> 8),

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_BUILD_NUMBER_HIGH,

+		  .ParamValue       = (LUFA_VERSION_INTEGER & 0xFF),

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_HW_VER,

+		  .ParamValue       = 0x00,

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_SW_MAJOR,

+		  .ParamValue       = 0x01,

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_SW_MINOR,

+		  .ParamValue       = 0x0C,

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_VTARGET,

+		  .ParamValue       = 0x32,

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_SCK_DURATION,

+		  .ParamValue       = (TOTAL_PROGRAMMING_SPEEDS - 1),

+		  .ParamPrivellages = PARAM_PRIV_READ | PARAM_PRIV_WRITE },

+

+		{ .ParamID          = PARAM_RESET_POLARITY,

+		  .ParamValue       = 0x00,

+		  .ParamPrivellages = PARAM_PRIV_WRITE                   },

+

+		{ .ParamID          = PARAM_STATUS_TGT_CONN,

+		  .ParamValue       = 0x00,

+		  .ParamPrivellages = PARAM_PRIV_READ                    },

+

+		{ .ParamID          = PARAM_DISCHARGEDELAY,

+		  .ParamValue       = 0x00,

+		  .ParamPrivellages = PARAM_PRIV_WRITE                   },

+	};

+

+

+/** Loads saved non-volatile parameter values from the EEPROM into the parameter table, as needed. */

+void V2Params_LoadEEPROMParamValues(void)

+{

+	/* Target RESET line polarity is a non-volatile value, retrieve current parameter value from EEPROM */

+	V2Params_GetParamFromTable(PARAM_RESET_POLARITY)->ParamValue = eeprom_read_byte(&EEPROM_Rest_Polarity);

+}

+

+/** Retrieves the host PC read/write privellages for a given parameter in the parameter table. This should

+ *  be called before calls to \ref V2Params_GetParameterValue() or \ref V2Params_SetParameterValue() when

+ *  getting or setting parameter values in response to requests from the host.

+ *

+ *  \param ParamID  Parameter ID whose privellages are to be retrieved from the table

+ *

+ *  \return Privellages for the requested parameter, as a mask of PARAM_PRIV_* masks

+ */ 

+uint8_t V2Params_GetParameterPrivellages(uint8_t ParamID)

+{

+	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);

+	

+	if (ParamInfo == NULL)

+	  return 0;

+

+	return ParamInfo->ParamPrivellages;

+}

+

+/** Retrieves the current value for a given parameter in the parameter table.

+ *

+ *  \param ParamID  Parameter ID whose value is to be retrieved from the table

+ *

+ *  \return Current value of the parameter in the table, or 0 if not found

+ */ 

+uint8_t V2Params_GetParameterValue(uint8_t ParamID)

+{

+	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);

+	

+	if (ParamInfo == NULL)

+	  return 0;

+	

+	return ParamInfo->ParamValue;

+}

+

+/** Sets the value for a given parameter in the parameter table.

+ *

+ *  \param ParamID  Parameter ID whose value is to be set in the table

+ *  \param Value  New value to set the parameter to

+ *

+ *  \return Pointer to the associated parameter information from the parameter table if found, NULL otherwise

+ */

+void V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value)

+{

+	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);

+

+	if (ParamInfo == NULL)

+	  return;

+

+	ParamInfo->ParamValue = Value;

+

+	/* The target RESET line polarity is a non-volatile parameter, save to EEPROM when changed */

+	if (ParamID == PARAM_RESET_POLARITY)

+	  eeprom_write_byte(&EEPROM_Rest_Polarity, Value);  

+}

+

+/** Retrieves a parameter entry (including ID, value and privellages) from the parameter table that matches the given

+ *  parameter ID.

+ *

+ *  \param ParamID  Parameter ID to find in the table

+ *

+ *  \return Pointer to the associated parameter information from the parameter table if found, NULL otherwise

+ */

+static ParameterItem_t* V2Params_GetParamFromTable(uint8_t ParamID)

+{

+	/* Find the parameter in the parameter table if present */

+	for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)

+	{

+		if (ParamID == ParameterTable[TableIndex].ParamID)

+		  return &ParameterTable[TableIndex];

+	}

+	

+	return NULL;

+}

diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.h b/Projects/AVRISP/Lib/V2ProtocolParams.h
new file mode 100644
index 000000000..9c0f044c2
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2ProtocolParams.h
@@ -0,0 +1,76 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Header file for V2ProtocolParams.c.

+ */

+

+#ifndef _V2_PROTOCOL_PARAMS_
+#define _V2_PROTOCOL_PARAMS_
+
+	/* Includes: */
+		#include <avr/io.h>

+		#include <avr/eeprom.h>
+

+		#include <LUFA/Version.h>
+

+		#include "V2Protocol.h"

+		#include "V2ProtocolConstants.h"

+

+	/* Macros: */

+		/** Parameter privellage mask to allow the host PC to read the parameter's value */

+		#define PARAM_PRIV_READ   (1 << 0)

+

+		/** Parameter privellage mask to allow the host PC to change the parameter's value */

+		#define PARAM_PRIV_WRITE  (1 << 1)

+
+	/* Type Defines: */

+		/** Type define for a parameter table entry indicating a PC readable or writable device parameter. */

+		typedef struct

+		{

+			const uint8_t ParamID; /**< Parameter ID number to uniquely identify the parameter within the device */

+			uint8_t ParamValue; /**< Current parameter's value within the device */

+			uint8_t ParamPrivellages;  /**< Parameter privellages to allow the host to read or write the parameter's value */

+		} ParameterItem_t;
+
+	/* Function Prototypes: */

+		void    V2Params_LoadEEPROMParamValues(void);

+	

+		uint8_t V2Params_GetParameterPrivellages(uint8_t ParamID);

+		uint8_t V2Params_GetParameterValue(uint8_t ParamID);

+		void    V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value);

+		

+		#if defined(INCLUDE_FROM_V2PROTOCOL_PARAMS_C)

+			static ParameterItem_t* V2Params_GetParamFromTable(uint8_t ParamID);

+		#endif

+
+#endif
+
diff --git a/Projects/AVRISP/Lib/V2ProtocolTarget.c b/Projects/AVRISP/Lib/V2ProtocolTarget.c
new file mode 100644
index 000000000..a39c5e96d
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2ProtocolTarget.c
@@ -0,0 +1,183 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Target-related functions for the V2 Protocol decoder.

+ */

+

+#include "V2ProtocolTarget.h"

+

+/** Current memory address for FLASH/EEPROM memory read/write commands */

+uint32_t CurrentAddress;

+

+/** Converts the given AVR Studio SCK duration parameter (set by a SET PARAM command from the host) to the nearest

+ *  possible SPI clock prescaler mask for passing to the SPI_Init() routine.

+ *

+ *  \return Nearest SPI prescaler mask for the given SCK frequency

+ */

+uint8_t V2Protocol_GetSPIPrescalerMask(void)

+{

+	static const uint8_t SPIMaskFromSCKDuration[TOTAL_PROGRAMMING_SPEEDS] =

+	{

+	#if (F_CPU == 8000000)

+		SPI_SPEED_FCPU_DIV_2,    // AVRStudio =   8MHz SPI, Actual =   4MHz SPI

+		SPI_SPEED_FCPU_DIV_2,    // AVRStudio =   4MHz SPI, Actual =   4MHz SPI

+		SPI_SPEED_FCPU_DIV_4,    // AVRStudio =   2MHz SPI, Actual =   2MHz SPI

+		SPI_SPEED_FCPU_DIV_8,    // AVRStudio =   1MHz SPI, Actual =   1MHz SPI

+		SPI_SPEED_FCPU_DIV_16,   // AVRStudio = 500KHz SPI, Actual = 500KHz SPI

+		SPI_SPEED_FCPU_DIV_32,   // AVRStudio = 250KHz SPI, Actual = 250KHz SPI

+		SPI_SPEED_FCPU_DIV_64    // AVRStudio = 125KHz SPI, Actual = 125KHz SPI	

+	#if (F_CPU == 16000000)

+		SPI_SPEED_FCPU_DIV_2,    // AVRStudio =   8MHz SPI, Actual =   8MHz SPI

+		SPI_SPEED_FCPU_DIV_4,    // AVRStudio =   4MHz SPI, Actual =   4MHz SPI

+		SPI_SPEED_FCPU_DIV_8,    // AVRStudio =   2MHz SPI, Actual =   2MHz SPI

+		SPI_SPEED_FCPU_DIV_16,   // AVRStudio =   1MHz SPI, Actual =   1MHz SPI

+		SPI_SPEED_FCPU_DIV_32,   // AVRStudio = 500KHz SPI, Actual = 500KHz SPI

+		SPI_SPEED_FCPU_DIV_64,   // AVRStudio = 250KHz SPI, Actual = 250KHz SPI		

+		SPI_SPEED_FCPU_DIV_128   // AVRStudio = 125KHz SPI, Actual = 125KHz SPI

+	#else

+		#error No SPI prescaler masks for chosen F_CPU speed.

+	#endif

+	};

+

+	uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);

+

+	if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))

+	  SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);

+	  

+	return SPIMaskFromSCKDuration[SCKDuration];

+}

+

+/** Asserts or deasserts the target's reset line, using the correct polarity as set by the host using a SET PARAM command.

+ *  When not asserted, the line is tristated so as not to intefere with normal device operation.

+ *

+ *  \param ResetTarget Boolean true when the target should be held in reset, false otherwise

+ */

+void V2Protocol_ChangeTargetResetLine(bool ResetTarget)

+{

+	if (ResetTarget)

+	{

+		RESET_LINE_DDR  |= RESET_LINE_MASK;

+		

+		if (!(V2Params_GetParameterValue(PARAM_RESET_POLARITY)))

+		  RESET_LINE_PORT |= RESET_LINE_MASK;

+	}

+	else

+	{

+		RESET_LINE_PORT &= ~RESET_LINE_MASK;

+		RESET_LINE_DDR  &= ~RESET_LINE_MASK;

+	}

+}

+

+/** Waits until the last issued target memory programming command has completed, via the check mode given and using

+ *  the given parameters.

+ *

+ *  \param ProgrammingMode  Programming mode used and completion check to use, a mask of PROG_MODE_* constants

+ *  \param PollAddress  Memory address to poll for completion if polling check mode used

+ *  \param PollValue  Poll value to check against if polling check mode used

+ *  \param DelayMS  Milliseconds to delay before returning if delay check mode used

+ *  \param ReadMemCommand  Device low-level READ MEMORY command to send if value check mode used

+ *

+ *  \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT or

+ *          \ref STATUS_CMD_TOUT otherwise

+ */

+uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,

+                                       uint8_t DelayMS, uint8_t ReadMemCommand)

+{

+	uint8_t ProgrammingStatus = STATUS_CMD_OK;

+

+	/* Determine method of Programming Complete check */

+	switch (ProgrammingMode & ~(PROG_MODE_PAGED_WRITES_MASK | PROG_MODE_COMMIT_PAGE_MASK))

+	{

+		case PROG_MODE_WORD_TIMEDELAY_MASK:

+		case PROG_MODE_PAGED_TIMEDELAY_MASK:

+			V2Protocol_DelayMS(DelayMS);

+			break;

+		case PROG_MODE_WORD_VALUE_MASK:

+		case PROG_MODE_PAGED_VALUE_MASK:

+			TCNT0 = 0;

+

+			do

+			{

+				SPI_SendByte(ReadMemCommand);

+				SPI_SendByte(PollAddress >> 8);

+				SPI_SendByte(PollAddress & 0xFF);				

+			}

+			while ((SPI_TransferByte(0x00) != PollValue) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));

+

+			if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)

+			 ProgrammingStatus = STATUS_CMD_TOUT;

+			

+			break;		

+		case PROG_MODE_WORD_READYBUSY_MASK:

+		case PROG_MODE_PAGED_READYBUSY_MASK:

+			ProgrammingStatus = V2Protocol_WaitWhileTargetBusy();

+			break;

+	}

+

+	return ProgrammingStatus;

+}

+

+/** Waits until the target has completed the last operation, by continuously polling the device's

+ *  BUSY flag until it is cleared, or until the \ref TARGET_BUSY_TIMEOUT_MS timeout period has expired.

+ *

+ *  \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT otherwise

+ */

+uint8_t V2Protocol_WaitWhileTargetBusy(void)

+{

+	TCNT0 = 0;

+	

+	do

+	{

+		SPI_SendByte(0xF0);

+		SPI_SendByte(0x00);

+

+		SPI_SendByte(0x00);

+	}

+	while ((SPI_ReceiveByte() & 0x01) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));

+

+	if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)

+	  return STATUS_RDY_BSY_TOUT;

+	else

+	  return STATUS_CMD_OK;

+}

+

+/** Sends a low-level LOAD EXTENDED ADDRESS command to the target, for addressing of memory beyond the

+ *  64KB boundary. This sends the command with the correct address as indicated by the current address

+ *  pointer variable set by the host when a SET ADDRESS command is issued.

+ */

+void V2Protocol_LoadExtendedAddress(void)

+{

+	SPI_SendByte(0x4D);

+	SPI_SendByte(0x00);

+	SPI_SendByte((CurrentAddress & 0x00FF0000) >> 16);

+	SPI_SendByte(0x00);	

+}

diff --git a/Projects/AVRISP/Lib/V2ProtocolTarget.h b/Projects/AVRISP/Lib/V2ProtocolTarget.h
new file mode 100644
index 000000000..1e0364d9c
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2ProtocolTarget.h
@@ -0,0 +1,80 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Header file for V2ProtocolTarget.c.

+ */

+

+#ifndef _V2_PROTOCOL_TARGET_

+#define _V2_PROTOCOL_TARGET_

+

+	/* Includes: */

+		#include <avr/io.h>

+		#include <util/delay.h>

+

+		#include <LUFA/Drivers/USB/USB.h>

+		#include <LUFA/Drivers/Peripheral/SPI.h>

+		

+		#include "../Descriptors.h"

+		#include "V2ProtocolConstants.h"

+		#include "V2ProtocolParams.h"

+

+	/* Macros: */

+		/** Total number of allowable ISP programming speeds supported by the device */

+		#define TOTAL_PROGRAMMING_SPEEDS  7

+

+		/** Timeout in milliseconds of target busy-wait loops waiting for a command to complete */

+		#define TARGET_BUSY_TIMEOUT_MS    150

+		

+	/* External Variables: */

+		extern uint32_t CurrentAddress;

+

+	/* Inline Functions: */

+		/** Blocking delay for a given number of milliseconds, via a hardware timer.

+		 *

+		 *  \param DelayMS  Number of milliseconds to delay for

+		 */

+		static inline void V2Protocol_DelayMS(uint8_t DelayMS)

+		{

+			TCNT0 = 0;

+			while (TCNT0 < DelayMS);

+		}

+

+	/* Function Prototypes: */

+			uint8_t V2Protocol_GetSPIPrescalerMask(void);

+			void    V2Protocol_ChangeTargetResetLine(bool ResetTarget);

+			void    V2Protocol_DelayMS(uint8_t MS);

+			uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,

+                                                   uint8_t DelayMS, uint8_t ReadMemCommand);

+			uint8_t V2Protocol_WaitWhileTargetBusy(void);

+			void    V2Protocol_LoadExtendedAddress(void);

+

+#endif