Factor out all the ISP related code into a seperate ISPProtocol set of files in the...

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

diff --git a/Projects/AVRISP/Lib/V2ProtocolTarget.h b/Projects/AVRISP/Lib/V2ProtocolTarget.h
index 0de7b39..121d789 100644 (file)
--- a/Projects/AVRISP/Lib/V2ProtocolTarget.h
+++ b/Projects/AVRISP/Lib/V2ProtocolTarget.h
@@ -30,11 +30,11 @@
 \r
 /** \file\r
  *\r
 \r
 /** \file\r
  *\r

- *  Header file for V2ProtocolTarget.c.\r
+ *  Header file for ISPTarget.c.\r

  */\r
 \r
  */\r
 \r

-#ifndef _V2_PROTOCOL_TARGET_\r
-#define _V2_PROTOCOL_TARGET_\r
+#ifndef _ISP_TARGET_\r
+#define _ISP_TARGET_\r

 \r
        /* Includes: */\r
                #include <avr/io.h>\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r


@@ -49,32 +49,14 @@
 \r
        /* Macros: */\r
                /** Total number of allowable ISP programming speeds supported by the device */\r
 \r
        /* Macros: */\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    240\r
-               \r
-       /* External Variables: */\r
-               extern uint32_t CurrentAddress;\r
-\r
-       /* Inline Functions: */\r
-               /** Blocking delay for a given number of milliseconds, via a hardware timer.\r
-                *\r
-                *  \param[in] DelayMS  Number of milliseconds to delay for\r
-                */\r
-               static inline void V2Protocol_DelayMS(uint8_t DelayMS)\r
-               {\r
-                       TCNT0 = 0;\r
-                       while (TCNT0 < DelayMS);\r
-               }\r
+               #define TOTAL_ISP_PROGRAMMING_SPEEDS  7\r

 \r
        /* Function Prototypes: */\r
 \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_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r
+                       uint8_t ISPTarget_GetSPIPrescalerMask(void);\r
+                       void    ISPTarget_ChangeTargetResetLine(bool ResetTarget);\r
+                       uint8_t ISPTarget_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r

                                                    uint8_t DelayMS, uint8_t ReadMemCommand);\r
                                                    uint8_t DelayMS, uint8_t ReadMemCommand);\r

-                       uint8_t V2Protocol_WaitWhileTargetBusy(void);\r
-                       void    V2Protocol_LoadExtendedAddress(void);\r
+                       uint8_t ISPTarget_WaitWhileTargetBusy(void);\r
+                       void    ISPTarget_LoadExtendedAddress(void);\r

 \r
 #endif\r
 \r
 #endif\r