Added new USE_INTERNAL_SERIAL define for using the unique serial numbers in some...

[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 87edef1..5b5a2bd 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c
@@ -43,10 +43,11 @@
  *  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
  *  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 MSInterfaceInfo  Pointer to a Mass Storage class state structure for the Mass Storage interface being used\r

  *  \param BlockAddress  Data block starting address for the write sequence\r
  *  \param TotalBlocks   Number of blocks of data to write\r
  */\r
  *  \param BlockAddress  Data block starting address for the write sequence\r
  *  \param TotalBlocks   Number of blocks of data to write\r
  */\r

-void DataflashManager_WriteBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks)\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
 {\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


@@ -142,7 +143,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uin
                        BytesInBlockDiv16++;\r
 \r
                        /* Check if the current command is being aborted by the host */\r
                        BytesInBlockDiv16++;\r
 \r
                        /* Check if the current command is being aborted by the host */\r

-                       if (MSInterfaceInfo->IsMassStoreReset)\r
+                       if (MSInterfaceInfo->State.IsMassStoreReset)\r

                          return;                       \r
                }\r
                        \r
                          return;                       \r
                }\r
                        \r


@@ -168,10 +169,11 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uin
  *  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
  *  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 MSInterfaceInfo  Pointer to a Mass Storage class state structure for the Mass Storage interface being used\r

  *  \param BlockAddress  Data block starting address for the read sequence\r
  *  \param TotalBlocks   Number of blocks of data to read\r
  */\r
  *  \param BlockAddress  Data block starting address for the read sequence\r
  *  \param TotalBlocks   Number of blocks of data to read\r
  */\r

-void DataflashManager_ReadBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks)\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
 {\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


@@ -250,7 +252,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint
                        BytesInBlockDiv16++;\r
 \r
                        /* Check if the current command is being aborted by the host */\r
                        BytesInBlockDiv16++;\r
 \r
                        /* Check if the current command is being aborted by the host */\r

-                       if (MSInterfaceInfo->IsMassStoreReset)\r
+                       if (MSInterfaceInfo->State.IsMassStoreReset)\r

                          return;\r
                }\r
                \r
                          return;\r
                }\r
                \r