Additional file renames and modifications to change CDC demos to VirtualSerial.

[pub/USBasp.git] / Demos / Device / ClassDriver / MassStorage / Lib / DataflashManager.h

diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
index 8cf1907..2deac09 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
@@ -42,9 +42,10 @@
                #include "MassStorage.h"\r
                #include "Descriptors.h"\r
 \r
-               #include <LUFA/Common/Common.h>              // Function Attribute, Atomic, Debug and ISR Macros\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
-               #include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver\r
+               #include <LUFA/Common/Common.h>                 // Function Attribute, Atomic, Debug and ISR Macros\r
+               #include <LUFA/Drivers/USB/USB.h>               // USB Functionality\r
+               #include <LUFA/Drivers/USB/Class/MassStorage.h> // Mass Storage Class Driver\r
+               #include <LUFA/Drivers/Board/Dataflash.h>       // Dataflash chip driver\r
 \r
        /* Preprocessor Checks: */\r
                #if (DATAFLASH_PAGE_SIZE % 16)\r
@@ -56,22 +57,25 @@
                #define VIRTUAL_MEMORY_BYTES                ((uint32_t)DATAFLASH_PAGES * DATAFLASH_PAGE_SIZE * DATAFLASH_TOTALCHIPS)\r
 \r
                /** Block size of the device. This is kept at 512 to remain compatible with the OS despite the underlying\r
-                *  storage media (Dataflash) using a different native block size.\r
+                *  storage media (Dataflash) using a different native block size. Do not change this value.\r
                 */\r
                #define VIRTUAL_MEMORY_BLOCK_SIZE           512\r
                \r
-               /** Total number of blocks of the virtual memory for reporting to the host as the device's total capacity. */\r
+               /** Total number of blocks of the virtual memory for reporting to the host as the device's total capacity. Do not\r
+                *  change this value; change VIRTUAL_MEMORY_BYTES instead to alter the media size.\r
+                */\r
                #define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)\r
                \r
        /* Function Prototypes: */\r
-               void DataflashManager_WriteBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress,\r
+               void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress,\r
                                                  uint16_t TotalBlocks);\r
-               void DataflashManager_ReadBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress,\r
+               void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const uint32_t BlockAddress,\r
                                                 uint16_t TotalBlocks);\r
                void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,\r
                                                      uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);\r
                void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,\r
                                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);\r
                void DataflashManager_ResetDataflashProtections(void);\r
+               bool DataflashManager_CheckDataflashOperation(void);\r
                \r
 #endif\r