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

Make loops in AVRISP-MKII Clone project's XPROG protocol infinite rather than looping on the timeout value, as this is already checked inside the loop anyway.

This commit is contained in:
Dean Camera 2010-06-25 13:19:05 +00:00
parent 26afe5fe9e
commit 016a4c068a
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
View File

@ -77,7 +77,7 @@ static void TINYNVM_SendWriteNVMRegister(const uint8_t Address)
bool TINYNVM_WaitWhileNVMBusBusy(void) bool TINYNVM_WaitWhileNVMBusBusy(void)
{ {
/* Poll the STATUS register to check to see if NVM access has been enabled */ /* Poll the STATUS register to check to see if NVM access has been enabled */
while (TimeoutMSRemaining) for (;;)
{ {
/* Send the SLDCS command to read the TPI STATUS register to see the NVM bus is active */ /* Send the SLDCS command to read the TPI STATUS register to see the NVM bus is active */
XPROGTarget_SendByte(TPI_CMD_SLDCS | TPI_STATUS_REG); XPROGTarget_SendByte(TPI_CMD_SLDCS | TPI_STATUS_REG);
@ -95,8 +95,6 @@ bool TINYNVM_WaitWhileNVMBusBusy(void)
return true; return true;
} }
} }
return false;
} }
/** Waits while the target's NVM controller is busy performing an operation, exiting if the /** Waits while the target's NVM controller is busy performing an operation, exiting if the
@ -107,7 +105,7 @@ bool TINYNVM_WaitWhileNVMBusBusy(void)
bool TINYNVM_WaitWhileNVMControllerBusy(void) bool TINYNVM_WaitWhileNVMControllerBusy(void)
{ {
/* Poll the STATUS register to check to see if NVM access has been enabled */ /* Poll the STATUS register to check to see if NVM access has been enabled */
while (TimeoutMSRemaining) for (;;)
{ {
/* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */ /* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */
TINYNVM_SendReadNVMRegister(XPROG_Param_NVMCSRRegAddr); TINYNVM_SendReadNVMRegister(XPROG_Param_NVMCSRRegAddr);
@ -125,8 +123,6 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
return true; return true;
} }
} }
return false;
} }
/** Reads memory from the target's memory spaces. /** Reads memory from the target's memory spaces.

8
Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
View File

@ -72,7 +72,7 @@ static void XMEGANVM_SendNVMRegAddress(const uint8_t Register)
bool XMEGANVM_WaitWhileNVMBusBusy(void) bool XMEGANVM_WaitWhileNVMBusBusy(void)
{ {
/* Poll the STATUS register to check to see if NVM access has been enabled */ /* Poll the STATUS register to check to see if NVM access has been enabled */
while (TimeoutMSRemaining) for (;;)
{ {
/* Send the LDCS command to read the PDI STATUS register to see the NVM bus is active */ /* Send the LDCS command to read the PDI STATUS register to see the NVM bus is active */
XPROGTarget_SendByte(PDI_CMD_LDCS | PDI_STATUS_REG); XPROGTarget_SendByte(PDI_CMD_LDCS | PDI_STATUS_REG);
@ -90,8 +90,6 @@ bool XMEGANVM_WaitWhileNVMBusBusy(void)
return true; return true;
} }
} }
return false;
} }
/** Waits while the target's NVM controller is busy performing an operation, exiting if the /** Waits while the target's NVM controller is busy performing an operation, exiting if the
@ -102,7 +100,7 @@ bool XMEGANVM_WaitWhileNVMBusBusy(void)
bool XMEGANVM_WaitWhileNVMControllerBusy(void) bool XMEGANVM_WaitWhileNVMControllerBusy(void)
{ {
/* Poll the NVM STATUS register while the NVM controller is busy */ /* Poll the NVM STATUS register while the NVM controller is busy */
while (TimeoutMSRemaining) for (;;)
{ {
/* Send a LDS command to read the NVM STATUS register to check the BUSY flag */ /* Send a LDS command to read the NVM STATUS register to check the BUSY flag */
XPROGTarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_4BYTES << 2)); XPROGTarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_4BYTES << 2));
@ -121,8 +119,6 @@ bool XMEGANVM_WaitWhileNVMControllerBusy(void)
return true; return true;
} }
} }
return false;
} }
/** Retrieves the CRC value of the given memory space. /** Retrieves the CRC value of the given memory space.

2
Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
View File

@ -193,8 +193,6 @@ static void XPROGTarget_SetTxMode(void)
UCSR1B &= ~(1 << RXEN1); UCSR1B &= ~(1 << RXEN1);
UCSR1B |= (1 << TXEN1); UCSR1B |= (1 << TXEN1);
IsSending = true;
if (TimeoutMSRemaining) if (TimeoutMSRemaining)
TimeoutMSRemaining = COMMAND_TIMEOUT_MS; TimeoutMSRemaining = COMMAND_TIMEOUT_MS;