X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/271be037b736d66a7b7e0c4d5d30c5a24025277f..f7ab433c67b86723385ec05ee9c7b96dd18e6dde:/Projects/AVRISP/Lib/V2Protocol.c

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index 248c50d24..6099234fa 100644
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -101,7 +101,7 @@ void V2Protocol_ProcessCommand(void)
 /** 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
+ *  \param[in] V2Command  Issued V2 Protocol command byte from the host
  */
 static void V2Protocol_Command_Unknown(uint8_t V2Command)
 {
@@ -136,7 +136,7 @@ static void V2Protocol_Command_SignOn(void)
 /** 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
+ *  \param[in] V2Command  Issued V2 Protocol command byte from the host
  */
 static void V2Protocol_Command_GetSetParam(uint8_t V2Command)
 {
@@ -289,7 +289,7 @@ static void V2Protocol_Command_LeaveISPMode(void)
 /** 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
+ *  \param[in] V2Command  Issued V2 Protocol command byte from the host
  */
 static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
 {
@@ -301,13 +301,25 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
 		uint8_t  ProgrammingCommands[3];
 		uint8_t  PollValue1;
 		uint8_t  PollValue2;
-		uint8_t  ProgData[512];
+		uint8_t  ProgData[256];
 	} 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);
+	
+	if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData))
+	{
+		Endpoint_ClearOUT();
+		Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
+
+		Endpoint_Write_Byte(V2Command);
+		Endpoint_Write_Byte(STATUS_CMD_FAILED);
+		Endpoint_ClearIN();
+		return;
+	}
+	
 	Endpoint_Read_Stream_LE(&Write_Memory_Params.ProgData, Write_Memory_Params.BytesToWrite);
 
 	Endpoint_ClearOUT();
@@ -407,14 +419,13 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
 
 	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
+ *  \param[in] V2Command  Issued V2 Protocol command byte from the host
  */
 static void V2Protocol_Command_ReadMemory(uint8_t V2Command)
 {
@@ -505,7 +516,7 @@ static void V2Protocol_Command_ChipErase(void)
 /** 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
+ *  \param[in] V2Command  Issued V2 Protocol command byte from the host
  */
 static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)
 {
@@ -535,7 +546,7 @@ static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)
 /** 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
+ *  \param[in] V2Command  Issued V2 Protocol command byte from the host
  */
 static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command)
 {