fatfs: Added some asserts on block device geometry

geky · geky · commit 626256e1047d · 2017-08-28T14:54:33.000-05:00
diff --git a/features/filesystem/fat/FATFileSystem.cpp b/features/filesystem/fat/FATFileSystem.cpp
@@ -167,12 +167,17 @@ static WORD disk_get_sector_size(BYTE pdrv)
         ssize = 512;
     }
 
+    MBED_ASSERT(ssize >= _MIN_SS && ssize <= _MAX_SS);
+    MBED_ASSERT(_ffs[pdrv]->get_read_size() <= _ffs[pdrv]->get_erase_size());
+    MBED_ASSERT(_ffs[pdrv]->get_program_size() <= _ffs[pdrv]->get_erase_size());
     return ssize;
 }
 
 static DWORD disk_get_sector_count(BYTE pdrv)
 {
-    return _ffs[pdrv]->size() / disk_get_sector_size(pdrv);
+    DWORD scount = _ffs[pdrv]->size() / disk_get_sector_size(pdrv);
+    MBED_ASSERT(scount >= 64);
+    return scount;
 }
 
 DSTATUS disk_status(BYTE pdrv)

Original file line number	Diff line number	Diff line change
`@@ -167,12 +167,17 @@ static WORD disk_get_sector_size(BYTE pdrv)`
`167`	`167`	`ssize = 512;`
`168`	`168`	`}`
`169`	`169`
	`170`	`+ MBED_ASSERT(ssize >= _MIN_SS && ssize <= _MAX_SS);`
	`171`	`+ MBED_ASSERT(_ffs[pdrv]->get_read_size() <= _ffs[pdrv]->get_erase_size());`
	`172`	`+ MBED_ASSERT(_ffs[pdrv]->get_program_size() <= _ffs[pdrv]->get_erase_size());`
`170`	`173`	`return ssize;`
`171`	`174`	`}`
`172`	`175`
`173`	`176`	`static DWORD disk_get_sector_count(BYTE pdrv)`
`174`	`177`	`{`
`175`		`- return _ffs[pdrv]->size() / disk_get_sector_size(pdrv);`
	`178`	`+ DWORD scount = _ffs[pdrv]->size() / disk_get_sector_size(pdrv);`
	`179`	`+ MBED_ASSERT(scount >= 64);`
	`180`	`+ return scount;`
`176`	`181`	`}`
`177`	`182`
`178`	`183`	`DSTATUS disk_status(BYTE pdrv)`