Update Doxygen configuration files for all projects.

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index 891ae8d..b883237 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -128,9 +128,9 @@ bool TINYNVM_EnableTPI(void)
        /* Enable TPI programming mode with the attached target */
        XPROGTarget_EnableTargetTPI();
 
        /* Enable TPI programming mode with the attached target */
        XPROGTarget_EnableTargetTPI();
 

-       /* Lower direction change guard time to 0 USART bits */
+       /* Lower direction change guard time to 32 USART bits */

        XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_CTRL_REG);
        XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_CTRL_REG);

-       XPROGTarget_SendByte(0x07);
+       XPROGTarget_SendByte(0x02);

 
        /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */
        XPROGTarget_SendByte(TPI_CMD_SKEY);
 
        /* Enable access to the XPROG NVM bus by sending the documented NVM access key to the device */
        XPROGTarget_SendByte(TPI_CMD_SKEY);


@@ -146,9 +146,15 @@ void TINYNVM_DisableTPI(void)
 {
        TINYNVM_WaitWhileNVMBusBusy();
 
 {
        TINYNVM_WaitWhileNVMBusBusy();
 

-       /* Clear the NVMEN bit in the TPI STATUS register to disable TPI mode */
-       XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_STATUS_REG);
-       XPROGTarget_SendByte(0x00);
+       do
+       {
+               /* Clear the NVMEN bit in the TPI STATUS register to disable TPI mode */
+               XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_STATUS_REG);
+               XPROGTarget_SendByte(0x00);
+
+               /* Read back the STATUS register, check to see if it took effect */
+               XPROGTarget_SendByte(TPI_CMD_SLDCS | PDI_RESET_REG);
+       } while (XPROGTarget_ReceiveByte() != 0x00);

 
        XPROGTarget_DisableTargetTPI();
 }
 
        XPROGTarget_DisableTargetTPI();
 }


@@ -206,7 +212,7 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress,
        if (WriteLength & 0x01)
          WriteBuffer[WriteLength++] = 0xFF;
 
        if (WriteLength & 0x01)
          WriteBuffer[WriteLength++] = 0xFF;
 

-       /* Set the NVM control register to the WORD WRITE command for memory reading */
+       /* Set the NVM control register to the WORD WRITE command for memory writing */

        TINYNVM_SendWriteNVMRegister(XPROG_Param_NVMCMDRegAddr);
        XPROGTarget_SendByte(TINY_NVM_CMD_WORDWRITE);
 
        TINYNVM_SendWriteNVMRegister(XPROG_Param_NVMCMDRegAddr);
        XPROGTarget_SendByte(TINY_NVM_CMD_WORDWRITE);
 


@@ -227,7 +233,7 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress,
                XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT_PI);
                XPROGTarget_SendByte(*(WriteBuffer++));
 
                XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT_PI);
                XPROGTarget_SendByte(*(WriteBuffer++));
 

-               /* Need to decrement the write length twice, since we read out a whole word */
+               /* Need to decrement the write length twice, since we wrote a whole two-byte word */

                WriteLength -= 2;
        }
 
                WriteLength -= 2;
        }