Finished preliminary AVRISP project - all V2 protocol commands now work correctly...

[pub/USBasp.git] / Projects / Incomplete / AVRISP / Lib / V2ProtocolTarget.h

diff --git a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.h b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.h
index 847770c..6dce59d 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.h
+++ b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.h
@@ -48,16 +48,28 @@
                #include "V2ProtocolParams.h"\r
 \r
        /* Macros: */\r
                #include "V2ProtocolParams.h"\r
 \r
        /* Macros: */\r

-               #define TARGET_BUSY_TIMEOUT_MS    100\r
-       \r
+               /** Total number of allowable ISP programming speeds supported by the device */\r
+               #define TOTAL_PROGRAMMING_SPEEDS  7\r
+\r
+               /** Timeout in milliseconds of target busy-wait loops waiting for a command to complete */\r
+               #define TARGET_BUSY_TIMEOUT_MS    150\r
+               \r

        /* External Variables: */\r
                extern uint32_t CurrentAddress;\r
 \r
        /* External Variables: */\r
                extern uint32_t CurrentAddress;\r
 \r

+       /* Inline Functions: */\r
+               static inline void V2Protocol_DelayMS(uint8_t MS)\r
+               {\r
+                       TCNT0 = 0;\r
+                       while (TCNT0 < MS);\r
+               }\r
+\r

        /* Function Prototypes: */\r
                        uint8_t V2Protocol_GetSPIPrescalerMask(void);\r
                        void    V2Protocol_ChangeTargetResetLine(bool ResetTarget);\r
                        void    V2Protocol_DelayMS(uint8_t MS);\r
        /* Function Prototypes: */\r
                        uint8_t V2Protocol_GetSPIPrescalerMask(void);\r
                        void    V2Protocol_ChangeTargetResetLine(bool ResetTarget);\r
                        void    V2Protocol_DelayMS(uint8_t MS);\r

-                       uint8_t V2Protocol_WaitForProgrammingComplete(uint16_t PollAddress, uint8_t ProgrammingMode);\r
+                       uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r
+                                                   uint8_t DelayMS, uint8_t ReadMemCommand);\r

                        uint8_t V2Protocol_WaitWhileTargetBusy(void);\r
                        void    V2Protocol_LoadExtendedAddress(void);\r
 \r
                        uint8_t V2Protocol_WaitWhileTargetBusy(void);\r
                        void    V2Protocol_LoadExtendedAddress(void);\r
 \r