Documentation improvements - put driver example code into its own section, fix incorr...

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / Lib / PetiteFATFs / diskio.c

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
index 0084fa5..c2821a4 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
@@ -1,46 +1,57 @@
-/*-----------------------------------------------------------------------*/\r
-/* Low level disk I/O module skeleton for Petit FatFs (C)ChaN, 2009      */\r
-/*-----------------------------------------------------------------------*/\r
-\r
-#include "diskio.h"\r
-\r
-#include <string.h>\r
-#include "../DataflashManager.h"\r
-\r
-/*-----------------------------------------------------------------------*/\r
-/* Initialize Disk Drive                                                 */\r
-/*-----------------------------------------------------------------------*/\r
-\r
-DSTATUS disk_initialize (void)\r
-{\r
-       DSTATUS stat;\r
-\r
-       stat = RES_OK;\r
-\r
-       return stat;\r
-}\r
-\r
-\r
-\r
-/*-----------------------------------------------------------------------*/\r
-/* Read Partial Sector                                                   */\r
-/*-----------------------------------------------------------------------*/\r
-\r
-DRESULT disk_readp (\r
-       void* dest,                     /* Pointer to the destination object */\r
-       DWORD sector,           /* Sector number (LBA) */\r
-       WORD sofs,                      /* Offset in the sector */\r
-       WORD count                      /* Byte count (bit15:destination) */\r
-)\r
-{\r
-       DRESULT res;\r
-\r
-       uint8_t BlockTemp[512];\r
-       DataflashManager_ReadBlocks_RAM(sector, 1, BlockTemp);\r
-       memcpy(dest, &BlockTemp[sofs], count);\r
-\r
-       res = RES_OK;\r
-\r
-       return res;\r
-}\r
-\r
+/*-----------------------------------------------------------------------*/
+/* Low level disk I/O module skeleton for Petit FatFs (C)ChaN, 2010      */
+/*-----------------------------------------------------------------------*/
+
+#include "diskio.h"
+
+#include <string.h>
+#include <LUFA/Drivers/USB/Class/MassStorage.h>
+#include "../DataflashManager.h"
+#include "../../DiskHost.h"
+
+/*-----------------------------------------------------------------------*/
+/* Initialize Disk Drive                                                 */
+/*-----------------------------------------------------------------------*/
+
+DSTATUS disk_initialize (void)
+{
+       return RES_OK;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read Partial Sector                                                   */
+/*-----------------------------------------------------------------------*/
+
+DRESULT disk_readp (
+       void* dest,                     /* Pointer to the destination object */
+       DWORD sector,           /* Sector number (LBA) */
+       WORD sofs,                      /* Offset in the sector */
+       WORD count                      /* Byte count (bit15:destination) */
+)
+{
+       DRESULT ErrorCode = RES_OK;
+       uint8_t BlockTemp[512];
+
+       if (USB_CurrentMode == USB_MODE_Host)
+       {
+               #if defined(USB_CAN_BE_HOST)
+               if (USB_HostState != HOST_STATE_Configured)
+                 ErrorCode = RES_NOTRDY;
+               else if (MS_Host_ReadDeviceBlocks(&DiskHost_MS_Interface, 0, sector, 1, 512, BlockTemp))
+                 ErrorCode = RES_ERROR;
+               #endif
+       }
+       else
+       {
+               #if defined(USB_CAN_BE_DEVICE)
+               DataflashManager_ReadBlocks_RAM(sector, 1, BlockTemp);
+               #endif
+       }
+
+       memcpy(dest, &BlockTemp[sofs], count);
+
+       return ErrorCode;
+}
+