Fixed host state machine not enabling Auto VBUS mode when HOST_DEVICE_SETTLE_DELAY_MS...

[pub/lufa.git] / Projects / AVRISP / Lib / V2ProtocolTarget.c

diff --git a/Projects/AVRISP/Lib/V2ProtocolTarget.c b/Projects/AVRISP/Lib/V2ProtocolTarget.c
index 9c6ccf4..80e8be1 100644 (file)
--- a/Projects/AVRISP/Lib/V2ProtocolTarget.c
+++ b/Projects/AVRISP/Lib/V2ProtocolTarget.c
@@ -45,7 +45,7 @@ uint32_t CurrentAddress;
  */\r
 uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
 {\r
  */\r
 uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
 {\r

-       static const uint8_t SPIMaskFromSCKDuration[TOTAL_PROGRAMMING_SPEEDS] =\r
+       static const uint8_t SPIMaskFromSCKDuration[] =\r

        {\r
        #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,    // AVRStudio =   8MHz SPI, Actual =   4MHz SPI\r
        {\r
        #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,    // AVRStudio =   8MHz SPI, Actual =   4MHz SPI\r


@@ -77,15 +77,15 @@ uint8_t V2Protocol_GetSPIPrescalerMask(void)
 }\r
 \r
 /** Asserts or deasserts the target's reset line, using the correct polarity as set by the host using a SET PARAM command.\r
 }\r
 \r
 /** Asserts or deasserts the target's reset line, using the correct polarity as set by the host using a SET PARAM command.\r

- *  When not asserted, the line is tristated so as not to intefere with normal device operation.\r
+ *  When not asserted, the line is tristated so as not to interfere with normal device operation.\r

  *\r
  *\r

- *  \param ResetTarget Boolean true when the target should be held in reset, false otherwise\r
+ *  \param[in] ResetTarget Boolean true when the target should be held in reset, false otherwise\r

  */\r
 void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r
 {\r
        if (ResetTarget)\r
        {\r
  */\r
 void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r
 {\r
        if (ResetTarget)\r
        {\r

-               RESET_LINE_DDR  |= RESET_LINE_MASK;\r
+               RESET_LINE_DDR |= RESET_LINE_MASK;\r

                \r
                if (!(V2Params_GetParameterValue(PARAM_RESET_POLARITY)))\r
                  RESET_LINE_PORT |= RESET_LINE_MASK;\r
                \r
                if (!(V2Params_GetParameterValue(PARAM_RESET_POLARITY)))\r
                  RESET_LINE_PORT |= RESET_LINE_MASK;\r


@@ -100,11 +100,11 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
 /** Waits until the last issued target memory programming command has completed, via the check mode given and using\r
  *  the given parameters.\r
  *\r
 /** Waits until the last issued target memory programming command has completed, via the check mode given and using\r
  *  the given parameters.\r
  *\r

- *  \param ProgrammingMode  Programming mode used and completion check to use, a mask of PROG_MODE_* constants\r
- *  \param PollAddress  Memory address to poll for completion if polling check mode used\r
- *  \param PollValue  Poll value to check against if polling check mode used\r
- *  \param DelayMS  Milliseconds to delay before returning if delay check mode used\r
- *  \param ReadMemCommand  Device low-level READ MEMORY command to send if value check mode used\r
+ *  \param[in] ProgrammingMode  Programming mode used and completion check to use, a mask of PROG_MODE_* constants\r
+ *  \param[in] PollAddress  Memory address to poll for completion if polling check mode used\r
+ *  \param[in] PollValue  Poll value to check against if polling check mode used\r
+ *  \param[in] DelayMS  Milliseconds to delay before returning if delay check mode used\r
+ *  \param[in] ReadMemCommand  Device low-level READ MEMORY command to send if value check mode used\r

  *\r
  *  \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT or\r
  *          \ref STATUS_CMD_TOUT otherwise\r
  *\r
  *  \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT or\r
  *          \ref STATUS_CMD_TOUT otherwise\r


@@ -161,9 +161,8 @@ uint8_t V2Protocol_WaitWhileTargetBusy(void)
                SPI_SendByte(0x00);\r
 \r
                SPI_SendByte(0x00);\r
                SPI_SendByte(0x00);\r
 \r
                SPI_SendByte(0x00);\r

-               bool DeviceBusy = (SPI_ReceiveByte() & 0x01);\r

        }\r
        }\r

-       while (DeviceBusy && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));\r
+       while ((SPI_ReceiveByte() & 0x01) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));\r

 \r
        if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)\r
          return STATUS_RDY_BSY_TOUT;\r
 \r
        if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)\r
          return STATUS_RDY_BSY_TOUT;\r