Fix PDITarget_ReceiveByte() not discarding the start bit properly, and reading in...

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

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index 63a2347..c620300 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -43,24 +43,40 @@
                #include "../Descriptors.h"
                #include "V2ProtocolConstants.h"\r
                #include "V2ProtocolParams.h"
                #include "../Descriptors.h"
                #include "V2ProtocolConstants.h"\r
                #include "V2ProtocolParams.h"

-               #include "V2ProtocolTarget.h"\r
+               #include "ISPProtocol.h"\r
+               #include "PDIProtocol.h"\r
+\r
+       /* Preprocessor Checks: */\r
+               #if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)\r
+                       #undef  ENABLE_ISP_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
+               #endif\r

 
        /* Macros: */\r
                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
 
        /* Macros: */\r
                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */

-               #define PROGRAMMER_ID                   "AVRISP_MK2"\r
-               \r
-               /** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */\r
-               #define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)\r
+               #define PROGRAMMER_ID             "AVRISP_MK2"\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
+       /* 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
+       /* External Variables: */\r
+               extern uint32_t CurrentAddress;\r
+               extern bool MustSetAddress;\r

 \r
 \r

-               #define PROG_MODE_PAGED_WRITES_MASK     (1 << 0)\r
-               #define PROG_MODE_WORD_TIMEDELAY_MASK   (1 << 1)\r
-               #define PROG_MODE_WORD_VALUE_MASK       (1 << 2)\r
-               #define PROG_MODE_WORD_READYBUSY_MASK   (1 << 3)\r
-               #define PROG_MODE_PAGED_TIMEDELAY_MASK  (1 << 4)\r
-               #define PROG_MODE_PAGED_VALUE_MASK      (1 << 5)\r
-               #define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)\r
-               #define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)\r
-

        /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r
                \r
        /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r
                \r


@@ -70,14 +86,6 @@
                        static void V2Protocol_GetSetParam(uint8_t V2Command);\r
                        static void V2Protocol_ResetProtection(void);\r
                        static void V2Protocol_LoadAddress(void);\r
                        static void V2Protocol_GetSetParam(uint8_t V2Command);\r
                        static void V2Protocol_ResetProtection(void);\r
                        static void V2Protocol_LoadAddress(void);\r

-                       static void V2Protocol_ISP_EnterISPMode(void);\r
-                       static void V2Protocol_ISP_LeaveISPMode(void);\r
-                       static void V2Protocol_ISP_ProgramMemory(uint8_t V2Command);\r
-                       static void V2Protocol_ISP_ReadMemory(uint8_t V2Command);\r
-                       static void V2Protocol_ISP_ChipErase(void);\r
-                       static void V2Protocol_ISP_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
-                       static void V2Protocol_ISP_WriteFuseLock(uint8_t V2Command);\r
-                       static void V2Protocol_ISP_SPIMulti(void);\r

                #endif
 
 #endif
                #endif
 
 #endif