Fixed incorrect signature reported in the CDC/DFU bootloaders for the AT90USB82 ...

[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 edd362b..928a3e9 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2015.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -50,7 +50,7 @@ uint8_t  XPROG_Param_NVMCMDRegAddr = 0x33;
 uint8_t  XPROG_Param_NVMCSRRegAddr = 0x32;
 
 /** Currently selected XPROG programming protocol */
 uint8_t  XPROG_Param_NVMCSRRegAddr = 0x32;
 
 /** Currently selected XPROG programming protocol */

-uint8_t  XPROG_SelectedProtocol    = XPRG_PROTOCOL_PDI;
+uint8_t  XPROG_SelectedProtocol    = XPROG_PROTOCOL_PDI;

 
 /** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI/TPI
  *  programming.
 
 /** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI/TPI
  *  programming.


@@ -62,16 +62,16 @@ void XPROGProtocol_SetMode(void)
                uint8_t Protocol;
        } SetMode_XPROG_Params;
 
                uint8_t Protocol;
        } SetMode_XPROG_Params;
 

-       Endpoint_Read_Stream_LE(&SetMode_XPROG_Params, sizeof(SetMode_XPROG_Params), NO_STREAM_CALLBACK);
+       Endpoint_Read_Stream_LE(&SetMode_XPROG_Params, sizeof(SetMode_XPROG_Params), NULL);

 
        Endpoint_ClearOUT();
 
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;
 

-       Endpoint_Write_Byte(CMD_XPROG_SETMODE);
-       Endpoint_Write_Byte((SetMode_XPROG_Params.Protocol != XPRG_PROTOCOL_JTAG) ? STATUS_CMD_OK : STATUS_CMD_FAILED);
+       Endpoint_Write_8(CMD_XPROG_SETMODE);
+       Endpoint_Write_8((SetMode_XPROG_Params.Protocol != XPROG_PROTOCOL_JTAG) ? STATUS_CMD_OK : STATUS_CMD_FAILED);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -80,29 +80,29 @@ void XPROGProtocol_SetMode(void)
  */
 void XPROGProtocol_Command(void)
 {
  */
 void XPROGProtocol_Command(void)
 {

-       uint8_t XPROGCommand = Endpoint_Read_Byte();
+       uint8_t XPROGCommand = Endpoint_Read_8();

 
        switch (XPROGCommand)
        {
 
        switch (XPROGCommand)
        {

-               case XPRG_CMD_ENTER_PROGMODE:
+               case XPROG_CMD_ENTER_PROGMODE:

                        XPROGProtocol_EnterXPROGMode();
                        break;
                        XPROGProtocol_EnterXPROGMode();
                        break;

-               case XPRG_CMD_LEAVE_PROGMODE:
+               case XPROG_CMD_LEAVE_PROGMODE:

                        XPROGProtocol_LeaveXPROGMode();
                        break;
                        XPROGProtocol_LeaveXPROGMode();
                        break;

-               case XPRG_CMD_ERASE:
+               case XPROG_CMD_ERASE:

                        XPROGProtocol_Erase();
                        break;
                        XPROGProtocol_Erase();
                        break;

-               case XPRG_CMD_WRITE_MEM:
+               case XPROG_CMD_WRITE_MEM:

                        XPROGProtocol_WriteMemory();
                        break;
                        XPROGProtocol_WriteMemory();
                        break;

-               case XPRG_CMD_READ_MEM:
+               case XPROG_CMD_READ_MEM:

                        XPROGProtocol_ReadMemory();
                        break;
                        XPROGProtocol_ReadMemory();
                        break;

-               case XPRG_CMD_CRC:
+               case XPROG_CMD_CRC:

                        XPROGProtocol_ReadCRC();
                        break;
                        XPROGProtocol_ReadCRC();
                        break;

-               case XPRG_CMD_SET_PARAM:
+               case XPROG_CMD_SET_PARAM:

                        XPROGProtocol_SetParam();
                        break;
        }
                        XPROGProtocol_SetParam();
                        break;
        }


@@ -112,53 +112,19 @@ void XPROGProtocol_Command(void)
 static void XPROGProtocol_EnterXPROGMode(void)
 {
        Endpoint_ClearOUT();
 static void XPROGProtocol_EnterXPROGMode(void)
 {
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        bool NVMBusEnabled = false;
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        bool NVMBusEnabled = false;
 

-       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
-       {
-               /* Enable PDI programming mode with the attached target */
-               XPROGTarget_EnableTargetPDI();
-
-               /* Store the RESET key into the RESET PDI register to keep the XMEGA in reset */
-               XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);
-               XPROGTarget_SendByte(PDI_RESET_KEY);
-
-               /* Lower direction change guard time to 0 USART bits */
-               XPROGTarget_SendByte(PDI_CMD_STCS | PDI_CTRL_REG);
-               XPROGTarget_SendByte(0x07);
-
-               /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */
-               XPROGTarget_SendByte(PDI_CMD_KEY);
-               for (uint8_t i = sizeof(PDI_NVMENABLE_KEY); i > 0; i--)
-                 XPROGTarget_SendByte(PDI_NVMENABLE_KEY[i - 1]);
-
-               /* Wait until the NVM bus becomes active */
-               NVMBusEnabled = XMEGANVM_WaitWhileNVMBusBusy();
-       }
-       else if (XPROG_SelectedProtocol == XPRG_PROTOCOL_TPI)
-       {
-               /* Enable TPI programming mode with the attached target */
-               XPROGTarget_EnableTargetTPI();
-
-               /* Lower direction change guard time to 0 USART bits */
-               XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_CTRL_REG);
-               XPROGTarget_SendByte(0x07);
-
-               /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */
-               XPROGTarget_SendByte(TPI_CMD_SKEY);
-               for (uint8_t i = sizeof(TPI_NVMENABLE_KEY); i > 0; i--)
-                 XPROGTarget_SendByte(TPI_NVMENABLE_KEY[i - 1]);
+       if (XPROG_SelectedProtocol == XPROG_PROTOCOL_PDI)
+         NVMBusEnabled = XMEGANVM_EnablePDI();
+       else if (XPROG_SelectedProtocol == XPROG_PROTOCOL_TPI)
+         NVMBusEnabled = TINYNVM_EnableTPI();

 
 

-               /* Wait until the NVM bus becomes active */
-               NVMBusEnabled = TINYNVM_WaitWhileNVMBusBusy();
-       }
-
-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);
-       Endpoint_Write_Byte(NVMBusEnabled ? XPRG_ERR_OK : XPRG_ERR_FAILED);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_ENTER_PROGMODE);
+       Endpoint_Write_8(NVMBusEnabled ? XPROG_ERR_OK : XPROG_ERR_FAILED);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -168,44 +134,30 @@ static void XPROGProtocol_EnterXPROGMode(void)
 static void XPROGProtocol_LeaveXPROGMode(void)
 {
        Endpoint_ClearOUT();
 static void XPROGProtocol_LeaveXPROGMode(void)
 {
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 

-       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
-       {
-               XMEGANVM_WaitWhileNVMBusBusy();
-
-               /* Clear the RESET key in the RESET PDI register to allow the XMEGA to run */
-               XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);
-               XPROGTarget_SendByte(0x00);
-
-               /* Do it twice to make sure it takes affect (silicon bug?) */
-               XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);
-               XPROGTarget_SendByte(0x00);
-
-               XPROGTarget_DisableTargetPDI();
-       }
+       if (XPROG_SelectedProtocol == XPROG_PROTOCOL_PDI)
+         XMEGANVM_DisablePDI();

        else
        else

-       {
-               TINYNVM_WaitWhileNVMBusBusy();
+         TINYNVM_DisableTPI();

 
 

-               /* Clear the NVMEN bit in the TPI CONTROL register to disable TPI mode */
-               XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_CTRL_REG);
-               XPROGTarget_SendByte(0x00);
+       #if defined(XCK_RESCUE_CLOCK_ENABLE) && defined(ENABLE_ISP_PROTOCOL)
+       /* If the XCK rescue clock option is enabled, we need to restart it once the
+        * XPROG mode has been exited, since the XPROG protocol stops it after use. */
+       ISPTarget_ConfigureRescueClock();
+       #endif

 
 

-               XPROGTarget_DisableTargetTPI();
-       }
-
-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);
-       Endpoint_Write_Byte(XPRG_ERR_OK);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_LEAVE_PROGMODE);
+       Endpoint_Write_8(XPROG_ERR_OK);

        Endpoint_ClearIN();
 }
 
 /** Handler for the XPRG ERASE command to erase a specific memory address space in the attached device. */
 static void XPROGProtocol_Erase(void)
 {
        Endpoint_ClearIN();
 }
 
 /** Handler for the XPRG ERASE command to erase a specific memory address space in the attached device. */
 static void XPROGProtocol_Erase(void)
 {

-       uint8_t ReturnStatus = XPRG_ERR_OK;
+       uint8_t ReturnStatus = XPROG_ERR_OK;

 
        struct
        {
 
        struct
        {


@@ -213,42 +165,42 @@ static void XPROGProtocol_Erase(void)
                uint32_t Address;
        } Erase_XPROG_Params;
 
                uint32_t Address;
        } Erase_XPROG_Params;
 

-       Endpoint_Read_Stream_LE(&Erase_XPROG_Params, sizeof(Erase_XPROG_Params), NO_STREAM_CALLBACK);
+       Endpoint_Read_Stream_LE(&Erase_XPROG_Params, sizeof(Erase_XPROG_Params), NULL);

        Erase_XPROG_Params.Address = SwapEndian_32(Erase_XPROG_Params.Address);
 
        Endpoint_ClearOUT();
        Erase_XPROG_Params.Address = SwapEndian_32(Erase_XPROG_Params.Address);
 
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        uint8_t EraseCommand;
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        uint8_t EraseCommand;
 

-       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
+       if (XPROG_SelectedProtocol == XPROG_PROTOCOL_PDI)

        {
                /* Determine which NVM command to send to the device depending on the memory to erase */
                switch (Erase_XPROG_Params.MemoryType)
                {
        {
                /* Determine which NVM command to send to the device depending on the memory to erase */
                switch (Erase_XPROG_Params.MemoryType)
                {

-                       case XPRG_ERASE_CHIP:
+                       case XPROG_ERASE_CHIP:

                                EraseCommand = XMEGA_NVM_CMD_CHIPERASE;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_CHIPERASE;
                                break;

-                       case XPRG_ERASE_APP:
+                       case XPROG_ERASE_APP:

                                EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_ERASEAPPSEC;
                                break;

-                       case XPRG_ERASE_BOOT:
+                       case XPROG_ERASE_BOOT:

                                EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSEC;
                                break;

-                       case XPRG_ERASE_EEPROM:
+                       case XPROG_ERASE_EEPROM:

                                EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_ERASEEEPROM;
                                break;

-                       case XPRG_ERASE_APP_PAGE:
+                       case XPROG_ERASE_APP_PAGE:

                                EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_ERASEAPPSECPAGE;
                                break;

-                       case XPRG_ERASE_BOOT_PAGE:
+                       case XPROG_ERASE_BOOT_PAGE:

                                EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_ERASEBOOTSECPAGE;
                                break;

-                       case XPRG_ERASE_EEPROM_PAGE:
+                       case XPROG_ERASE_EEPROM_PAGE:

                                EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;
                                break;
                                EraseCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGE;
                                break;

-                       case XPRG_ERASE_USERSIG:
+                       case XPROG_ERASE_USERSIG:

                                EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;
                                break;
                        default:
                                EraseCommand = XMEGA_NVM_CMD_ERASEUSERSIG;
                                break;
                        default:


@@ -258,30 +210,30 @@ static void XPROGProtocol_Erase(void)
 
                /* Erase the target memory, indicate timeout if occurred */
                if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))
 
                /* Erase the target memory, indicate timeout if occurred */
                if (!(XMEGANVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))

-                 ReturnStatus = XPRG_ERR_TIMEOUT;
+                 ReturnStatus = XPROG_ERR_TIMEOUT;

        }
        else
        {
        }
        else
        {

-               if (Erase_XPROG_Params.MemoryType == XPRG_ERASE_CHIP)
+               if (Erase_XPROG_Params.MemoryType == XPROG_ERASE_CHIP)

                  EraseCommand = TINY_NVM_CMD_CHIPERASE;
                else
                  EraseCommand = TINY_NVM_CMD_SECTIONERASE;
 
                /* Erase the target memory, indicate timeout if occurred */
                if (!(TINYNVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))
                  EraseCommand = TINY_NVM_CMD_CHIPERASE;
                else
                  EraseCommand = TINY_NVM_CMD_SECTIONERASE;
 
                /* Erase the target memory, indicate timeout if occurred */
                if (!(TINYNVM_EraseMemory(EraseCommand, Erase_XPROG_Params.Address)))

-                 ReturnStatus = XPRG_ERR_TIMEOUT;
+                 ReturnStatus = XPROG_ERR_TIMEOUT;

        }
 
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_ERASE);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_ERASE);
+       Endpoint_Write_8(ReturnStatus);

        Endpoint_ClearIN();
 }
 
 /** Handler for the XPROG WRITE_MEMORY command to write to a specific memory space within the attached device. */
 static void XPROGProtocol_WriteMemory(void)
 {
        Endpoint_ClearIN();
 }
 
 /** Handler for the XPROG WRITE_MEMORY command to write to a specific memory space within the attached device. */
 static void XPROGProtocol_WriteMemory(void)
 {

-       uint8_t ReturnStatus = XPRG_ERR_OK;
+       uint8_t ReturnStatus = XPROG_ERR_OK;

 
        struct
        {
 
        struct
        {


@@ -293,16 +245,25 @@ static void XPROGProtocol_WriteMemory(void)
        } WriteMemory_XPROG_Params;
 
        Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params, (sizeof(WriteMemory_XPROG_Params) -
        } WriteMemory_XPROG_Params;
 
        Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params, (sizeof(WriteMemory_XPROG_Params) -

-                                                           sizeof(WriteMemory_XPROG_Params).ProgData), NO_STREAM_CALLBACK);
+                                                           sizeof(WriteMemory_XPROG_Params).ProgData), NULL);

        WriteMemory_XPROG_Params.Address = SwapEndian_32(WriteMemory_XPROG_Params.Address);
        WriteMemory_XPROG_Params.Length  = SwapEndian_16(WriteMemory_XPROG_Params.Length);
        WriteMemory_XPROG_Params.Address = SwapEndian_32(WriteMemory_XPROG_Params.Address);
        WriteMemory_XPROG_Params.Length  = SwapEndian_16(WriteMemory_XPROG_Params.Length);

-       Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length, NO_STREAM_CALLBACK);
+       Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length, NULL);
+
+       // The driver will terminate transfers that are a round multiple of the endpoint bank in size with a ZLP, need
+       // to catch this and discard it before continuing on with packet processing to prevent communication issues
+       if (((sizeof(uint8_t) + sizeof(WriteMemory_XPROG_Params) - sizeof(WriteMemory_XPROG_Params.ProgData)) +
+           WriteMemory_XPROG_Params.Length) % AVRISP_DATA_EPSIZE == 0)
+       {
+               Endpoint_ClearOUT();
+               Endpoint_WaitUntilReady();
+       }

 
        Endpoint_ClearOUT();
 
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 

-       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
+       if (XPROG_SelectedProtocol == XPROG_PROTOCOL_PDI)

        {
                /* Assume FLASH page programming by default, as it is the common case */
                uint8_t WriteCommand     = XMEGA_NVM_CMD_WRITEFLASHPAGE;
        {
                /* Assume FLASH page programming by default, as it is the common case */
                uint8_t WriteCommand     = XMEGA_NVM_CMD_WRITEFLASHPAGE;


@@ -312,25 +273,25 @@ static void XPROGProtocol_WriteMemory(void)
 
                switch (WriteMemory_XPROG_Params.MemoryType)
                {
 
                switch (WriteMemory_XPROG_Params.MemoryType)
                {

-                       case XPRG_MEM_TYPE_APPL:
+                       case XPROG_MEM_TYPE_APPL:

                                WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;
                                break;
                                WriteCommand     = XMEGA_NVM_CMD_WRITEAPPSECPAGE;
                                break;

-                       case XPRG_MEM_TYPE_BOOT:
+                       case XPROG_MEM_TYPE_BOOT:

                                WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;
                                break;
                                WriteCommand     = XMEGA_NVM_CMD_WRITEBOOTSECPAGE;
                                break;

-                       case XPRG_MEM_TYPE_EEPROM:
+                       case XPROG_MEM_TYPE_EEPROM:

                                WriteCommand     = XMEGA_NVM_CMD_ERASEWRITEEEPROMPAGE;
                                WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;
                                EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;
                                break;
                                WriteCommand     = XMEGA_NVM_CMD_ERASEWRITEEEPROMPAGE;
                                WriteBuffCommand = XMEGA_NVM_CMD_LOADEEPROMPAGEBUFF;
                                EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;
                                break;

-                       case XPRG_MEM_TYPE_USERSIG:
+                       case XPROG_MEM_TYPE_USERSIG:

                                WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;
                                break;
                                WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;
                                break;

-                       case XPRG_MEM_TYPE_FUSE:
+                       case XPROG_MEM_TYPE_FUSE:

                                WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;
                                PagedMemory      = false;
                                break;
                                WriteCommand     = XMEGA_NVM_CMD_WRITEFUSE;
                                PagedMemory      = false;
                                break;

-                       case XPRG_MEM_TYPE_LOCKBITS:
+                       case XPROG_MEM_TYPE_LOCKBITS:

                                WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;
                                PagedMemory      = false;
                                break;
                                WriteCommand     = XMEGA_NVM_CMD_WRITELOCK;
                                PagedMemory      = false;
                                break;


@@ -343,7 +304,7 @@ static void XPROGProtocol_WriteMemory(void)
                   (!PagedMemory && !(XMEGANVM_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,
                                                                                                           WriteMemory_XPROG_Params.ProgData[0]))))
                {
                   (!PagedMemory && !(XMEGANVM_WriteByteMemory(WriteCommand, WriteMemory_XPROG_Params.Address,
                                                                                                           WriteMemory_XPROG_Params.ProgData[0]))))
                {

-                       ReturnStatus = XPRG_ERR_TIMEOUT;
+                       ReturnStatus = XPROG_ERR_TIMEOUT;

                }
        }
        else
                }
        }
        else


@@ -352,13 +313,13 @@ static void XPROGProtocol_WriteMemory(void)
                if (!(TINYNVM_WriteMemory(WriteMemory_XPROG_Params.Address, WriteMemory_XPROG_Params.ProgData,
                      WriteMemory_XPROG_Params.Length)))
                {
                if (!(TINYNVM_WriteMemory(WriteMemory_XPROG_Params.Address, WriteMemory_XPROG_Params.ProgData,
                      WriteMemory_XPROG_Params.Length)))
                {

-                       ReturnStatus = XPRG_ERR_TIMEOUT;
+                       ReturnStatus = XPROG_ERR_TIMEOUT;

                }
        }
 
                }
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_WRITE_MEM);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_WRITE_MEM);
+       Endpoint_Write_8(ReturnStatus);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -367,7 +328,7 @@ static void XPROGProtocol_WriteMemory(void)
  */
 static void XPROGProtocol_ReadMemory(void)
 {
  */
 static void XPROGProtocol_ReadMemory(void)
 {

-       uint8_t ReturnStatus = XPRG_ERR_OK;
+       uint8_t ReturnStatus = XPROG_ERR_OK;

 
        struct
        {
 
        struct
        {


@@ -376,35 +337,35 @@ static void XPROGProtocol_ReadMemory(void)
                uint16_t Length;
        } ReadMemory_XPROG_Params;
 
                uint16_t Length;
        } ReadMemory_XPROG_Params;
 

-       Endpoint_Read_Stream_LE(&ReadMemory_XPROG_Params, sizeof(ReadMemory_XPROG_Params), NO_STREAM_CALLBACK);
+       Endpoint_Read_Stream_LE(&ReadMemory_XPROG_Params, sizeof(ReadMemory_XPROG_Params), NULL);

        ReadMemory_XPROG_Params.Address = SwapEndian_32(ReadMemory_XPROG_Params.Address);
        ReadMemory_XPROG_Params.Length  = SwapEndian_16(ReadMemory_XPROG_Params.Length);
 
        Endpoint_ClearOUT();
        ReadMemory_XPROG_Params.Address = SwapEndian_32(ReadMemory_XPROG_Params.Address);
        ReadMemory_XPROG_Params.Length  = SwapEndian_16(ReadMemory_XPROG_Params.Length);
 
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        uint8_t ReadBuffer[256];
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        uint8_t ReadBuffer[256];
 

-       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
+       if (XPROG_SelectedProtocol == XPROG_PROTOCOL_PDI)

        {
                /* Read the PDI target's memory, indicate timeout if occurred */
                if (!(XMEGANVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))
        {
                /* Read the PDI target's memory, indicate timeout if occurred */
                if (!(XMEGANVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))

-                 ReturnStatus = XPRG_ERR_TIMEOUT;
+                 ReturnStatus = XPROG_ERR_TIMEOUT;

        }
        else
        {
                /* Read the TPI target's memory, indicate timeout if occurred */
                if (!(TINYNVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))
        }
        else
        {
                /* Read the TPI target's memory, indicate timeout if occurred */
                if (!(TINYNVM_ReadMemory(ReadMemory_XPROG_Params.Address, ReadBuffer, ReadMemory_XPROG_Params.Length)))

-                 ReturnStatus = XPRG_ERR_TIMEOUT;
+                 ReturnStatus = XPROG_ERR_TIMEOUT;

        }
 
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_READ_MEM);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_READ_MEM);
+       Endpoint_Write_8(ReturnStatus);

 
 

-       if (ReturnStatus == XPRG_ERR_OK)
-         Endpoint_Write_Stream_LE(ReadBuffer, ReadMemory_XPROG_Params.Length, NO_STREAM_CALLBACK);
+       if (ReturnStatus == XPROG_ERR_OK)
+         Endpoint_Write_Stream_LE(ReadBuffer, ReadMemory_XPROG_Params.Length, NULL);

 
        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }


@@ -414,32 +375,32 @@ static void XPROGProtocol_ReadMemory(void)
  */
 static void XPROGProtocol_ReadCRC(void)
 {
  */
 static void XPROGProtocol_ReadCRC(void)
 {

-       uint8_t ReturnStatus = XPRG_ERR_OK;
+       uint8_t ReturnStatus = XPROG_ERR_OK;

 
        struct
        {
                uint8_t CRCType;
        } ReadCRC_XPROG_Params;
 
 
        struct
        {
                uint8_t CRCType;
        } ReadCRC_XPROG_Params;
 

-       Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params), NO_STREAM_CALLBACK);
+       Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params), NULL);

 
        Endpoint_ClearOUT();
 
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        uint32_t MemoryCRC;
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        uint32_t MemoryCRC;
 

-       if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
+       if (XPROG_SelectedProtocol == XPROG_PROTOCOL_PDI)

        {
                uint8_t CRCCommand;
 
                /* Determine which NVM command to send to the device depending on the memory to CRC */
                switch (ReadCRC_XPROG_Params.CRCType)
                {
        {
                uint8_t CRCCommand;
 
                /* Determine which NVM command to send to the device depending on the memory to CRC */
                switch (ReadCRC_XPROG_Params.CRCType)
                {

-                       case XPRG_CRC_APP:
+                       case XPROG_CRC_APP:

                                CRCCommand = XMEGA_NVM_CMD_APPCRC;
                                break;
                                CRCCommand = XMEGA_NVM_CMD_APPCRC;
                                break;

-                       case XPRG_CRC_BOOT:
+                       case XPROG_CRC_BOOT:

                                CRCCommand = XMEGA_NVM_CMD_BOOTCRC;
                                break;
                        default:
                                CRCCommand = XMEGA_NVM_CMD_BOOTCRC;
                                break;
                        default:


@@ -449,22 +410,22 @@ static void XPROGProtocol_ReadCRC(void)
 
                /* Perform and retrieve the memory CRC, indicate timeout if occurred */
                if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))
 
                /* Perform and retrieve the memory CRC, indicate timeout if occurred */
                if (!(XMEGANVM_GetMemoryCRC(CRCCommand, &MemoryCRC)))

-                 ReturnStatus = XPRG_ERR_TIMEOUT;
+                 ReturnStatus = XPROG_ERR_TIMEOUT;

        }
        else
        {
                /* TPI does not support memory CRC */
        }
        else
        {
                /* TPI does not support memory CRC */

-               ReturnStatus = XPRG_ERR_FAILED;
+               ReturnStatus = XPROG_ERR_FAILED;

        }
 
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_CRC);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_CRC);
+       Endpoint_Write_8(ReturnStatus);

 
 

-       if (ReturnStatus == XPRG_ERR_OK)
+       if (ReturnStatus == XPROG_ERR_OK)

        {
        {

-               Endpoint_Write_Byte(MemoryCRC >> 16);
-               Endpoint_Write_Word_LE(MemoryCRC & 0xFFFF);
+               Endpoint_Write_8(MemoryCRC >> 16);
+               Endpoint_Write_16_LE(MemoryCRC & 0xFFFF);

        }
 
        Endpoint_ClearIN();
        }
 
        Endpoint_ClearIN();


@@ -475,37 +436,43 @@ static void XPROGProtocol_ReadCRC(void)
  */
 static void XPROGProtocol_SetParam(void)
 {
  */
 static void XPROGProtocol_SetParam(void)
 {

-       uint8_t ReturnStatus = XPRG_ERR_OK;
+       uint8_t ReturnStatus = XPROG_ERR_OK;

 
 

-       uint8_t XPROGParam = Endpoint_Read_Byte();
+       uint8_t XPROGParam = Endpoint_Read_8();

 
        /* Determine which parameter is being set, store the new parameter value */
        switch (XPROGParam)
        {
 
        /* Determine which parameter is being set, store the new parameter value */
        switch (XPROGParam)
        {

-               case XPRG_PARAM_NVMBASE:
-                       XPROG_Param_NVMBase = Endpoint_Read_DWord_BE();
+               case XPROG_PARAM_NVMBASE:
+                       XPROG_Param_NVMBase       = Endpoint_Read_32_BE();
+                       break;
+               case XPROG_PARAM_EEPPAGESIZE:
+                       XPROG_Param_EEPageSize    = Endpoint_Read_16_BE();

                        break;
                        break;

-               case XPRG_PARAM_EEPPAGESIZE:
-                       XPROG_Param_EEPageSize = Endpoint_Read_Word_BE();
+               case XPROG_PARAM_NVMCMD_REG:
+                       XPROG_Param_NVMCMDRegAddr = Endpoint_Read_8();

                        break;
                        break;

-               case XPRG_PARAM_NVMCMD_REG:
-                       XPROG_Param_NVMCMDRegAddr = Endpoint_Read_Byte();
+               case XPROG_PARAM_NVMCSR_REG:
+                       XPROG_Param_NVMCSRRegAddr = Endpoint_Read_8();

                        break;
                        break;

-               case XPRG_PARAM_NVMCSR_REG:
-                       XPROG_Param_NVMCSRRegAddr = Endpoint_Read_Byte();
+               case XPROG_PARAM_UNKNOWN_1:
+                       /* TODO: Undocumented parameter added in AVRStudio 5.1, purpose unknown. Must ACK and discard or
+                                the communication with AVRStudio 5.1 will fail.
+                       */
+                       Endpoint_Discard_16();

                        break;
                default:
                        break;
                default:

-                       ReturnStatus = XPRG_ERR_FAILED;
+                       ReturnStatus = XPROG_ERR_FAILED;

                        break;
        }
 
        Endpoint_ClearOUT();
                        break;
        }
 
        Endpoint_ClearOUT();

-       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPADDR);

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_SET_PARAM);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPROG_CMD_SET_PARAM);
+       Endpoint_Write_8(ReturnStatus);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }