Add more include protection macros to give the user warnings when they try to manuall...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / XPROGProtocol.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
index 0057a67..a6a5767 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -208,27 +208,41 @@ static void XPROGProtocol_Erase(void)
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

-       uint8_t EraseCommand = XMEGA_NVM_CMD_NOOP;\r
-       \r
+       uint8_t EraseCommand;\r
+\r

        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r

-       {\r
+       {       \r

                /* Determine which NVM command to send to the device depending on the memory to erase */\r
                /* Determine which NVM command to send to the device depending on the memory to erase */\r

-               if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
-                 EraseCommand = XMEGA_NVM_CMD_CHIPERASE;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_APP_PAGE)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_BOOT_PAGE)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_EEPROM_PAGE)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;\r
-               else if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_USERSIG)\r
-                 EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;\r
+               switch (Erase_XPROG_Params.MemoryType)\r
+               {\r
+                       case XPRG_ERASE_CHIP:\r
+                               EraseCommand = XMEGA_NVM_CMD_CHIPERASE;\r
+                               break;\r
+                       case XPRG_ERASE_APP:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;\r
+                               break;\r
+                       case XPRG_ERASE_BOOT:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;\r
+                               break;\r
+                       case XPRG_ERASE_EEPROM:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;\r
+                               break;\r
+                       case XPRG_ERASE_APP_PAGE:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;\r
+                               break;\r
+                       case XPRG_ERASE_BOOT_PAGE:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;\r
+                               break;\r
+                       case XPRG_ERASE_EEPROM_PAGE:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;\r
+                               break;\r
+                       case XPRG_ERASE_USERSIG:\r
+                               EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;\r
+                               break;\r
+                       default:\r
+                               EraseCommand = XMEGA_NVM_CMD_NOOP;\r
+                               break;\r
+               }\r

                \r
                /* Erase the target memory, indicate timeout if ocurred */\r
                if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r
                \r
                /* Erase the target memory, indicate timeout if ocurred */\r
                if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r


@@ -236,8 +250,13 @@ static void XPROGProtocol_Erase(void)
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

+               if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)\r
+                 EraseCommand = TINY_NVM_CMD_CHIPERASE;\r
+               else\r
+                 EraseCommand = TINY_NVM_CMD_SECTIONERASE;\r
+       \r

                /* Erase the target memory, indicate timeout if ocurred */\r
                /* Erase the target memory, indicate timeout if ocurred */\r

-               if (!(TINYNVM_EraseMemory()))\r
+               if (!(TINYNVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))\r

                  ReturnStatus = XPRG_ERR_TIMEOUT;\r
        }\r
        \r
                  ReturnStatus = XPRG_ERR_TIMEOUT;\r
        }\r
        \r


@@ -277,36 +296,33 @@ static void XPROGProtocol_WriteMemory(void)
                uint8_t WriteBuffCommand = XMEGA_NVM_CMD_LOADFLASHPAGEBUFF;\r
                uint8_t EraseBuffCommand = XMEGA_NVM_CMD_ERASEFLASHPAGEBUFF;\r
                bool    PagedMemory      = true;\r
                uint8_t WriteBuffCommand = XMEGA_NVM_CMD_LOADFLASHPAGEBUFF;\r
                uint8_t EraseBuffCommand = XMEGA_NVM_CMD_ERASEFLASHPAGEBUFF;\r
                bool    PagedMemory      = true;\r

-\r
-               if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_APPL)\r
-               {\r
-                       WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;\r
-               }\r
-               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_BOOT)\r
-               {\r
-                       WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;\r
-               }\r
-               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_EEPROM)\r
-               {\r
-                       WriteCommand     = XMEGA_NVM_CMD_WRITEEEPROMPAGE;\r
-                       WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;\r
-                       EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;\r
-               }\r
-               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)\r
-               {\r
-                       /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */\r
-                       WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);\r
-                       WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;\r
-               }\r
-               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_FUSE)\r
-               {\r
-                       WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;\r
-                       PagedMemory      = false;\r
-               }\r
-               else if (WriteMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_LOCKBITS)\r
+               \r
+               switch (WriteMemory_XPROG_Params.MemoryType)\r

                {\r
                {\r

-                       WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;\r
-                       PagedMemory      = false;\r
+                       case XPRG_MEM_TYPE_APPL:\r
+                               WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;\r
+                               break;\r
+                       case XPRG_MEM_TYPE_BOOT:\r
+                               WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;\r
+                               break;\r
+                       case XPRG_MEM_TYPE_EEPROM:\r
+                               WriteCommand     = XMEGA_NVM_CMD_WRITEEEPROMPAGE;\r
+                               WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;\r
+                               EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;                   \r
+                               break;\r
+                       case XPRG_MEM_TYPE_USERSIG:\r
+                               /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */\r
+                               WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);\r
+                               WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;\r
+                               break;\r
+                       case XPRG_MEM_TYPE_FUSE:\r
+                               WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;\r
+                               PagedMemory      = false;\r
+                               break;\r
+                       case XPRG_MEM_TYPE_LOCKBITS:\r
+                               WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;\r
+                               PagedMemory      = false;\r
+                               break;\r

                }\r
                \r
                /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r
                }\r
                \r
                /* Send the appropriate memory write commands to the device, indicate timeout if occurred */\r


@@ -394,21 +410,29 @@ static void XPROGProtocol_ReadCRC(void)
        } ReadCRC_XPROG_Params;\r
        \r
        Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params), NO_STREAM_CALLBACK);\r
        } ReadCRC_XPROG_Params;\r
        \r
        Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params), NO_STREAM_CALLBACK);\r

+\r

        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r

-       uint8_t  CRCCommand = XMEGA_NVM_CMD_NOOP;\r

        uint32_t MemoryCRC;\r
 \r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
        {\r
        uint32_t MemoryCRC;\r
 \r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
        {\r

+               uint8_t CRCCommand;\r
+\r

                /* Determine which NVM command to send to the device depending on the memory to CRC */\r
                /* Determine which NVM command to send to the device depending on the memory to CRC */\r

-               if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)\r
-                 CRCCommand = XMEGA_NVM_CMD_APPCRC;\r
-               else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)\r
-                 CRCCommand = XMEGA_NVM_CMD_BOOTCRC;\r
-               else\r
-                 CRCCommand = XMEGA_NVM_CMD_FLASHCRC;\r
+               switch (ReadCRC_XPROG_Params.CRCType)\r
+               {\r
+                       case XPRG_CRC_APP:\r
+                               CRCCommand = XMEGA_NVM_CMD_APPCRC;\r
+                               break;\r
+                       case XPRG_CRC_BOOT:\r
+                               CRCCommand = XMEGA_NVM_CMD_BOOTCRC;\r
+                               break;\r
+                       default:\r
+                               CRCCommand = XMEGA_NVM_CMD_FLASHCRC;\r
+                               break;\r
+               }\r

                \r
                /* Perform and retrieve the memory CRC, indicate timeout if occurred */\r
                if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r
                \r
                /* Perform and retrieve the memory CRC, indicate timeout if occurred */\r
                if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))\r