AppConfigHeaders: Merge in latest trunk.

[pub/USBasp.git] / Projects / TempDataLogger / Lib / DataflashManager.c

diff --git a/Projects/TempDataLogger/Lib/DataflashManager.c b/Projects/TempDataLogger/Lib/DataflashManager.c
index 2ebbd99..8bf86f4 100644 (file)
--- a/Projects/TempDataLogger/Lib/DataflashManager.c
+++ b/Projects/TempDataLogger/Lib/DataflashManager.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


@@ -157,7 +157,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn
                          return;
                }
 
                          return;
                }
 

-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */

                TotalBlocks--;
        }
 
                TotalBlocks--;
        }
 


@@ -356,7 +356,7 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
 
                                /* Send the Dataflash buffer write command */
                                Dataflash_ToggleSelectedChipCS();
 
                                /* Send the Dataflash buffer write command */
                                Dataflash_ToggleSelectedChipCS();

-                               Dataflash_SendByte(DF_CMD_BUFF1WRITE);
+                               Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2WRITE : DF_CMD_BUFF1WRITE);

                                Dataflash_SendAddressBytes(0, 0);
                        }
 
                                Dataflash_SendAddressBytes(0, 0);
                        }
 


@@ -371,7 +371,7 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
                        BytesInBlockDiv16++;
                }
 
                        BytesInBlockDiv16++;
                }
 

-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */

                TotalBlocks--;
        }
 
                TotalBlocks--;
        }