debug: factorize all static asserts about fat sector size

DragonMinded · Feb 12, 2023 · 827b7ec · 827b7ec
1 parent 2187f4e
commit 827b7ec
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/src/debug.c b/src/debug.c
@@ -164,6 +164,8 @@ DSTATUS disk_status(BYTE pdrv)
 
 DRESULT disk_read(BYTE pdrv, BYTE* buff, LBA_t sector, UINT count)
 {
+	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
+	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
 	if (fat_disks[pdrv].disk_read && PhysicalAddr(buff) < 0x00800000)
 		return fat_disks[pdrv].disk_read(buff, sector, count);
 	if (fat_disks[pdrv].disk_read_sdram && io_accessible(PhysicalAddr(buff)))
@@ -173,6 +175,8 @@ DRESULT disk_read(BYTE pdrv, BYTE* buff, LBA_t sector, UINT count)
 
 DRESULT disk_write(BYTE pdrv, const BYTE* buff, LBA_t sector, UINT count)
 {
+	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
+	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
 	if (fat_disks[pdrv].disk_write)
 		return fat_disks[pdrv].disk_write(buff, sector, count);
 	return RES_PARERR;

diff --git a/src/debug_sdfs_64drive.c b/src/debug_sdfs_64drive.c
@@ -39,9 +39,6 @@ static void sd_abort_64drive(void)
 
 static DRESULT fat_disk_read_sdram_64drive(BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
-
 	usb_64drive_wait();
 	io_write(D64_CIBASE_ADDRESS + D64_REGISTER_LBA, sector);
 	usb_64drive_wait();
@@ -61,9 +58,6 @@ static DRESULT fat_disk_read_sdram_64drive(BYTE* buff, LBA_t sector, UINT count)
 
 static DRESULT fat_disk_read_64drive(BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
-
 	usb_64drive_wait();
 	io_write(D64_CIBASE_ADDRESS + D64_REGISTER_LENGTH, 1);
 	for (int i=0;i<count;i++)
@@ -88,9 +82,6 @@ static DRESULT fat_disk_read_64drive(BYTE* buff, LBA_t sector, UINT count)
 
 static DRESULT fat_disk_write_64drive(const BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
-
 	usb_64drive_wait();
 	io_write(D64_CIBASE_ADDRESS + D64_REGISTER_LENGTH, 1);
 	for (int i=0;i<count;i++)

diff --git a/src/debug_sdfs_ed64.c b/src/debug_sdfs_ed64.c
@@ -441,9 +441,6 @@ static DSTATUS fat_disk_initialize_everdrive(void) {
 
 static DRESULT fat_disk_read_everdrive(BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
-
 	uint8_t crc[8];
 	DRESULT ret_val = RES_OK;
 
@@ -505,9 +502,6 @@ static DRESULT fat_disk_read_everdrive(BYTE* buff, LBA_t sector, UINT count)
 }
 
 static DRESULT fat_disk_write_everdrive(const BYTE* buff, LBA_t sector, UINT count) {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
-
 	uint8_t result;
 	DRESULT ret_val = RES_OK;
 

diff --git a/src/debug_sdfs_sc64.c b/src/debug_sdfs_sc64.c
@@ -51,8 +51,6 @@ static DSTATUS fat_disk_initialize_sc64(void)
 
 static DRESULT fat_disk_read_sc64(BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
 	while (count > 0)
 	{
 		UINT sectors_to_process = MIN(count, SC64_BUFFER_SIZE/512);
@@ -69,17 +67,13 @@ static DRESULT fat_disk_read_sc64(BYTE* buff, LBA_t sector, UINT count)
 
 static DRESULT fat_disk_read_sdram_sc64(BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
 	if (sc64_sd_read_sectors((uint32_t)buff, sector, count))
 		return FR_DISK_ERR;
 	return RES_OK;
 }
 
 static DRESULT fat_disk_write_sc64(const BYTE* buff, LBA_t sector, UINT count)
 {
-	_Static_assert(FF_MIN_SS == 512, "this function assumes sector size == 512");
-	_Static_assert(FF_MAX_SS == 512, "this function assumes sector size == 512");
 	while (count > 0)
 	{
 		UINT sectors_to_process = MIN(count, SC64_BUFFER_SIZE/512);