Update copyright year to 2013.

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

diff --git a/Projects/TempDataLogger/Lib/DataflashManager.c b/Projects/TempDataLogger/Lib/DataflashManager.c
index b7bc2f4..bc56e40 100644 (file)
--- a/Projects/TempDataLogger/Lib/DataflashManager.c
+++ b/Projects/TempDataLogger/Lib/DataflashManager.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
@@ -18,7 +18,7 @@
   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
@@ -129,22 +129,22 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn
                        }
 
                        /* Write one 16-byte chunk of data to the Dataflash */
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
 
                        /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
@@ -157,7 +157,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn
                          return;
                }
 
-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */
                TotalBlocks--;
        }
 
@@ -244,22 +244,22 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf
                        }
 
                        /* Read one 16-byte chunk of data from the Dataflash */
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
 
                        /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
@@ -285,7 +285,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf
 }
 
 /** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board Dataflash IC(s), from
- *  the a given RAM buffer. This routine reads in OS sized blocks from the buffer and writes them to the
+ *  the given RAM buffer. This routine reads in OS sized blocks from the buffer and writes them to the
  *  Dataflash in Dataflash page sized blocks. This can be linked to FAT libraries to write files to the
  *  Dataflash.
  *
@@ -356,7 +356,7 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
 
                                /* 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);
                        }
 
@@ -371,7 +371,7 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
                        BytesInBlockDiv16++;
                }
 
-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */
                TotalBlocks--;
        }
 
@@ -386,7 +386,7 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
 }
 
 /** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board Dataflash IC(s), into
- *  the a preallocated RAM buffer. This routine reads in Dataflash page sized blocks from the Dataflash
+ *  the preallocated RAM buffer. This routine reads in Dataflash page sized blocks from the Dataflash
  *  and writes them in OS sized blocks to the given buffer. This can be linked to FAT libraries to read
  *  the files stored on the Dataflash.
  *