ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops - revert commit of an incomplete port of the AVRISP-MKII project.

Browse source
This commit is contained in:
Dean Camera 2011-05-29 12:47:56 +00:00
parent ea922c98d1
commit 0b6d5467bc
19 changed files with 156 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
View file

@ -52,7 +52,7 @@ void ISPProtocol_EnterISPMode(void)
uint8_t PollValue;
uint8_t PollIndex;
uint8_t EnterProgBytes[4];
} ATTR_PACKED Enter_ISP_Params;
} Enter_ISP_Params;
Endpoint_Read_Stream_LE(&Enter_ISP_Params, sizeof(Enter_ISP_Params), NULL);
@ -107,7 +107,7 @@ void ISPProtocol_LeaveISPMode(void)
{
uint8_t PreDelayMS;
uint8_t PostDelayMS;
} ATTR_PACKED Leave_ISP_Params;
} Leave_ISP_Params;
Endpoint_Read_Stream_LE(&Leave_ISP_Params, sizeof(Leave_ISP_Params), NULL);
@ -141,12 +141,12 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
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
} ATTR_PACKED Write_Memory_Params; // whole page and ACK the packet as fast as possible to prevent it from aborting
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)), NULL);
Write_Memory_Params.BytesToWrite = be16_to_cpu(Write_Memory_Params.BytesToWrite);
Write_Memory_Params.BytesToWrite = SwapEndian_16(Write_Memory_Params.BytesToWrite);
if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData))
{
@ -286,10 +286,10 @@ void ISPProtocol_ReadMemory(uint8_t V2Command)
{
uint16_t BytesToRead;
uint8_t ReadMemoryCommand;
} ATTR_PACKED Read_Memory_Params;
} Read_Memory_Params;
Endpoint_Read_Stream_LE(&Read_Memory_Params, sizeof(Read_Memory_Params), NULL);
Read_Memory_Params.BytesToRead = be16_to_cpu(Read_Memory_Params.BytesToRead);
Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead);
Endpoint_ClearOUT();
Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
@ -360,7 +360,7 @@ void ISPProtocol_ChipErase(void)
uint8_t EraseDelayMS;
uint8_t PollMethod;
uint8_t EraseCommandBytes[4];
} ATTR_PACKED Erase_Chip_Params;
} Erase_Chip_Params;
Endpoint_Read_Stream_LE(&Erase_Chip_Params, sizeof(Erase_Chip_Params), NULL);
@ -396,7 +396,7 @@ void ISPProtocol_ReadFuseLockSigOSCCAL(uint8_t V2Command)
{
uint8_t RetByte;
uint8_t ReadCommandBytes[4];
} ATTR_PACKED Read_FuseLockSigOSCCAL_Params;
} Read_FuseLockSigOSCCAL_Params;
Endpoint_Read_Stream_LE(&Read_FuseLockSigOSCCAL_Params, sizeof(Read_FuseLockSigOSCCAL_Params), NULL);
@ -427,7 +427,7 @@ void ISPProtocol_WriteFuseLock(uint8_t V2Command)
struct
{
uint8_t WriteCommandBytes[4];
} ATTR_PACKED Write_FuseLockSig_Params;
} Write_FuseLockSig_Params;
Endpoint_Read_Stream_LE(&Write_FuseLockSig_Params, sizeof(Write_FuseLockSig_Params), NULL);
@ -454,7 +454,7 @@ void ISPProtocol_SPIMulti(void)
uint8_t RxBytes;
uint8_t RxStartAddr;
uint8_t TxData[255];
} ATTR_PACKED SPI_Multi_Params;
} SPI_Multi_Params;
Endpoint_Read_Stream_LE(&SPI_Multi_Params, (sizeof(SPI_Multi_Params) - sizeof(SPI_Multi_Params.TxData)), NULL);
Endpoint_Read_Stream_LE(&SPI_Multi_Params.TxData, SPI_Multi_Params.TxBytes, NULL);

10
Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
View file

@ -37,14 +37,10 @@
#define _ISP_PROTOCOL_
/* Includes: */
#include <LUFA/Common/Common.h>
#include <avr/io.h>
#include <util/delay.h>
#include <LUFA/Drivers/USB/USB.h>
#if (ARCH == ARCH_AVR8)
#include <avr/io.h>
#elif (ARCH == ARCH_UC3)
#include <avr32/io.h>
#endif
#include "../V2Protocol.h"

19
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
View file

@ -37,19 +37,12 @@
#define _ISP_TARGET_
/* Includes: */
#include <LUFA/Common/Common.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <util/delay.h>
#include <LUFA/Drivers/USB/USB.h>
#if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__)
#include <LUFA/Drivers/Peripheral/SPI.h> // TODO: FIXME
#endif
#if (ARCH == ARCH_AVR8)
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif (ARCH == ARCH_UC3)
#include <avr32/io.h>
#endif
#include <LUFA/Drivers/Peripheral/SPI.h>
#include "../V2ProtocolParams.h"
@ -91,7 +84,6 @@
const uint8_t ReadMemCommand);
/* Inline Functions: */
#if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__)
/** Sends a byte of ISP data to the attached target, using the appropriate SPI hardware or
* software routines depending on the selected ISP speed.
*
@ -132,7 +124,6 @@
else
return ISPTarget_TransferSoftSPIByte(Byte);
}
#endif
#endif