Fixed compile errors in the incomplete BluetoothHost demo application (thanks to...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / ISP / ISPTarget.c

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
index 624d591..f08ee6a 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
@@ -108,10 +108,10 @@ static uint16_t TimerCompareFromSCKDuration[] PROGMEM =
 bool HardwareSPIMode = true;
 
 /** Software SPI data register for sending and receiving */
 bool HardwareSPIMode = true;
 
 /** Software SPI data register for sending and receiving */

-volatile uint8_t SoftSPI_Data;
+static volatile uint8_t SoftSPI_Data;

 
 /** Number of bits left to transfer in the software SPI driver */
 
 /** Number of bits left to transfer in the software SPI driver */

-volatile uint8_t SoftSPI_BitsRemaining;
+static volatile uint8_t SoftSPI_BitsRemaining;

 
 
 /** ISR to handle software SPI transmission and reception */
 
 
 /** ISR to handle software SPI transmission and reception */


@@ -140,7 +140,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
        PINB |= (1 << 1);
 }
 
        PINB |= (1 << 1);
 }
 

-/** Initialises the appropriate SPI driver (hardware or software, depending on the selected ISP speed) ready for
+/** Initializes the appropriate SPI driver (hardware or software, depending on the selected ISP speed) ready for

  *  communication with the attached target.
  */
 void ISPTarget_EnableTargetISP(void)
  *  communication with the attached target.
  */
 void ISPTarget_EnableTargetISP(void)


@@ -172,7 +172,7 @@ void ISPTarget_DisableTargetISP(void)
 {
        if (HardwareSPIMode)
        {
 {
        if (HardwareSPIMode)
        {

-               SPI_ShutDown();
+               SPI_Disable();

        }
        else
        {
        }
        else
        {


@@ -186,7 +186,7 @@ void ISPTarget_DisableTargetISP(void)
 }
 
 /** Configures the AVR to produce a .5MHz rescue clock out of the OCR1A pin of the AVR, so
 }
 
 /** Configures the AVR to produce a .5MHz rescue clock out of the OCR1A pin of the AVR, so

- *  that it can be fed into the XTAL1 pin of an AVR whose fuses have been misconfigured for
+ *  that it can be fed into the XTAL1 pin of an AVR whose fuses have been mis-configured for

  *  an external clock rather than a crystal. When used, the ISP speed must be 125KHz for this
  *  functionality to work correctly.
  */
  *  an external clock rather than a crystal. When used, the ISP speed must be 125KHz for this
  *  functionality to work correctly.
  */


@@ -250,7 +250,7 @@ uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte)
 
        TCNT1  = 0;
        TCCR1B = ((1 << WGM12) | (1 << CS11));
 
        TCNT1  = 0;
        TCCR1B = ((1 << WGM12) | (1 << CS11));

-       while (SoftSPI_BitsRemaining && TimeoutTicksRemaining);
+       while (SoftSPI_BitsRemaining && !(TimeoutExpired));

        TCCR1B = 0;
 
        return SoftSPI_Data;
        TCCR1B = 0;
 
        return SoftSPI_Data;


@@ -292,9 +292,9 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
                ISPTarget_SendByte(0x00);
                ISPTarget_SendByte(0x00);
        }
                ISPTarget_SendByte(0x00);
                ISPTarget_SendByte(0x00);
        }

-       while ((ISPTarget_ReceiveByte() & 0x01) && TimeoutTicksRemaining);
+       while ((ISPTarget_ReceiveByte() & 0x01) && !(TimeoutExpired));

 
 

-       return TimeoutTicksRemaining ? STATUS_CMD_OK : STATUS_RDY_BSY_TOUT;
+       return (TimeoutExpired) ? STATUS_RDY_BSY_TOUT : STATUS_CMD_OK;

 }
 
 /** Sends a low-level LOAD EXTENDED ADDRESS command to the target, for addressing of memory beyond the
 }
 
 /** Sends a low-level LOAD EXTENDED ADDRESS command to the target, for addressing of memory beyond the


@@ -344,9 +344,9 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode,
                                ISPTarget_SendByte(PollAddress >> 8);
                                ISPTarget_SendByte(PollAddress & 0xFF);
                        }
                                ISPTarget_SendByte(PollAddress >> 8);
                                ISPTarget_SendByte(PollAddress & 0xFF);
                        }

-                       while ((ISPTarget_TransferByte(0x00) == PollValue) && TimeoutTicksRemaining);
+                       while ((ISPTarget_TransferByte(0x00) == PollValue) && !(TimeoutExpired));

 
 

-                       if (!(TimeoutTicksRemaining))
+                       if (TimeoutExpired)

                         ProgrammingStatus = STATUS_CMD_TOUT;
 
                        break;
                         ProgrammingStatus = STATUS_CMD_TOUT;
 
                        break;