Commit 04354ffc authored by Dean Camera's avatar Dean Camera
Browse files

Added handler for the V2 Protocol SPI_MULTI command to the AVRISP Programmer project.

Added documentation of the makefile CDEFS values to the MagStripe project.
parent 083d3615
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#endif #endif
/* Type Defines: */ /* Type Defines: */
/* Type define for a pointer to a bit in a bit buffer. */ /** Type define for a pointer to a bit in a bit buffer. */
typedef struct typedef struct
{ {
uint8_t* CurrentByte; /**< Pointer to the current byte in the buffer */ uint8_t* CurrentByte; /**< Pointer to the current byte in the buffer */
......
...@@ -110,5 +110,55 @@ ...@@ -110,5 +110,55 @@
* <td>CircularBitBuffer.h</td> * <td>CircularBitBuffer.h</td>
* <td>Gives the maximum number of bits per track which can be buffered by the device for later transmission to a host.</td> * <td>Gives the maximum number of bits per track which can be buffered by the device for later transmission to a host.</td>
* </tr> * </tr>
* <tr>
* <td>MAG_T1_CLOCK</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's CLOCK line for the reader's track 1 output.</td>
* </tr>
* <tr>
* <td>MAG_T1_DATA</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's DATA line for the reader's track 1 output.</td>
* </tr>
* <tr>
* <td>MAG_T2_CLOCK</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's CLOCK line for the reader's track 2 output.</td>
* </tr>
* <tr>
* <td>MAG_T2_DATA</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's DATA line for the reader's track 2 output.</td>
* </tr>
* <tr>
* <td>MAG_T3_CLOCK</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's CLOCK line for the reader's track 3 output.</td>
* </tr>
* <tr>
* <td>MAG_T3_DATA</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's DATA line for the reader's track 3 output.</td>
* </tr>
* <tr>
* <td>MAG_CARDPRESENT</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the magnetic card reader's card detection output.</td>
* </tr>
* <tr>
* <td>MAG_PIN</td>
* <td>Makefile CDEFS</td>
* <td>PIN register that the magnetic card reader device is attached to.</td>
* </tr>
* <tr>
* <td>MAG_PORT</td>
* <td>Makefile CDEFS</td>
* <td>PORT register that the magnetic card reader device is attached to.</td>
* </tr>
* <tr>
* <td>MAG_DDR</td>
* <td>Makefile CDEFS</td>
* <td>DDR register that the magnetic card reader device is attached to.</td>
* </tr>
* </table> * </table>
*/ */
...@@ -43,6 +43,8 @@ int main(void) ...@@ -43,6 +43,8 @@ int main(void)
{ {
SetupHardware(); SetupHardware();
V2Protocol_ConfigureHardware();
printf("AVRISP-MKII Clone\r\n"); printf("AVRISP-MKII Clone\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
...@@ -67,6 +69,7 @@ void SetupHardware(void) ...@@ -67,6 +69,7 @@ void SetupHardware(void)
/* Hardware Initialization */ /* Hardware Initialization */
SerialStream_Init(9600, false); SerialStream_Init(9600, false);
SPI_Init(0, true);
LEDs_Init(); LEDs_Init();
USB_Init(); USB_Init();
} }
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <LUFA/Version.h> #include <LUFA/Version.h>
#include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> #include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Peripheral/SPI.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "Lib/V2Protocol.h" #include "Lib/V2Protocol.h"
......
...@@ -55,15 +55,38 @@ ...@@ -55,15 +55,38 @@
* This device spoofs Atmel's official AVRISP-MKII device PID so that it remains compatible with Atmel's AVRISP-MKII * This device spoofs Atmel's official AVRISP-MKII device PID so that it remains compatible with Atmel's AVRISP-MKII
* drivers. When promted, direct your OS to install Atmel's AVRISP-MKII drivers provided with AVRStudio. * drivers. When promted, direct your OS to install Atmel's AVRISP-MKII drivers provided with AVRStudio.
* *
* This demo contains both FLASH and EEPROM data, as compiled .HEX and .EEP files respectively. <b>Both</b> files must
* be loaded into the device for it to perform correctly.
*
* \section SSec_Options Project Options * \section SSec_Options Project Options
* *
* The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value. * The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
* *
* <table> * <table>
* <tr> * <tr>
* <td> * <td><b>Define Name:</b></td>
* None * <td><b>Location:</b></td>
* </td> * <td><b>Description:</b></td>
* </tr>
* <tr>
* <td>RESET_LINE_PORT</td>
* <td>Makefile CDEFS</td>
* <td>PORT register for the programmer's target RESET line.</td>
* </tr>
* <tr>
* <td>RESET_LINE_PIN</td>
* <td>Makefile CDEFS</td>
* <td>PIN register for the programmer's target RESET line.</td>
* </tr>
* <tr>
* <td>RESET_LINE_DDR</td>
* <td>Makefile CDEFS</td>
* <td>DDR register for the programmer's target RESET line.</td>
* </tr>
* <tr>
* <td>RESET_LINE_MASK</td>
* <td>Makefile CDEFS</td>
* <td>Mask for the programmer's target RESET line on the chosen port.</td>
* </tr> * </tr>
* </table> * </table>
*/ */
...@@ -59,6 +59,24 @@ ParameterItem_t ParameterTable[] EEMEM = ...@@ -59,6 +59,24 @@ ParameterItem_t ParameterTable[] EEMEM =
{ .ParameterID = PARAM_DISCHARGEDELAY, { .ParameterID = PARAM_DISCHARGEDELAY,
.ParameterValue = 0x00 }, .ParameterValue = 0x00 },
}; };
void V2Protocol_ConfigureHardware(void)
{
#if F_CPU == 8000000
uint8_t SPIMaskFromSCKDuration[] = {SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128,
SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128};
#else
uint8_t SPIMaskFromSCKDuration[] = {SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128,
SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128};
#endif
uint8_t SCKDuration = eeprom_read_byte(&V2Protocol_GetParameterItem(PARAM_SCK_DURATION)->ParameterValue);
if (SCKDuration > sizeof(SPIMaskFromSCKDuration))
SCKDuration = SPIMaskFromSCKDuration;
SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);
}
void V2Protocol_ProcessCommand(void) void V2Protocol_ProcessCommand(void)
{ {
...@@ -73,6 +91,9 @@ void V2Protocol_ProcessCommand(void) ...@@ -73,6 +91,9 @@ void V2Protocol_ProcessCommand(void)
case CMD_GET_PARAMETER: case CMD_GET_PARAMETER:
V2Protocol_ProcessCmdGetSetParam(V2Command); V2Protocol_ProcessCmdGetSetParam(V2Command);
break; break;
case CMD_SPI_MULTI:
V2Protocol_ProcessCmdSPIMulti();
break;
default: default:
while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE) while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)
{ {
...@@ -83,6 +104,7 @@ void V2Protocol_ProcessCommand(void) ...@@ -83,6 +104,7 @@ void V2Protocol_ProcessCommand(void)
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
Endpoint_Write_Byte(V2Command);
Endpoint_Write_Byte(STATUS_CMD_UNKNOWN); Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);
Endpoint_ClearIN(); Endpoint_ClearIN();
break; break;
...@@ -90,9 +112,7 @@ void V2Protocol_ProcessCommand(void) ...@@ -90,9 +112,7 @@ void V2Protocol_ProcessCommand(void)
printf("COMMAND 0x%02x\r\n", V2Command); printf("COMMAND 0x%02x\r\n", V2Command);
Endpoint_WaitUntilReady(); Endpoint_WaitUntilReady();
/* Reset Endpoint direction to OUT ready for next command */
Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT); Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);
} }
...@@ -113,6 +133,8 @@ static void V2Protocol_ProcessCmdSignOn(void) ...@@ -113,6 +133,8 @@ static void V2Protocol_ProcessCmdSignOn(void)
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
Endpoint_WaitUntilReady(); Endpoint_WaitUntilReady();
V2Protocol_ConfigureHardware();
Endpoint_Write_Byte(CMD_SIGN_ON); Endpoint_Write_Byte(CMD_SIGN_ON);
Endpoint_Write_Byte(STATUS_CMD_OK); Endpoint_Write_Byte(STATUS_CMD_OK);
Endpoint_Write_Byte(PROGRAMMER_ID_LEN); Endpoint_Write_Byte(PROGRAMMER_ID_LEN);
...@@ -131,9 +153,10 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command) ...@@ -131,9 +153,10 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command)
ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID); ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);
Endpoint_Write_Byte(V2Command);
if (ParameterItem != NULL) if (ParameterItem != NULL)
{ {
Endpoint_Write_Byte(V2Command);
Endpoint_Write_Byte(STATUS_CMD_OK); Endpoint_Write_Byte(STATUS_CMD_OK);
if (V2Command == CMD_SET_PARAMETER) if (V2Command == CMD_SET_PARAMETER)
...@@ -148,3 +171,51 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command) ...@@ -148,3 +171,51 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command)
Endpoint_ClearIN(); Endpoint_ClearIN();
} }
static void V2Protocol_ProcessCmdSPIMulti(void)
{
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);
uint8_t CurrTxPos = 0;
uint8_t CurrRxPos = 0;
while (CurrTxPos < RxStartAddr)
{
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]));
CurrTxPos++;
}
else
{
Endpoint_Write_Byte(SPI_ReceiveByte());
}
CurrRxPos++;
}
Endpoint_Write_Byte(STATUS_CMD_OK);
Endpoint_ClearIN();
}
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SPI.h>
#include "../Descriptors.h" #include "../Descriptors.h"
#include "V2ProtocolConstants.h" #include "V2ProtocolConstants.h"
...@@ -55,13 +56,15 @@ ...@@ -55,13 +56,15 @@
uint8_t ParameterValue; uint8_t ParameterValue;
} ParameterItem_t; } ParameterItem_t;
/* Function Prototypes: */ /* Function Prototypes: */
void V2Protocol_ConfigureHardware(void);
void V2Protocol_ProcessCommand(void); void V2Protocol_ProcessCommand(void);
#if defined(INCLUDE_FROM_V2PROTOCOL_C) #if defined(INCLUDE_FROM_V2PROTOCOL_C)
static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID); static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID);
static void V2Protocol_ProcessCmdSignOn(void); static void V2Protocol_ProcessCmdSignOn(void);
static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command); static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command);
static void V2Protocol_ProcessCmdSPIMulti(void);
#endif #endif
#endif #endif
......
...@@ -193,6 +193,11 @@ CSTANDARD = -std=gnu99 ...@@ -193,6 +193,11 @@ CSTANDARD = -std=gnu99
# Place -D or -U options here for C sources # Place -D or -U options here for C sources
CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
CDEFS += -DRESET_LINE_PORT=PORTA
CDEFS += -DRESET_LINE_PIN=PINA
CDEFS += -DRESET_LINE_DDR=DDRA
CDEFS += -DRESET_LINE_MASK="(1 << 0)"
# Place -D or -U options here for ASM sources # Place -D or -U options here for ASM sources
ADEFS = -DF_CPU=$(F_CPU) ADEFS = -DF_CPU=$(F_CPU)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment