AppConfigHeaders: Update several additional user projects to use configuration header...
[pub/lufa.git] / Projects / Incomplete / StandaloneProgrammer / Lib / DataflashManager.c
diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c
deleted file mode 100644 (file)
index 8de1573..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, distribute, and sell this \r
-  software and its documentation for any purpose is hereby granted\r
-  without fee, provided that the above copyright notice appear in \r
-  all copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting \r
-  documentation, and that the name of the author not be used in \r
-  advertising or publicity pertaining to distribution of the \r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  Functions to manage the physical dataflash media, including reading and writing of\r
- *  blocks of data. These functions are called by the SCSI layer when data must be stored\r
- *  or retrieved to/from the physical storage media. If a different media is used (such\r
- *  as a SD card or EEPROM), functions similar to these will need to be generated.\r
- */\r
-\r
-#define  INCLUDE_FROM_DATAFLASHMANAGER_C\r
-#include "DataflashManager.h"\r
-\r
-#if defined(USB_CAN_BE_DEVICE)\r
-/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from\r
- *  the pre-selected data OUT endpoint. This routine reads in OS sized blocks from the endpoint and writes\r
- *  them to the dataflash in Dataflash page sized blocks.\r
- *\r
- *  \param[in] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state\r
- *  \param[in] BlockAddress  Data block starting address for the write sequence\r
- *  \param[in] TotalBlocks   Number of blocks of data to write\r
- */\r
-void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks)\r
-{\r
-       uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);\r
-       uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);\r
-       uint8_t  CurrDFPageByteDiv16 = (CurrDFPageByte >> 4);\r
-       bool     UsingSecondBuffer   = false;\r
-\r
-       /* Select the correct starting Dataflash IC for the block requested */\r
-       Dataflash_SelectChipFromPage(CurrDFPage);\r
-\r
-#if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)\r
-       /* Copy selected dataflash's current page contents to the dataflash buffer */\r
-       Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);\r
-       Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-       Dataflash_WaitWhileBusy();\r
-#endif\r
-\r
-       /* Send the dataflash buffer write command */\r
-       Dataflash_SendByte(DF_CMD_BUFF1WRITE);\r
-       Dataflash_SendAddressBytes(0, CurrDFPageByte);\r
-\r
-       /* Wait until endpoint is ready before continuing */\r
-       if (Endpoint_WaitUntilReady())\r
-         return;\r
-\r
-       while (TotalBlocks)\r
-       {\r
-               uint8_t BytesInBlockDiv16 = 0;\r
-               \r
-               /* Write an endpoint packet sized data block to the dataflash */\r
-               while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
-               {\r
-                       /* Check if the endpoint is currently empty */\r
-                       if (!(Endpoint_IsReadWriteAllowed()))\r
-                       {\r
-                               /* Clear the current endpoint bank */\r
-                               Endpoint_ClearOUT();\r
-                               \r
-                               /* Wait until the host has sent another packet */\r
-                               if (Endpoint_WaitUntilReady())\r
-                                 return;\r
-                       }\r
-\r
-                       /* Check if end of dataflash page reached */\r
-                       if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))\r
-                       {\r
-                               /* Write the dataflash buffer contents back to the dataflash page */\r
-                               Dataflash_WaitWhileBusy();\r
-                               Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);\r
-                               Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-\r
-                               /* Reset the dataflash buffer counter, increment the page counter */\r
-                               CurrDFPageByteDiv16 = 0;\r
-                               CurrDFPage++;\r
-\r
-                               /* Once all the dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */\r
-                               if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))\r
-                                 UsingSecondBuffer = !(UsingSecondBuffer);\r
-\r
-                               /* Select the next dataflash chip based on the new dataflash page index */\r
-                               Dataflash_SelectChipFromPage(CurrDFPage);\r
-\r
-#if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)\r
-                               /* If less than one dataflash page remaining, copy over the existing page to preserve trailing data */\r
-                               if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))\r
-                               {\r
-                                       /* Copy selected dataflash's current page contents to the dataflash buffer */\r
-                                       Dataflash_WaitWhileBusy();\r
-                                       Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);\r
-                                       Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-                                       Dataflash_WaitWhileBusy();\r
-                               }\r
-#endif\r
-\r
-                               /* Send the dataflash buffer write command */\r
-                               Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2WRITE : DF_CMD_BUFF1WRITE);\r
-                               Dataflash_SendAddressBytes(0, 0);                               \r
-                       }\r
-\r
-                       /* Write one 16-byte chunk of data to the dataflash */\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       Dataflash_SendByte(Endpoint_Read_Byte());\r
-                       \r
-                       /* Increment the dataflash page 16 byte block counter */\r
-                       CurrDFPageByteDiv16++;\r
-\r
-                       /* Increment the block 16 byte block counter */\r
-                       BytesInBlockDiv16++;\r
-\r
-                       /* Check if the current command is being aborted by the host */\r
-                       if (MSInterfaceInfo->State.IsMassStoreReset)\r
-                         return;                       \r
-               }\r
-                       \r
-               /* Decrement the blocks remaining counter and reset the sub block counter */\r
-               TotalBlocks--;\r
-       }\r
-\r
-       /* Write the dataflash buffer contents back to the dataflash page */\r
-       Dataflash_WaitWhileBusy();\r
-       Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);\r
-       Dataflash_SendAddressBytes(CurrDFPage, 0x00);\r
-       Dataflash_WaitWhileBusy();\r
-\r
-       /* If the endpoint is empty, clear it ready for the next packet from the host */\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearOUT();\r
-\r
-       /* Deselect all dataflash chips */\r
-       Dataflash_DeselectChip();\r
-}\r
-\r
-/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board dataflash IC(s), into\r
- *  the pre-selected data IN endpoint. This routine reads in Dataflash page sized blocks from the Dataflash\r
- *  and writes them in OS sized blocks to the endpoint.\r
- *\r
- *  \param[in] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state\r
- *  \param[in] BlockAddress  Data block starting address for the read sequence\r
- *  \param[in] TotalBlocks   Number of blocks of data to read\r
- */\r
-void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks)\r
-{\r
-       uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);\r
-       uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);\r
-       uint8_t  CurrDFPageByteDiv16 = (CurrDFPageByte >> 4);\r
-\r
-       /* Select the correct starting Dataflash IC for the block requested */\r
-       Dataflash_SelectChipFromPage(CurrDFPage);\r
-\r
-       /* Send the dataflash main memory page read command */\r
-       Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);\r
-       Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);\r
-       Dataflash_SendByte(0x00);\r
-       Dataflash_SendByte(0x00);\r
-       Dataflash_SendByte(0x00);\r
-       Dataflash_SendByte(0x00);\r
-       \r
-       /* Wait until endpoint is ready before continuing */\r
-       if (Endpoint_WaitUntilReady())\r
-         return;\r
-       \r
-       while (TotalBlocks)\r
-       {\r
-               uint8_t BytesInBlockDiv16 = 0;\r
-               \r
-               /* Write an endpoint packet sized data block to the dataflash */\r
-               while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
-               {\r
-                       /* Check if the endpoint is currently full */\r
-                       if (!(Endpoint_IsReadWriteAllowed()))\r
-                       {\r
-                               /* Clear the endpoint bank to send its contents to the host */\r
-                               Endpoint_ClearIN();\r
-                               \r
-                               /* Wait until the endpoint is ready for more data */\r
-                               if (Endpoint_WaitUntilReady())\r
-                                 return;\r
-                       }\r
-                       \r
-                       /* Check if end of dataflash page reached */\r
-                       if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))\r
-                       {\r
-                               /* Reset the dataflash buffer counter, increment the page counter */\r
-                               CurrDFPageByteDiv16 = 0;\r
-                               CurrDFPage++;\r
-\r
-                               /* Select the next dataflash chip based on the new dataflash page index */\r
-                               Dataflash_SelectChipFromPage(CurrDFPage);\r
-                               \r
-                               /* Send the dataflash main memory page read command */\r
-                               Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);\r
-                               Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-                               Dataflash_SendByte(0x00);\r
-                               Dataflash_SendByte(0x00);\r
-                               Dataflash_SendByte(0x00);\r
-                               Dataflash_SendByte(0x00);\r
-                       }       \r
-\r
-                       /* Read one 16-byte chunk of data from the dataflash */\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());\r
-                       \r
-                       /* Increment the dataflash page 16 byte block counter */\r
-                       CurrDFPageByteDiv16++;\r
-                       \r
-                       /* Increment the block 16 byte block counter */\r
-                       BytesInBlockDiv16++;\r
-\r
-                       /* Check if the current command is being aborted by the host */\r
-                       if (MSInterfaceInfo->State.IsMassStoreReset)\r
-                         return;\r
-               }\r
-               \r
-               /* Decrement the blocks remaining counter */\r
-               TotalBlocks--;\r
-       }\r
-       \r
-       /* If the endpoint is full, send its contents to the host */\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearIN();\r
-\r
-       /* Deselect all dataflash chips */\r
-       Dataflash_DeselectChip();\r
-}\r
-\r
-/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from\r
- *  the a given RAM buffer. This routine reads in OS sized blocks from the buffer and writes them to the\r
- *  dataflash in Dataflash page sized blocks. This can be linked to FAT libraries to write files to the\r
- *  dataflash.\r
- *\r
- *  \param[in] BlockAddress  Data block starting address for the write sequence\r
- *  \param[in] TotalBlocks   Number of blocks of data to write\r
- *  \param[in] BufferPtr     Pointer to the data source RAM buffer\r
- */\r
-void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr)\r
-{\r
-       uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);\r
-       uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);\r
-       uint8_t  CurrDFPageByteDiv16 = (CurrDFPageByte >> 4);\r
-       bool     UsingSecondBuffer   = false;\r
-\r
-       /* Select the correct starting Dataflash IC for the block requested */\r
-       Dataflash_SelectChipFromPage(CurrDFPage);\r
-\r
-#if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)\r
-       /* Copy selected dataflash's current page contents to the dataflash buffer */\r
-       Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);\r
-       Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-       Dataflash_WaitWhileBusy();\r
-#endif\r
-\r
-       /* Send the dataflash buffer write command */\r
-       Dataflash_SendByte(DF_CMD_BUFF1WRITE);\r
-       Dataflash_SendAddressBytes(0, CurrDFPageByte);\r
-       \r
-       while (TotalBlocks)\r
-       {\r
-               uint8_t BytesInBlockDiv16 = 0;\r
-               \r
-               /* Write an endpoint packet sized data block to the dataflash */\r
-               while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
-               {\r
-                       /* Check if end of dataflash page reached */\r
-                       if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))\r
-                       {\r
-                               /* Write the dataflash buffer contents back to the dataflash page */\r
-                               Dataflash_WaitWhileBusy();\r
-                               Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);\r
-                               Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-\r
-                               /* Reset the dataflash buffer counter, increment the page counter */\r
-                               CurrDFPageByteDiv16 = 0;\r
-                               CurrDFPage++;\r
-\r
-                               /* Once all the dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */\r
-                               if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))\r
-                                 UsingSecondBuffer = !(UsingSecondBuffer);\r
-\r
-                               /* Select the next dataflash chip based on the new dataflash page index */\r
-                               Dataflash_SelectChipFromPage(CurrDFPage);\r
-\r
-#if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)\r
-                               /* If less than one dataflash page remaining, copy over the existing page to preserve trailing data */\r
-                               if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))\r
-                               {\r
-                                       /* Copy selected dataflash's current page contents to the dataflash buffer */\r
-                                       Dataflash_WaitWhileBusy();\r
-                                       Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);\r
-                                       Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-                                       Dataflash_WaitWhileBusy();\r
-                               }\r
-#endif\r
-\r
-                               /* Send the dataflash buffer write command */\r
-                               Dataflash_ToggleSelectedChipCS();\r
-                               Dataflash_SendByte(DF_CMD_BUFF1WRITE);\r
-                               Dataflash_SendAddressBytes(0, 0);\r
-                       }\r
-                       \r
-                       /* Write one 16-byte chunk of data to the dataflash */\r
-                       for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)\r
-                         Dataflash_SendByte(*(BufferPtr++));\r
-                       \r
-                       /* Increment the dataflash page 16 byte block counter */\r
-                       CurrDFPageByteDiv16++;\r
-\r
-                       /* Increment the block 16 byte block counter */\r
-                       BytesInBlockDiv16++;            \r
-               }\r
-                       \r
-               /* Decrement the blocks remaining counter and reset the sub block counter */\r
-               TotalBlocks--;\r
-       }\r
-\r
-       /* Write the dataflash buffer contents back to the dataflash page */\r
-       Dataflash_WaitWhileBusy();\r
-       Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);\r
-       Dataflash_SendAddressBytes(CurrDFPage, 0x00);\r
-       Dataflash_WaitWhileBusy();\r
-\r
-       /* Deselect all dataflash chips */\r
-       Dataflash_DeselectChip();\r
-}\r
-\r
-/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board dataflash IC(s), into\r
- *  the a preallocated RAM buffer. This routine reads in Dataflash page sized blocks from the Dataflash\r
- *  and writes them in OS sized blocks to the given buffer. This can be linked to FAT libraries to read\r
- *  the files stored on the dataflash.\r
- *\r
- *  \param[in] BlockAddress  Data block starting address for the read sequence\r
- *  \param[in] TotalBlocks   Number of blocks of data to read\r
- *  \param[out] BufferPtr    Pointer to the data destination RAM buffer\r
- */\r
-void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr)\r
-{\r
-       uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);\r
-       uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);\r
-       uint8_t  CurrDFPageByteDiv16 = (CurrDFPageByte >> 4);\r
-\r
-       /* Select the correct starting Dataflash IC for the block requested */\r
-       Dataflash_SelectChipFromPage(CurrDFPage);\r
-\r
-       /* Send the dataflash main memory page read command */\r
-       Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);\r
-       Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);\r
-       Dataflash_SendByte(0x00);\r
-       Dataflash_SendByte(0x00);\r
-       Dataflash_SendByte(0x00);\r
-       Dataflash_SendByte(0x00);\r
-\r
-       while (TotalBlocks)\r
-       {\r
-               uint8_t BytesInBlockDiv16 = 0;\r
-               \r
-               /* Write an endpoint packet sized data block to the dataflash */\r
-               while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
-               {\r
-                       /* Check if end of dataflash page reached */\r
-                       if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))\r
-                       {\r
-                               /* Reset the dataflash buffer counter, increment the page counter */\r
-                               CurrDFPageByteDiv16 = 0;\r
-                               CurrDFPage++;\r
-\r
-                               /* Select the next dataflash chip based on the new dataflash page index */\r
-                               Dataflash_SelectChipFromPage(CurrDFPage);\r
-                               \r
-                               /* Send the dataflash main memory page read command */\r
-                               Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);\r
-                               Dataflash_SendAddressBytes(CurrDFPage, 0);\r
-                               Dataflash_SendByte(0x00);\r
-                               Dataflash_SendByte(0x00);\r
-                               Dataflash_SendByte(0x00);\r
-                               Dataflash_SendByte(0x00);\r
-                       }       \r
-\r
-                       /* Read one 16-byte chunk of data from the dataflash */\r
-                       for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)\r
-                         *(BufferPtr++) = Dataflash_ReceiveByte();\r
-                       \r
-                       /* Increment the dataflash page 16 byte block counter */\r
-                       CurrDFPageByteDiv16++;\r
-                       \r
-                       /* Increment the block 16 byte block counter */\r
-                       BytesInBlockDiv16++;\r
-               }\r
-               \r
-               /* Decrement the blocks remaining counter */\r
-               TotalBlocks--;\r
-       }\r
-\r
-       /* Deselect all dataflash chips */\r
-       Dataflash_DeselectChip();\r
-}\r
-\r
-/** Disables the dataflash memory write protection bits on the board Dataflash ICs, if enabled. */\r
-void DataflashManager_ResetDataflashProtections(void)\r
-{\r
-       /* Select first dataflash chip, send the read status register command */\r
-       Dataflash_SelectChip(DATAFLASH_CHIP1);\r
-       Dataflash_SendByte(DF_CMD_GETSTATUS);\r
-       \r
-       /* Check if sector protection is enabled */\r
-       if (Dataflash_ReceiveByte() & DF_STATUS_SECTORPROTECTION_ON)\r
-       {\r
-               Dataflash_ToggleSelectedChipCS();\r
-\r
-               /* Send the commands to disable sector protection */\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[0]);\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[1]);\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[2]);\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[3]);\r
-       }\r
-       \r
-       /* Select second dataflash chip (if present on selected board), send read status register command */\r
-       #if (DATAFLASH_TOTALCHIPS == 2)\r
-       Dataflash_SelectChip(DATAFLASH_CHIP2);\r
-       Dataflash_SendByte(DF_CMD_GETSTATUS);\r
-       \r
-       /* Check if sector protection is enabled */\r
-       if (Dataflash_ReceiveByte() & DF_STATUS_SECTORPROTECTION_ON)\r
-       {\r
-               Dataflash_ToggleSelectedChipCS();\r
-\r
-               /* Send the commands to disable sector protection */\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[0]);\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[1]);\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[2]);\r
-               Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[3]);\r
-       }\r
-       #endif\r
-       \r
-       /* Deselect current dataflash chip */\r
-       Dataflash_DeselectChip();\r
-}\r
-\r
-/** Performs a simple test on the attached Dataflash IC(s) to ensure that they are working.\r
- *\r
- *  \return Boolean true if all media chips are working, false otherwise\r
- */\r
-bool DataflashManager_CheckDataflashOperation(void)\r
-{\r
-       uint8_t ReturnByte;\r
-\r
-       /* Test first Dataflash IC is present and responding to commands */\r
-       Dataflash_SelectChip(DATAFLASH_CHIP1);\r
-       Dataflash_SendByte(DF_CMD_READMANUFACTURERDEVICEINFO);\r
-       ReturnByte = Dataflash_ReceiveByte();\r
-       Dataflash_DeselectChip();\r
-\r
-       /* If returned data is invalid, fail the command */\r
-       if (ReturnByte != DF_MANUFACTURER_ATMEL)\r
-         return false;\r
-\r
-       #if (DATAFLASH_TOTALCHIPS == 2)\r
-       /* Test second Dataflash IC is present and responding to commands */\r
-       Dataflash_SelectChip(DATAFLASH_CHIP2);\r
-       Dataflash_SendByte(DF_CMD_READMANUFACTURERDEVICEINFO);\r
-       ReturnByte = Dataflash_ReceiveByte();\r
-       Dataflash_DeselectChip();\r
-\r
-       /* If returned data is invalid, fail the command */\r
-       if (ReturnByte != DF_MANUFACTURER_ATMEL)\r
-         return false;\r
-       #endif\r
-       \r
-       return true;\r
-}\r
-#endif\r