X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0934f5c185ec791ba3440a0868f81900d13f706a..fa8beef82d1340a69390d4b11ca785ee016789c5:/Projects/Unfinished/AVRISP/Lib/V2Protocol.c

diff --git a/Projects/Unfinished/AVRISP/Lib/V2Protocol.c b/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
index 304eef471..403889241 100644
--- a/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
@@ -36,75 +36,96 @@
 #define  INCLUDE_FROM_V2PROTOCOL_C
 #include "V2Protocol.h"
 
-ParameterItem_t ParameterTable[] EEMEM = 
+/* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */
+static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =
 	{
-		{ .ParameterID    = PARAM_BUILD_NUMBER_LOW,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_BUILD_NUMBER_HIGH,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_HW_VER,
-		  .ParameterValue = 0x01                    },
-		{ .ParameterID    = PARAM_SW_MAJOR,
-		  .ParameterValue = 0x01                    },
-		{ .ParameterID    = PARAM_SW_MINOR,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_VTARGET,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_SCK_DURATION,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_RESET_POLARITY,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_STATUS_TGT_CONN,
-		  .ParameterValue = 0x00                    },
-		{ .ParameterID    = PARAM_DISCHARGEDELAY,
-		  .ParameterValue = 0x00                    },
+		#if (F_CPU == 8000000)
+		SPI_SPEED_FCPU_DIV_2,
+		#endif
+		SPI_SPEED_FCPU_DIV_2, SPI_SPEED_FCPU_DIV_4, SPI_SPEED_FCPU_DIV_8,
+		SPI_SPEED_FCPU_DIV_16, SPI_SPEED_FCPU_DIV_32, SPI_SPEED_FCPU_DIV_64
+		#if (F_CPU == 16000000)										
+		, SPI_SPEED_FCPU_DIV_128
+		#endif
 	};
+
+static void V2Protocol_ReconfigureSPI(void)
+{
+	uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);
+
+	if (SCKDuration >= MAX_SPI_SETTINGS)
+	  SCKDuration = (MAX_SPI_SETTINGS - 1);
+	  
+	SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);	
+}
+
+static 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;
+	}
+}
 
 void V2Protocol_ProcessCommand(void)
 {
 	uint8_t V2Command = Endpoint_Read_Byte();
 		  
-	printf("COMMAND %d\r\n", V2Command);
-
 	switch (V2Command)
 	{
 		case CMD_SIGN_ON:
-			V2Protocol_ProcessCmdSignOn();
+			V2Protocol_Command_SignOn();
 			break;
 		case CMD_SET_PARAMETER:
-			V2Protocol_ProcessCmdSetParam();
-			break;
 		case CMD_GET_PARAMETER:
-			V2Protocol_ProcessCmdGetParam();
+			V2Protocol_Command_GetSetParam(V2Command);
 			break;
+		case CMD_SPI_MULTI:
+			V2Protocol_Command_SPIMulti();
+			break;		
 		default:
-			Endpoint_ClearOUT();
-			Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
-			Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);
-			Endpoint_ClearIN();
+			V2Protocol_Command_Unknown(V2Command);
 			break;
 	}
 	
-	/* Reset Endpoint direction to OUT ready for next command */
+	printf("COMMAND 0x%02x\r\n", V2Command);
+
+	Endpoint_WaitUntilReady();	
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);	
-}
+}
 
-static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID)
-{
-	for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)
+static void V2Protocol_Command_Unknown(uint8_t V2Command)
+{	
+	while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)
 	{
-		if (ParamID == eeprom_read_byte(&ParameterTable[TableIndex].ParameterID))
-		  return &ParameterTable[TableIndex];
+		Endpoint_ClearOUT();
+		while (!(Endpoint_IsOUTReceived()));
 	}
-	
-	return NULL;
-}
+
+	Endpoint_ClearOUT();
+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
+
+	Endpoint_Write_Byte(V2Command);
+	Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);
+	Endpoint_ClearIN();
+}
 
-static void V2Protocol_ProcessCmdSignOn(void)
+static void V2Protocol_Command_SignOn(void)
 {
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
-	
+	Endpoint_WaitUntilReady();
+
+	V2Protocol_ReconfigureSPI();
+
 	Endpoint_Write_Byte(CMD_SIGN_ON);
 	Endpoint_Write_Byte(STATUS_CMD_OK);
 	Endpoint_Write_Byte(PROGRAMMER_ID_LEN);
@@ -112,50 +133,76 @@ static void V2Protocol_ProcessCmdSignOn(void)
 	Endpoint_ClearIN();
 }
 
-static void V2Protocol_ProcessCmdSetParam(void)
+static void V2Protocol_Command_GetSetParam(uint8_t V2Command)
 {
 	uint8_t ParamID    = Endpoint_Read_Byte();
 	uint8_t ParamValue = Endpoint_Read_Byte();
 
-	ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);
-	
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
-
-	if (ParameterItem != NULL)
+	Endpoint_WaitUntilReady();
+	
+	uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);
+	
+	Endpoint_Write_Byte(V2Command);
+	
+	if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))
 	{
-		eeprom_write_byte(&ParameterItem->ParameterValue, ParamValue);
-
-		Endpoint_Write_Byte(CMD_SET_PARAMETER);
-		Endpoint_Write_Byte(STATUS_CMD_OK);	
+		Endpoint_Write_Byte(STATUS_CMD_OK);
+		V2Params_SetParameterValue(ParamID, ParamValue);
 	}
-	else
+	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();
 }
 
-static void V2Protocol_ProcessCmdGetParam(void)
+static void V2Protocol_Command_SPIMulti(void)
 {
-	uint8_t ParamID    = Endpoint_Read_Byte();
-
-	ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);
+	uint8_t TxBytes = Endpoint_Read_Byte();
+	uint8_t RxBytes = Endpoint_Read_Byte();
+	uint8_t RxStartAddr = Endpoint_Read_Byte();
+	uint8_t TxData[255];
+	
+	Endpoint_Read_Stream_LE(TxData, TxBytes);
 	
 	Endpoint_ClearOUT();
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
+	Endpoint_WaitUntilReady();
+	
+	Endpoint_Write_Byte(CMD_SPI_MULTI);
+	Endpoint_Write_Byte(STATUS_CMD_OK);
 
-	if (ParameterItem != NULL)
-	{
-		Endpoint_Write_Byte(CMD_GET_PARAMETER);
-		Endpoint_Write_Byte(STATUS_CMD_OK);
-		Endpoint_Write_Byte(eeprom_read_byte(&ParameterItem->ParameterValue));	
-	}
-	else
+	uint8_t CurrTxPos = 0;
+	uint8_t CurrRxPos = 0;
+
+	while (CurrTxPos < RxStartAddr)
 	{
-		Endpoint_Write_Byte(STATUS_CMD_FAILED);
+		if (CurrTxPos < TxBytes)
+		  SPI_SendByte(TxData[CurrTxPos]);
+		else
+		  SPI_SendByte(0);
+		
+		CurrTxPos++;
 	}
 
+	while (CurrRxPos < RxBytes)
+	{
+		if (CurrTxPos < TxBytes)
+		  Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos++]));
+		else
+		  Endpoint_Write_Byte(SPI_ReceiveByte());
+		
+		CurrRxPos++;
+	}	
+	
+	Endpoint_Write_Byte(STATUS_CMD_OK);
 	Endpoint_ClearIN();	
 }