Upgrade the Zynq driver to recognise and use drives larger than 64GB (#3

) Authored-by: Hein Tibosch
FreeRTOS · Oct 31, 2020 · 680393f · 680393f
1 parent 49b4719
commit 680393f
Show file tree

Hide file tree

Showing 13 changed files with 6,859 additions and 4 deletions.
diff --git a/ff_format.c b/ff_format.c
@@ -115,6 +115,9 @@
 
 #define RESV_COUNT					32
 
+#define MX_LBA_TO_MOVE_FAT			8192uL
+#define SIZE_512_MB					0x100000uL
+
 #ifdef ffconfigMIN_CLUSTERS_FAT32
 	#define MIN_CLUSTER_COUNT_FAT32		ffconfigMIN_CLUSTERS_FAT32
 #else
@@ -289,7 +292,9 @@ FF_IOManager_t *pxIOManager = pxDisk->pxIOManager;
 		}
 	}
 
-	if( ( ucFATType == FF_T_FAT32 ) && ( ulSectorCount >= 0x100000UL ) )	/* Larger than 0.5 GB */
+	if( ( ucFATType == FF_T_FAT32 ) &&
+		( ulSectorCount >= SIZE_512_MB ) &&
+		( pxMyPartition->ulStartLBA < MX_LBA_TO_MOVE_FAT ) )
 	{
 	uint32_t ulRemaining;
 		/*
@@ -298,7 +303,7 @@ FF_IOManager_t *pxIOManager = pxDisk->pxIOManager;
 		 * See e.g. here:
 		 * http://3gfp.com/wp/2014/07/formatting-sd-cards-for-speed-and-lifetime/
 		 */
-		ulFATReservedSectors = 8192 - ulHiddenSectors;
+		ulFATReservedSectors = MX_LBA_TO_MOVE_FAT - ulHiddenSectors;
 		ulNonDataSectors = ulFATReservedSectors + iFAT16RootSectors;
 
 		ulRemaining = (ulNonDataSectors + 2 * ulSectorsPerFAT) % 128;

diff --git a/ff_ioman.c b/ff_ioman.c
@@ -401,6 +401,7 @@ const FF_Buffer_t *pxLastBuffer = &( pxIOManager->pxBuffers[ pxIOManager->usCach
 
 			if( pxMatchingBuffer->usNumHandles == 0 )
 			{
+				/* Copy the read & write flags. */
 				pxMatchingBuffer->ucMode = ( ucMode & FF_MODE_RD_WR );
 				if( ( ucMode & FF_MODE_WRITE ) != 0 )
 				{
@@ -413,7 +414,8 @@ const FF_Buffer_t *pxLastBuffer = &( pxIOManager->pxBuffers[ pxIOManager->usCach
 				break;
 			}
 
-			pxMatchingBuffer = NULL;	/* Sector is already in use, keep yielding until its available! */
+			/* Sector is already in use in a different mode, keep yielding until its available! */
+			pxMatchingBuffer = NULL;
 		}
 		else
 		{