eqmk/qmk_firmware
1
0
Fork 0
forked from mfulz_github/qmk_firmware
Code Issues Pull Requests Projects Releases Wiki Activity

Change spinloop in the AVRISP project Unknown V2 Protocol Command handler to use Endpoint_WaitUntilReady() instead to prevent infinite loops.

Browse Source
This commit is contained in:
Dean Camera 2009-08-19 13:19:01 +00:00
parent fa8beef82d
commit a9602f0250
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Projects/Unfinished/AVRISP/Lib/V2Protocol.c
View File

@ -104,14 +104,16 @@ void V2Protocol_ProcessCommand(void)
static void V2Protocol_Command_Unknown(uint8_t V2Command) static void V2Protocol_Command_Unknown(uint8_t V2Command)
{ {
/* Discard all incomming data */
while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE) while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)
{ {
Endpoint_ClearOUT(); Endpoint_ClearOUT();
while (!(Endpoint_IsOUTReceived())); Endpoint_WaitUntilReady();
} }
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
Endpoint_WaitUntilReady();
Endpoint_Write_Byte(V2Command); Endpoint_Write_Byte(V2Command);
Endpoint_Write_Byte(STATUS_CMD_UNKNOWN); Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);
@ -166,8 +168,8 @@ static void V2Protocol_Command_GetSetParam(uint8_t V2Command)
static void V2Protocol_Command_SPIMulti(void) static void V2Protocol_Command_SPIMulti(void)
{ {
uint8_t TxBytes = Endpoint_Read_Byte(); uint8_t TxBytes = Endpoint_Read_Byte();
uint8_t RxBytes = Endpoint_Read_Byte(); uint8_t RxBytes = Endpoint_Read_Byte();
uint8_t RxStartAddr = Endpoint_Read_Byte(); uint8_t RxStartAddr = Endpoint_Read_Byte();
uint8_t TxData[255]; uint8_t TxData[255];
@ -183,6 +185,7 @@ static void V2Protocol_Command_SPIMulti(void)
uint8_t CurrTxPos = 0; uint8_t CurrTxPos = 0;
uint8_t CurrRxPos = 0; uint8_t CurrRxPos = 0;
/* Write out bytes to transmit until the start of the bytes to receive is met */
while (CurrTxPos < RxStartAddr) while (CurrTxPos < RxStartAddr)
{ {
if (CurrTxPos < TxBytes) if (CurrTxPos < TxBytes)
@ -193,6 +196,7 @@ static void V2Protocol_Command_SPIMulti(void)
CurrTxPos++; CurrTxPos++;
} }
/* Transmit remaining bytes with padding as needed, read in response bytes */
while (CurrRxPos < RxBytes) while (CurrRxPos < RxBytes)
{ {
if (CurrTxPos < TxBytes) if (CurrTxPos < TxBytes)

2
Projects/Unfinished/AVRISP/Lib/V2Protocol.h
View File

@ -38,9 +38,7 @@
/* Includes: */ /* Includes: */
#include <avr/io.h> #include <avr/io.h>
#include <avr/eeprom.h>
#include <LUFA/Version.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SPI.h> #include <LUFA/Drivers/Peripheral/SPI.h>