Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

[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 84d82bc..85820fd 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -115,7 +115,7 @@ static void XPROGProtocol_EnterXPROGMode(void)
        Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
        
        Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
        

-       bool NVMBusEnabled;
+       bool NVMBusEnabled = false;

 
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
        {
 
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
        {


@@ -138,7 +138,7 @@ static void XPROGProtocol_EnterXPROGMode(void)
                /* Wait until the NVM bus becomes active */
                NVMBusEnabled = XMEGANVM_WaitWhileNVMBusBusy();
        }
                /* Wait until the NVM bus becomes active */
                NVMBusEnabled = XMEGANVM_WaitWhileNVMBusBusy();
        }

-       else
+       else if (XPROG_SelectedProtocol == XPRG_PROTOCOL_TPI)

        {
                /* Enable TPI programming mode with the attached target */
                XPROGTarget_EnableTargetTPI();
        {
                /* Enable TPI programming mode with the attached target */
                XPROGTarget_EnableTargetTPI();


@@ -324,8 +324,6 @@ static void XPROGProtocol_WriteMemory(void)
                                EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;                   
                                break;
                        case XPRG_MEM_TYPE_USERSIG:
                                EraseBuffCommand = XMEGA_NVM_CMD_ERASEEEPROMPAGEBUFF;                   
                                break;
                        case XPRG_MEM_TYPE_USERSIG:

-                               /* User signature is paged, but needs us to manually indicate the mode bits since the host doesn't set them */
-                               WriteMemory_XPROG_Params.PageMode = (XPRG_PAGEMODE_ERASE | XPRG_PAGEMODE_WRITE);

                                WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;
                                break;
                        case XPRG_MEM_TYPE_FUSE:
                                WriteCommand     = XMEGA_NVM_CMD_WRITEUSERSIG;
                                break;
                        case XPRG_MEM_TYPE_FUSE: