Fixed AVRISP V2 Protocol handler for the READ_FLASH_ISP and READ_EEPROM_ISP handler...

[pub/lufa.git] / Projects / Incomplete / AVRISP / Lib / V2Protocol.h

diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.h b/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
index 116df8d..b0f1f83 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
@@ -37,35 +37,42 @@
 #define _V2_PROTOCOL_
 
        /* Includes: */
 #define _V2_PROTOCOL_
 
        /* Includes: */

-               #include <avr/io.h>\r
-               #include <util/delay.h>\r
-\r

                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>\r
                \r
                #include "../Descriptors.h"
                #include "V2ProtocolConstants.h"\r
                #include "V2ProtocolParams.h"
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>\r
                \r
                #include "../Descriptors.h"
                #include "V2ProtocolConstants.h"\r
                #include "V2ProtocolParams.h"

+               #include "V2ProtocolTarget.h"\r

 
 

-       /* Macros: */
-               #define PROGRAMMER_ID             "AVRISP_MK2"\r
-               #define TARGET_BUST_TIMEOUT_MS    100\r
+       /* Macros: */\r
+               /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
+               #define PROGRAMMER_ID                   "AVRISP_MK2"\r
+               \r
+               #define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)\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
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r
 
        /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r
                \r
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r

-                       static uint8_t V2Protocol_GetSPIPrescalerMask(void);\r
-                       static void    V2Protocol_ChangeTargetResetLine(bool ResetTarget);\r
-                       static void    V2Protocol_DelayMS(uint8_t MS);\r
-                       static uint8_t V2Protocol_WaitWhileTargetBusy(void);\r
-\r

                        static void V2Protocol_Command_Unknown(uint8_t V2Command);\r
                        static void V2Protocol_Command_SignOn(void);\r
                        static void V2Protocol_Command_GetSetParam(uint8_t V2Command);\r
                        static void V2Protocol_Command_LoadAddress(void);\r
                        static void V2Protocol_Command_Unknown(uint8_t V2Command);\r
                        static void V2Protocol_Command_SignOn(void);\r
                        static void V2Protocol_Command_GetSetParam(uint8_t V2Command);\r
                        static void V2Protocol_Command_LoadAddress(void);\r

+                       static void V2Protocol_Command_ResetProtection(void);\r

                        static void V2Protocol_Command_EnterISPMode(void);\r
                        static void V2Protocol_Command_LeaveISPMode(void);\r
                        static void V2Protocol_Command_EnterISPMode(void);\r
                        static void V2Protocol_Command_LeaveISPMode(void);\r

+                       static void V2Protocol_Command_ProgramMemory(uint8_t V2Command);\r
+                       static void V2Protocol_Command_ReadMemory(uint8_t V2Command);\r

                        static void V2Protocol_Command_ChipErase(void);\r
                        static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
                        static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);\r
                        static void V2Protocol_Command_ChipErase(void);\r
                        static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
                        static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);\r