forked from mfulz_github/qmk_firmware
Factor out all the ISP related code into a seperate ISPProtocol set of files in the AVRISP Clone programmer project, to clearly seperate out the programming protocols when PDI programming is implemented.
This commit is contained in:
parent
1645c3d243
commit
1ed6925b5b
|
@ -0,0 +1,467 @@
|
|||
/*
|
||||
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
|
||||
*
|
||||
* ISP Protocol handler, to process V2 Protocol wrapped ISP commands used in Atmel programmer devices.
|
||||
*/
|
||||
|
||||
#include "ISPProtocol.h"
|
||||
|
||||
/** 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.
|
||||
*/
|
||||
void ISPProtocol_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(ISPTarget_GetSPIPrescalerMask() | SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING | SPI_MODE_MASTER);
|
||||
|
||||
while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))
|
||||
{
|
||||
uint8_t ResponseBytes[4];
|
||||
|
||||
ISPTarget_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
|
||||
{
|
||||
ISPTarget_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. */
|
||||
void ISPProtocol_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);
|
||||
ISPTarget_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
void ISPProtocol_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[256]; // Note, the Jungo driver has a very short ACK timeout period, need to buffer the
|
||||
} Write_Memory_Params; // whole page and ACK the packet as fast as possible to prevent it from aborting
|
||||
|
||||
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();
|
||||
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;
|
||||
uint8_t* NextWriteByte = Write_Memory_Params.ProgData;
|
||||
|
||||
if (MustSetAddress)
|
||||
{
|
||||
if (CurrentAddress & (1UL << 31))
|
||||
ISPTarget_LoadExtendedAddress();
|
||||
|
||||
MustSetAddress = false;
|
||||
}
|
||||
|
||||
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 = ISPTarget_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 = ISPTarget_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
void ISPProtocol_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);
|
||||
|
||||
if (MustSetAddress)
|
||||
{
|
||||
if (CurrentAddress & (1UL << 31))
|
||||
ISPTarget_LoadExtendedAddress();
|
||||
|
||||
MustSetAddress = false;
|
||||
}
|
||||
|
||||
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. */
|
||||
void ISPProtocol_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 = ISPTarget_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
void ISPProtocol_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
void ISPProtocol_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. */
|
||||
void ISPProtocol_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();
|
||||
}
|
|
@ -0,0 +1,67 @@
|
|||
/*
|
||||
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 ISPProtocol.c.
|
||||
*/
|
||||
|
||||
#ifndef _ISP_PROTOCOL_
|
||||
#define _ISP_PROTOCOL_
|
||||
|
||||
/* Includes: */
|
||||
#include <avr/io.h>
|
||||
|
||||
#include "V2Protocol.h"
|
||||
|
||||
/* Macros: */
|
||||
/** 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 ISPProtocol_EnterISPMode(void);
|
||||
void ISPProtocol_LeaveISPMode(void);
|
||||
void ISPProtocol_ProgramMemory(uint8_t V2Command);
|
||||
void ISPProtocol_ReadMemory(uint8_t V2Command);
|
||||
void ISPProtocol_ChipErase(void);
|
||||
void ISPProtocol_ReadFuseLockSigOSCCAL(uint8_t V2Command);
|
||||
void ISPProtocol_WriteFuseLock(uint8_t V2Command);
|
||||
void ISPProtocol_SPIMulti(void);
|
||||
|
||||
#endif
|
|
@ -36,6 +36,13 @@
|
|||
#define INCLUDE_FROM_V2PROTOCOL_C
|
||||
#include "V2Protocol.h"
|
||||
|
||||
/** Current memory address for FLASH/EEPROM memory read/write commands */
|
||||
uint32_t CurrentAddress;
|
||||
|
||||
/** Flag to indicate that the next read/write operation must update the device's current address */
|
||||
bool MustSetAddress;
|
||||
|
||||
|
||||
/** Master V2 Protocol packet handler, for received 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.
|
||||
|
@ -60,34 +67,38 @@ void V2Protocol_ProcessCommand(void)
|
|||
V2Protocol_ResetProtection();
|
||||
break;
|
||||
case CMD_ENTER_PROGMODE_ISP:
|
||||
V2Protocol_ISP_EnterISPMode();
|
||||
ISPProtocol_EnterISPMode();
|
||||
break;
|
||||
case CMD_LEAVE_PROGMODE_ISP:
|
||||
V2Protocol_ISP_LeaveISPMode();
|
||||
ISPProtocol_LeaveISPMode();
|
||||
break;
|
||||
case CMD_PROGRAM_FLASH_ISP:
|
||||
case CMD_PROGRAM_EEPROM_ISP:
|
||||
V2Protocol_ISP_ProgramMemory(V2Command);
|
||||
ISPProtocol_ProgramMemory(V2Command);
|
||||
break;
|
||||
case CMD_READ_FLASH_ISP:
|
||||
case CMD_READ_EEPROM_ISP:
|
||||
V2Protocol_ISP_ReadMemory(V2Command);
|
||||
ISPProtocol_ReadMemory(V2Command);
|
||||
break;
|
||||
case CMD_CHIP_ERASE_ISP:
|
||||
V2Protocol_ISP_ChipErase();
|
||||
ISPProtocol_ChipErase();
|
||||
break;
|
||||
#if defined(ENABLE_XPROG_PROTOCOL)
|
||||
case CMD_XPROG_SETMODE:
|
||||
V2Protocol_XPROG_SetMode();
|
||||
#endif
|
||||
case CMD_READ_FUSE_ISP:
|
||||
case CMD_READ_LOCK_ISP:
|
||||
case CMD_READ_SIGNATURE_ISP:
|
||||
case CMD_READ_OSCCAL_ISP:
|
||||
V2Protocol_ISP_ReadFuseLockSigOSCCAL(V2Command);
|
||||
ISPProtocol_ReadFuseLockSigOSCCAL(V2Command);
|
||||
break;
|
||||
case CMD_PROGRAM_FUSE_ISP:
|
||||
case CMD_PROGRAM_LOCK_ISP:
|
||||
V2Protocol_ISP_WriteFuseLock(V2Command);
|
||||
ISPProtocol_WriteFuseLock(V2Command);
|
||||
break;
|
||||
case CMD_SPI_MULTI:
|
||||
V2Protocol_ISP_SPIMulti();
|
||||
ISPProtocol_SPIMulti();
|
||||
break;
|
||||
default:
|
||||
V2Protocol_UnknownCommand(V2Command);
|
||||
|
@ -196,425 +207,9 @@ static void V2Protocol_LoadAddress(void)
|
|||
Endpoint_ClearOUT();
|
||||
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
|
||||
|
||||
if (CurrentAddress & (1UL << 31))
|
||||
V2Protocol_LoadExtendedAddress();
|
||||
MustSetAddress = true;
|
||||
|
||||
Endpoint_Write_Byte(CMD_LOAD_ADDRESS);
|
||||
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_ISP_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_ISP_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
static void V2Protocol_ISP_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[256]; // Note, the Jungo driver has a very short ACK timeout period, need to buffer the
|
||||
} Write_Memory_Params; // whole page and ACK the packet as fast as possible to prevent it from aborting
|
||||
|
||||
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();
|
||||
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;
|
||||
uint8_t* NextWriteByte = Write_Memory_Params.ProgData;
|
||||
|
||||
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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
static void V2Protocol_ISP_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_ISP_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
static void V2Protocol_ISP_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[in] V2Command Issued V2 Protocol command byte from the host
|
||||
*/
|
||||
static void V2Protocol_ISP_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_ISP_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();
|
||||
}
|
||||
|
|
|
@ -43,24 +43,30 @@
|
|||
#include "../Descriptors.h"
|
||||
#include "V2ProtocolConstants.h"
|
||||
#include "V2ProtocolParams.h"
|
||||
#include "V2ProtocolTarget.h"
|
||||
#include "ISPProtocol.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)
|
||||
|
||||
/** Timeout in milliseconds of target busy-wait loops waiting for a command to complete */
|
||||
#define TARGET_BUSY_TIMEOUT_MS 240
|
||||
|
||||
/* Inline Functions: */
|
||||
/** Blocking delay for a given number of milliseconds, via a hardware timer.
|
||||
*
|
||||
* \param[in] DelayMS Number of milliseconds to delay for
|
||||
*/
|
||||
static inline void V2Protocol_DelayMS(uint8_t DelayMS)
|
||||
{
|
||||
TCNT0 = 0;
|
||||
while (TCNT0 < DelayMS);
|
||||
}
|
||||
|
||||
/* External Variables: */
|
||||
extern uint32_t CurrentAddress;
|
||||
extern bool MustSetAddress;
|
||||
|
||||
/* Function Prototypes: */
|
||||
void V2Protocol_ProcessCommand(void);
|
||||
|
||||
|
@ -70,14 +76,6 @@
|
|||
static void V2Protocol_GetSetParam(uint8_t V2Command);
|
||||
static void V2Protocol_ResetProtection(void);
|
||||
static void V2Protocol_LoadAddress(void);
|
||||
static void V2Protocol_ISP_EnterISPMode(void);
|
||||
static void V2Protocol_ISP_LeaveISPMode(void);
|
||||
static void V2Protocol_ISP_ProgramMemory(uint8_t V2Command);
|
||||
static void V2Protocol_ISP_ReadMemory(uint8_t V2Command);
|
||||
static void V2Protocol_ISP_ChipErase(void);
|
||||
static void V2Protocol_ISP_ReadFuseLockSigOSCCAL(uint8_t V2Command);
|
||||
static void V2Protocol_ISP_WriteFuseLock(uint8_t V2Command);
|
||||
static void V2Protocol_ISP_SPIMulti(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -59,6 +59,49 @@
|
|||
#define CMD_READ_OSCCAL_ISP 0x1C
|
||||
#define CMD_SPI_MULTI 0x1D
|
||||
|
||||
#define CMD_XPROG 0x50
|
||||
#define CMD_XPROG_SETMODE 0x51
|
||||
|
||||
#define XPRG_CMD_ENTER_PROGMODE 0x01
|
||||
#define XPRG_CMD_LEAVE_PROGMODE 0x02
|
||||
#define XPRG_CMD_ERASE 0x03
|
||||
#define XPRG_CMD_WRITE_MEM 0x04
|
||||
#define XPRG_CMD_READ_MEM 0x05
|
||||
#define XPRG_CMD_CRC 0x06
|
||||
#define XPRG_CMD_SET_PARAM 0x07
|
||||
|
||||
#define XPRG_MEM_TYPE_APPL 1
|
||||
#define XPRG_MEM_TYPE_BOOT 2
|
||||
#define XPRG_MEM_TYPE_EEPROM 3
|
||||
#define XPRG_MEM_TYPE_FUSE 4
|
||||
#define XPRG_MEM_TYPE_LOCKBITS 5
|
||||
#define XPRG_MEM_TYPE_USERSIG 6
|
||||
#define XPRG_MEM_TYPE_FACTORY_CALIBRATION 7
|
||||
|
||||
#define XPRG_ERASE_CHIP 1
|
||||
#define XPRG_ERASE_APP 2
|
||||
#define XPRG_ERASE_BOOT 3
|
||||
#define XPRG_ERASE_EEPROM 4
|
||||
#define XPRG_ERASE_APP_PAGE 5
|
||||
#define XPRG_ERASE_BOOT_PAGE 6
|
||||
#define XPRG_ERASE_EEPROM_PAGE 7
|
||||
#define XPRG_ERASE_USERSIG 8
|
||||
|
||||
#define XPRG_MEM_WRITE_ERASE 0
|
||||
#define XPRG_MEM_WRITE_WRITE 1
|
||||
|
||||
#define XPRG_CRC_APP 1
|
||||
#define XPRG_CRC_BOOT 2
|
||||
#define XPRG_CRC_FLASH 3
|
||||
|
||||
#define XPRG_ERR_OK 0
|
||||
#define XPRG_ERR_FAILED 1
|
||||
#define XPRG_ERR_COLLISION 2
|
||||
#define XPRG_ERR_TIMEOUT 3
|
||||
|
||||
#define XPRG_PARAM_NVMBASE 0x01
|
||||
#define XPRG_PARAM_EEPPAGESIZE 0x02
|
||||
|
||||
#define STATUS_CMD_OK 0x00
|
||||
#define STATUS_CMD_TOUT 0x80
|
||||
#define STATUS_RDY_BSY_TOUT 0x81
|
||||
|
|
|
@ -67,7 +67,7 @@ static ParameterItem_t ParameterTable[] =
|
|||
.ParamPrivileges = PARAM_PRIV_READ },
|
||||
|
||||
{ .ParamID = PARAM_SCK_DURATION,
|
||||
.ParamValue = (TOTAL_PROGRAMMING_SPEEDS - 1),
|
||||
.ParamValue = (TOTAL_ISP_PROGRAMMING_SPEEDS - 1),
|
||||
.ParamPrivileges = PARAM_PRIV_READ | PARAM_PRIV_WRITE },
|
||||
|
||||
{ .ParamID = PARAM_RESET_POLARITY,
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
|
||||
#include "V2Protocol.h"
|
||||
#include "V2ProtocolConstants.h"
|
||||
#include "V2ProtocolTarget.h"
|
||||
|
||||
/* Macros: */
|
||||
/** Parameter privilege mask to allow the host PC to read the parameter's value */
|
||||
|
|
|
@ -30,20 +30,17 @@
|
|||
|
||||
/** \file
|
||||
*
|
||||
* Target-related functions for the V2 Protocol decoder.
|
||||
* Target-related functions for the ISP 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)
|
||||
uint8_t ISPTarget_GetSPIPrescalerMask(void)
|
||||
{
|
||||
static const uint8_t SPIMaskFromSCKDuration[] =
|
||||
{
|
||||
|
@ -81,7 +78,7 @@ uint8_t V2Protocol_GetSPIPrescalerMask(void)
|
|||
*
|
||||
* \param[in] ResetTarget Boolean true when the target should be held in reset, false otherwise
|
||||
*/
|
||||
void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
|
||||
void ISPTarget_ChangeTargetResetLine(bool ResetTarget)
|
||||
{
|
||||
if (ResetTarget)
|
||||
{
|
||||
|
@ -109,8 +106,8 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
|
|||
* \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 ISPTarget_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,
|
||||
uint8_t DelayMS, uint8_t ReadMemCommand)
|
||||
{
|
||||
uint8_t ProgrammingStatus = STATUS_CMD_OK;
|
||||
|
||||
|
@ -139,7 +136,7 @@ uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAdd
|
|||
break;
|
||||
case PROG_MODE_WORD_READYBUSY_MASK:
|
||||
case PROG_MODE_PAGED_READYBUSY_MASK:
|
||||
ProgrammingStatus = V2Protocol_WaitWhileTargetBusy();
|
||||
ProgrammingStatus = ISPTarget_WaitWhileTargetBusy();
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -151,7 +148,7 @@ uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAdd
|
|||
*
|
||||
* \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT otherwise
|
||||
*/
|
||||
uint8_t V2Protocol_WaitWhileTargetBusy(void)
|
||||
uint8_t ISPTarget_WaitWhileTargetBusy(void)
|
||||
{
|
||||
TCNT0 = 0;
|
||||
|
||||
|
@ -174,7 +171,7 @@ uint8_t V2Protocol_WaitWhileTargetBusy(void)
|
|||
* 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)
|
||||
void ISPTarget_LoadExtendedAddress(void)
|
||||
{
|
||||
SPI_SendByte(0x4D);
|
||||
SPI_SendByte(0x00);
|
||||
|
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
/** \file
|
||||
*
|
||||
* Header file for V2ProtocolTarget.c.
|
||||
* Header file for ISPTarget.c.
|
||||
*/
|
||||
|
||||
#ifndef _V2_PROTOCOL_TARGET_
|
||||
#define _V2_PROTOCOL_TARGET_
|
||||
#ifndef _ISP_TARGET_
|
||||
#define _ISP_TARGET_
|
||||
|
||||
/* Includes: */
|
||||
#include <avr/io.h>
|
||||
|
@ -49,32 +49,14 @@
|
|||
|
||||
/* 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 240
|
||||
|
||||
/* External Variables: */
|
||||
extern uint32_t CurrentAddress;
|
||||
|
||||
/* Inline Functions: */
|
||||
/** Blocking delay for a given number of milliseconds, via a hardware timer.
|
||||
*
|
||||
* \param[in] DelayMS Number of milliseconds to delay for
|
||||
*/
|
||||
static inline void V2Protocol_DelayMS(uint8_t DelayMS)
|
||||
{
|
||||
TCNT0 = 0;
|
||||
while (TCNT0 < DelayMS);
|
||||
}
|
||||
#define TOTAL_ISP_PROGRAMMING_SPEEDS 7
|
||||
|
||||
/* 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 ISPTarget_GetSPIPrescalerMask(void);
|
||||
void ISPTarget_ChangeTargetResetLine(bool ResetTarget);
|
||||
uint8_t ISPTarget_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);
|
||||
uint8_t ISPTarget_WaitWhileTargetBusy(void);
|
||||
void ISPTarget_LoadExtendedAddress(void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -130,6 +130,7 @@ SRC = $(TARGET).c \
|
|||
Lib/V2Protocol.c \
|
||||
Lib/V2ProtocolParams.c \
|
||||
Lib/V2ProtocolTarget.c \
|
||||
Lib/ISPProtocol.c \
|
||||
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
|
||||
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
|
||||
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
|
||||
|
|
Loading…
Reference in New Issue