projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix Webserver project code not compiling due to the changes to the USB mode selection...
[pub/USBasp.git] / Demos / Device / ClassDriver / MassStorage / Lib / DataflashManager.c
diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c
index 4f34d75..ce2ac81 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c
@@ -30,7 +30,7 @@
 
 /** \file
  *
 
 /** \file
  *
- *  Functions to manage the physical dataflash media, including reading and writing of
+ *  Functions to manage the physical Dataflash media, including reading and writing of
  *  blocks of data. These functions are called by the SCSI layer when data must be stored
  *  or retrieved to/from the physical storage media. If a different media is used (such
  *  as a SD card or EEPROM), functions similar to these will need to be generated.
  *  blocks of data. These functions are called by the SCSI layer when data must be stored
  *  or retrieved to/from the physical storage media. If a different media is used (such
  *  as a SD card or EEPROM), functions similar to these will need to be generated.
@@ -39,15 +39,17 @@
 #define  INCLUDE_FROM_DATAFLASHMANAGER_C
 #include "DataflashManager.h"
 
 #define  INCLUDE_FROM_DATAFLASHMANAGER_C
 #include "DataflashManager.h"
 
-/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from
+/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board Dataflash IC(s), from
  *  the pre-selected data OUT endpoint. This routine reads in OS sized blocks from the endpoint and writes
  *  the pre-selected data OUT endpoint. This routine reads in OS sized blocks from the endpoint and writes
- *  them to the dataflash in Dataflash page sized blocks.
+ *  them to the Dataflash in Dataflash page sized blocks.
  *
  *  \param[in] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state
  *  \param[in] BlockAddress  Data block starting address for the write sequence
  *  \param[in] TotalBlocks   Number of blocks of data to write
  */
  *
  *  \param[in] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state
  *  \param[in] BlockAddress  Data block starting address for the write sequence
  *  \param[in] TotalBlocks   Number of blocks of data to write
  */
-void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks)
+void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,
+                                  const uint32_t BlockAddress,
+                                  uint16_t TotalBlocks)
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
@@ -58,13 +60,13 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
        Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
        Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
-       /* Copy selected dataflash's current page contents to the dataflash buffer */
+       /* Copy selected dataflash's current page contents to the Dataflash buffer */
        Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);
        Dataflash_SendAddressBytes(CurrDFPage, 0);
        Dataflash_WaitWhileBusy();
 #endif
 
        Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);
        Dataflash_SendAddressBytes(CurrDFPage, 0);
        Dataflash_WaitWhileBusy();
 #endif
 
-       /* Send the dataflash buffer write command */
+       /* Send the Dataflash buffer write command */
        Dataflash_SendByte(DF_CMD_BUFF1WRITE);
        Dataflash_SendAddressBytes(0, CurrDFPageByte);
 
        Dataflash_SendByte(DF_CMD_BUFF1WRITE);
        Dataflash_SendAddressBytes(0, CurrDFPageByte);
 
@@ -76,7 +78,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
        {
                uint8_t BytesInBlockDiv16 = 0;
                
        {
                uint8_t BytesInBlockDiv16 = 0;
                
-               /* Write an endpoint packet sized data block to the dataflash */
+               /* Write an endpoint packet sized data block to the Dataflash */
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
                        /* Check if the endpoint is currently empty */
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
                        /* Check if the endpoint is currently empty */
@@ -90,30 +92,30 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
                                  return;
                        }
 
                                  return;
                        }
 
-                       /* Check if end of dataflash page reached */
+                       /* Check if end of Dataflash page reached */
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
-                               /* Write the dataflash buffer contents back to the dataflash page */
+                               /* Write the Dataflash buffer contents back to the Dataflash page */
                                Dataflash_WaitWhileBusy();
                                Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
 
                                Dataflash_WaitWhileBusy();
                                Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
 
-                               /* Reset the dataflash buffer counter, increment the page counter */
+                               /* Reset the Dataflash buffer counter, increment the page counter */
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
-                               /* Once all the dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */
+                               /* Once all the Dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */
                                if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))
                                  UsingSecondBuffer = !(UsingSecondBuffer);
 
                                if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))
                                  UsingSecondBuffer = !(UsingSecondBuffer);
 
-                               /* Select the next dataflash chip based on the new dataflash page index */
+                               /* Select the next Dataflash chip based on the new Dataflash page index */
                                Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
                                Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
-                               /* If less than one dataflash page remaining, copy over the existing page to preserve trailing data */
+                               /* If less than one Dataflash page remaining, copy over the existing page to preserve trailing data */
                                if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))
                                {
                                if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))
                                {
-                                       /* Copy selected dataflash's current page contents to the dataflash buffer */
+                                       /* Copy selected dataflash's current page contents to the Dataflash buffer */
                                        Dataflash_WaitWhileBusy();
                                        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);
                                        Dataflash_SendAddressBytes(CurrDFPage, 0);
                                        Dataflash_WaitWhileBusy();
                                        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);
                                        Dataflash_SendAddressBytes(CurrDFPage, 0);
@@ -121,12 +123,12 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
                                }
 #endif
 
                                }
 #endif
 
-                               /* Send the dataflash buffer write command */
+                               /* Send the Dataflash buffer write command */
                                Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2WRITE : DF_CMD_BUFF1WRITE);
                                Dataflash_SendAddressBytes(0, 0);                               
                        }
 
                                Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2WRITE : DF_CMD_BUFF1WRITE);
                                Dataflash_SendAddressBytes(0, 0);                               
                        }
 
-                       /* Write one 16-byte chunk of data to the dataflash */
+                       /* 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());
@@ -144,7 +146,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
                        Dataflash_SendByte(Endpoint_Read_Byte());
                        Dataflash_SendByte(Endpoint_Read_Byte());
                        
                        Dataflash_SendByte(Endpoint_Read_Byte());
                        Dataflash_SendByte(Endpoint_Read_Byte());
                        
-                       /* Increment the dataflash page 16 byte block counter */
+                       /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
 
                        /* Increment the block 16 byte block counter */
                        CurrDFPageByteDiv16++;
 
                        /* Increment the block 16 byte block counter */
@@ -159,7 +161,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
                TotalBlocks--;
        }
 
                TotalBlocks--;
        }
 
-       /* Write the dataflash buffer contents back to the dataflash page */
+       /* Write the Dataflash buffer contents back to the Dataflash page */
        Dataflash_WaitWhileBusy();
        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
        Dataflash_SendAddressBytes(CurrDFPage, 0x00);
        Dataflash_WaitWhileBusy();
        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
        Dataflash_SendAddressBytes(CurrDFPage, 0x00);
@@ -169,11 +171,11 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
        if (!(Endpoint_IsReadWriteAllowed()))
          Endpoint_ClearOUT();
 
        if (!(Endpoint_IsReadWriteAllowed()))
          Endpoint_ClearOUT();
 
-       /* Deselect all dataflash chips */
+       /* Deselect all Dataflash chips */
        Dataflash_DeselectChip();
 }
 
        Dataflash_DeselectChip();
 }
 
-/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board dataflash IC(s), into
+/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board Dataflash IC(s), into
  *  the pre-selected data IN endpoint. This routine reads in Dataflash page sized blocks from the Dataflash
  *  and writes them in OS sized blocks to the endpoint.
  *
  *  the pre-selected data IN endpoint. This routine reads in Dataflash page sized blocks from the Dataflash
  *  and writes them in OS sized blocks to the endpoint.
  *
@@ -181,7 +183,9 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, co
  *  \param[in] BlockAddress  Data block starting address for the read sequence
  *  \param[in] TotalBlocks   Number of blocks of data to read
  */
  *  \param[in] BlockAddress  Data block starting address for the read sequence
  *  \param[in] TotalBlocks   Number of blocks of data to read
  */
-void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks)
+void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,
+                                 const uint32_t BlockAddress,
+                                 uint16_t TotalBlocks)
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
@@ -190,7 +194,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con
        /* Select the correct starting Dataflash IC for the block requested */
        Dataflash_SelectChipFromPage(CurrDFPage);
 
        /* Select the correct starting Dataflash IC for the block requested */
        Dataflash_SelectChipFromPage(CurrDFPage);
 
-       /* Send the dataflash main memory page read command */
+       /* Send the Dataflash main memory page read command */
        Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
        Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);
        Dataflash_SendByte(0x00);
        Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
        Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);
        Dataflash_SendByte(0x00);
@@ -206,7 +210,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con
        {
                uint8_t BytesInBlockDiv16 = 0;
                
        {
                uint8_t BytesInBlockDiv16 = 0;
                
-               /* Write an endpoint packet sized data block to the dataflash */
+               /* Write an endpoint packet sized data block to the Dataflash */
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
                        /* Check if the endpoint is currently full */
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
                        /* Check if the endpoint is currently full */
@@ -220,17 +224,17 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con
                                  return;
                        }
                        
                                  return;
                        }
                        
-                       /* Check if end of dataflash page reached */
+                       /* Check if end of Dataflash page reached */
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
-                               /* Reset the dataflash buffer counter, increment the page counter */
+                               /* Reset the Dataflash buffer counter, increment the page counter */
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
-                               /* Select the next dataflash chip based on the new dataflash page index */
+                               /* Select the next Dataflash chip based on the new Dataflash page index */
                                Dataflash_SelectChipFromPage(CurrDFPage);
                                
                                Dataflash_SelectChipFromPage(CurrDFPage);
                                
-                               /* Send the dataflash main memory page read command */
+                               /* Send the Dataflash main memory page read command */
                                Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
                                Dataflash_SendByte(0x00);
                                Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
                                Dataflash_SendByte(0x00);
@@ -239,7 +243,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con
                                Dataflash_SendByte(0x00);
                        }       
 
                                Dataflash_SendByte(0x00);
                        }       
 
-                       /* Read one 16-byte chunk of data from the dataflash */
+                       /* 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());
@@ -257,7 +261,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con
                        Endpoint_Write_Byte(Dataflash_ReceiveByte());
                        Endpoint_Write_Byte(Dataflash_ReceiveByte());
                        
                        Endpoint_Write_Byte(Dataflash_ReceiveByte());
                        Endpoint_Write_Byte(Dataflash_ReceiveByte());
                        
-                       /* Increment the dataflash page 16 byte block counter */
+                       /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
                        
                        /* Increment the block 16 byte block counter */
                        CurrDFPageByteDiv16++;
                        
                        /* Increment the block 16 byte block counter */
@@ -276,20 +280,22 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, con
        if (!(Endpoint_IsReadWriteAllowed()))
          Endpoint_ClearIN();
 
        if (!(Endpoint_IsReadWriteAllowed()))
          Endpoint_ClearIN();
 
-       /* Deselect all dataflash chips */
+       /* Deselect all Dataflash chips */
        Dataflash_DeselectChip();
 }
 
        Dataflash_DeselectChip();
 }
 
-/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from
+/** 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 a 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.
+ *  Dataflash in Dataflash page sized blocks. This can be linked to FAT libraries to write files to the
+ *  Dataflash.
  *
  *  \param[in] BlockAddress  Data block starting address for the write sequence
  *  \param[in] TotalBlocks   Number of blocks of data to write
  *  \param[in] BufferPtr     Pointer to the data source RAM buffer
  */
  *
  *  \param[in] BlockAddress  Data block starting address for the write sequence
  *  \param[in] TotalBlocks   Number of blocks of data to write
  *  \param[in] BufferPtr     Pointer to the data source RAM buffer
  */
-void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr)
+void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
+                                      uint16_t TotalBlocks,
+                                      uint8_t* BufferPtr)
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
@@ -300,13 +306,13 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota
        Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
        Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
-       /* Copy selected dataflash's current page contents to the dataflash buffer */
+       /* Copy selected dataflash's current page contents to the Dataflash buffer */
        Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);
        Dataflash_SendAddressBytes(CurrDFPage, 0);
        Dataflash_WaitWhileBusy();
 #endif
 
        Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);
        Dataflash_SendAddressBytes(CurrDFPage, 0);
        Dataflash_WaitWhileBusy();
 #endif
 
-       /* Send the dataflash buffer write command */
+       /* Send the Dataflash buffer write command */
        Dataflash_SendByte(DF_CMD_BUFF1WRITE);
        Dataflash_SendAddressBytes(0, CurrDFPageByte);
        
        Dataflash_SendByte(DF_CMD_BUFF1WRITE);
        Dataflash_SendAddressBytes(0, CurrDFPageByte);
        
@@ -314,33 +320,33 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota
        {
                uint8_t BytesInBlockDiv16 = 0;
                
        {
                uint8_t BytesInBlockDiv16 = 0;
                
-               /* Write an endpoint packet sized data block to the dataflash */
+               /* Write an endpoint packet sized data block to the Dataflash */
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
-                       /* Check if end of dataflash page reached */
+                       /* Check if end of Dataflash page reached */
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
-                               /* Write the dataflash buffer contents back to the dataflash page */
+                               /* Write the Dataflash buffer contents back to the Dataflash page */
                                Dataflash_WaitWhileBusy();
                                Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
 
                                Dataflash_WaitWhileBusy();
                                Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
 
-                               /* Reset the dataflash buffer counter, increment the page counter */
+                               /* Reset the Dataflash buffer counter, increment the page counter */
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
-                               /* Once all the dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */
+                               /* Once all the Dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */
                                if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))
                                  UsingSecondBuffer = !(UsingSecondBuffer);
 
                                if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))
                                  UsingSecondBuffer = !(UsingSecondBuffer);
 
-                               /* Select the next dataflash chip based on the new dataflash page index */
+                               /* Select the next Dataflash chip based on the new Dataflash page index */
                                Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
                                Dataflash_SelectChipFromPage(CurrDFPage);
 
 #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE)
-                               /* If less than one dataflash page remaining, copy over the existing page to preserve trailing data */
+                               /* If less than one Dataflash page remaining, copy over the existing page to preserve trailing data */
                                if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))
                                {
                                if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))
                                {
-                                       /* Copy selected dataflash's current page contents to the dataflash buffer */
+                                       /* Copy selected dataflash's current page contents to the Dataflash buffer */
                                        Dataflash_WaitWhileBusy();
                                        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);
                                        Dataflash_SendAddressBytes(CurrDFPage, 0);
                                        Dataflash_WaitWhileBusy();
                                        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);
                                        Dataflash_SendAddressBytes(CurrDFPage, 0);
@@ -348,17 +354,17 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota
                                }
 #endif
 
                                }
 #endif
 
-                               /* Send the dataflash buffer write command */
+                               /* Send the Dataflash buffer write command */
                                Dataflash_ToggleSelectedChipCS();
                                Dataflash_SendByte(DF_CMD_BUFF1WRITE);
                                Dataflash_SendAddressBytes(0, 0);
                        }
                        
                                Dataflash_ToggleSelectedChipCS();
                                Dataflash_SendByte(DF_CMD_BUFF1WRITE);
                                Dataflash_SendAddressBytes(0, 0);
                        }
                        
-                       /* Write one 16-byte chunk of data to the dataflash */
+                       /* Write one 16-byte chunk of data to the Dataflash */
                        for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)
                          Dataflash_SendByte(*(BufferPtr++));
                        
                        for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)
                          Dataflash_SendByte(*(BufferPtr++));
                        
-                       /* Increment the dataflash page 16 byte block counter */
+                       /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
 
                        /* Increment the block 16 byte block counter */
                        CurrDFPageByteDiv16++;
 
                        /* Increment the block 16 byte block counter */
@@ -369,26 +375,28 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota
                TotalBlocks--;
        }
 
                TotalBlocks--;
        }
 
-       /* Write the dataflash buffer contents back to the dataflash page */
+       /* Write the Dataflash buffer contents back to the Dataflash page */
        Dataflash_WaitWhileBusy();
        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
        Dataflash_SendAddressBytes(CurrDFPage, 0x00);
        Dataflash_WaitWhileBusy();
 
        Dataflash_WaitWhileBusy();
        Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);
        Dataflash_SendAddressBytes(CurrDFPage, 0x00);
        Dataflash_WaitWhileBusy();
 
-       /* Deselect all dataflash chips */
+       /* Deselect all Dataflash chips */
        Dataflash_DeselectChip();
 }
 
        Dataflash_DeselectChip();
 }
 
-/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board dataflash IC(s), into
+/** 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
  *  and writes them in OS sized blocks to the given buffer. This can be linked to FAT libraries to read
  *  the a 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.
+ *  the files stored on the Dataflash.
  *
  *  \param[in] BlockAddress  Data block starting address for the read sequence
  *  \param[in] TotalBlocks   Number of blocks of data to read
  *  \param[out] BufferPtr    Pointer to the data destination RAM buffer
  */
  *
  *  \param[in] BlockAddress  Data block starting address for the read sequence
  *  \param[in] TotalBlocks   Number of blocks of data to read
  *  \param[out] BufferPtr    Pointer to the data destination RAM buffer
  */
-void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr)
+void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress,
+                                     uint16_t TotalBlocks,
+                                     uint8_t* BufferPtr)
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
 {
        uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);
        uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE);
@@ -397,7 +405,7 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t Total
        /* Select the correct starting Dataflash IC for the block requested */
        Dataflash_SelectChipFromPage(CurrDFPage);
 
        /* Select the correct starting Dataflash IC for the block requested */
        Dataflash_SelectChipFromPage(CurrDFPage);
 
-       /* Send the dataflash main memory page read command */
+       /* Send the Dataflash main memory page read command */
        Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
        Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);
        Dataflash_SendByte(0x00);
        Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
        Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);
        Dataflash_SendByte(0x00);
@@ -409,20 +417,20 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t Total
        {
                uint8_t BytesInBlockDiv16 = 0;
                
        {
                uint8_t BytesInBlockDiv16 = 0;
                
-               /* Write an endpoint packet sized data block to the dataflash */
+               /* Write an endpoint packet sized data block to the Dataflash */
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))
                {
-                       /* Check if end of dataflash page reached */
+                       /* Check if end of Dataflash page reached */
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
                        if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))
                        {
-                               /* Reset the dataflash buffer counter, increment the page counter */
+                               /* Reset the Dataflash buffer counter, increment the page counter */
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
                                CurrDFPageByteDiv16 = 0;
                                CurrDFPage++;
 
-                               /* Select the next dataflash chip based on the new dataflash page index */
+                               /* Select the next Dataflash chip based on the new Dataflash page index */
                                Dataflash_SelectChipFromPage(CurrDFPage);
                                
                                Dataflash_SelectChipFromPage(CurrDFPage);
                                
-                               /* Send the dataflash main memory page read command */
+                               /* Send the Dataflash main memory page read command */
                                Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
                                Dataflash_SendByte(0x00);
                                Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);
                                Dataflash_SendAddressBytes(CurrDFPage, 0);
                                Dataflash_SendByte(0x00);
@@ -431,11 +439,11 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t Total
                                Dataflash_SendByte(0x00);
                        }       
 
                                Dataflash_SendByte(0x00);
                        }       
 
-                       /* Read one 16-byte chunk of data from the dataflash */
+                       /* Read one 16-byte chunk of data from the Dataflash */
                        for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)
                          *(BufferPtr++) = Dataflash_ReceiveByte();
                        
                        for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)
                          *(BufferPtr++) = Dataflash_ReceiveByte();
                        
-                       /* Increment the dataflash page 16 byte block counter */
+                       /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
                        
                        /* Increment the block 16 byte block counter */
                        CurrDFPageByteDiv16++;
                        
                        /* Increment the block 16 byte block counter */
@@ -446,14 +454,14 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t Total
                TotalBlocks--;
        }
 
                TotalBlocks--;
        }
 
-       /* Deselect all dataflash chips */
+       /* Deselect all Dataflash chips */
        Dataflash_DeselectChip();
 }
 
        Dataflash_DeselectChip();
 }
 
-/** Disables the dataflash memory write protection bits on the board Dataflash ICs, if enabled. */
+/** Disables the Dataflash memory write protection bits on the board Dataflash ICs, if enabled. */
 void DataflashManager_ResetDataflashProtections(void)
 {
 void DataflashManager_ResetDataflashProtections(void)
 {
-       /* Select first dataflash chip, send the read status register command */
+       /* Select first Dataflash chip, send the read status register command */
        Dataflash_SelectChip(DATAFLASH_CHIP1);
        Dataflash_SendByte(DF_CMD_GETSTATUS);
        
        Dataflash_SelectChip(DATAFLASH_CHIP1);
        Dataflash_SendByte(DF_CMD_GETSTATUS);
        
@@ -469,7 +477,7 @@ void DataflashManager_ResetDataflashProtections(void)
                Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[3]);
        }
        
                Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[3]);
        }
        
-       /* Select second dataflash chip (if present on selected board), send read status register command */
+       /* Select second Dataflash chip (if present on selected board), send read status register command */
        #if (DATAFLASH_TOTALCHIPS == 2)
        Dataflash_SelectChip(DATAFLASH_CHIP2);
        Dataflash_SendByte(DF_CMD_GETSTATUS);
        #if (DATAFLASH_TOTALCHIPS == 2)
        Dataflash_SelectChip(DATAFLASH_CHIP2);
        Dataflash_SendByte(DF_CMD_GETSTATUS);
@@ -487,7 +495,7 @@ void DataflashManager_ResetDataflashProtections(void)
        }
        #endif
        
        }
        #endif
        
-       /* Deselect current dataflash chip */
+       /* Deselect current Dataflash chip */
        Dataflash_DeselectChip();
 }
 
        Dataflash_DeselectChip();
 }
 
USB isp AVR programmer