Eliminating all currently nonsupported storage types.

aentinger · aentinger · commit d1eef9e37175 · 2021-01-26T10:57:06.000+01:00
diff --git a/src/Arduino_Portenta_OTA.h b/src/Arduino_Portenta_OTA.h
@@ -51,13 +51,9 @@ enum StorageTypePortenta {
     INTERNAL_FLASH_FATFS    = INTERNAL_FLASH_FLAG | FATFS_FLAG,
     INTERNAL_FLASH_LITTLEFS = INTERNAL_FLASH_FLAG | LITTLEFS_FLAG,
     QSPI_FLASH_FATFS        = QSPI_FLASH_FLAG | FATFS_FLAG,
-    QSPI_FLASH_LITTLEFS     = QSPI_FLASH_FLAG | LITTLEFS_FLAG,
     QSPI_FLASH_FATFS_MBR    = QSPI_FLASH_FLAG | FATFS_FLAG | MBR_FLAG,
-    QSPI_FLASH_LITTLEFS_MBR = QSPI_FLASH_FLAG | LITTLEFS_FLAG | MBR_FLAG,
     SD_FATFS                = SDCARD_FLAG | FATFS_FLAG,
-    SD_LITTLEFS             = SDCARD_FLAG | LITTLEFS_FLAG,
     SD_FATFS_MBR            = SDCARD_FLAG | FATFS_FLAG | MBR_FLAG,
-    SD_LITTLEFS_MBR         = SDCARD_FLAG | LITTLEFS_FLAG | MBR_FLAG
 };
 
 /******************************************************************************
diff --git a/src/Arduino_Portenta_OTA_InternalFlash.cpp b/src/Arduino_Portenta_OTA_InternalFlash.cpp
@@ -35,8 +35,7 @@ Arduino_Portenta_OTA_InternalFlash::Arduino_Portenta_OTA_InternalFlash(StorageTy
 , _fs_flash{NULL}
 , _littlefs_fs_flash{NULL}
 {
-  assert(_storage_type == INTERNAL_FLASH_FATFS  ||
-         _storage_type == INTERNAL_FLASH_LITTLEFS);
+  assert(_storage_type == INTERNAL_FLASH_FATFS || _storage_type == INTERNAL_FLASH_LITTLEFS);
 }
 
 /******************************************************************************
diff --git a/src/Arduino_Portenta_OTA_QSPI.cpp b/src/Arduino_Portenta_OTA_QSPI.cpp
@@ -35,10 +35,7 @@ Arduino_Portenta_OTA_QSPI::Arduino_Portenta_OTA_QSPI(StorageTypePortenta const s
 , _fs_qspi{NULL}
 , _block_device_qspi(PD_11, PD_12, PF_7, PD_13,  PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000)
 {
-  assert(_storage_type == QSPI_FLASH_FATFS     ||
-         _storage_type == QSPI_FLASH_LITTLEFS  ||
-         _storage_type == QSPI_FLASH_FATFS_MBR ||
-         _storage_type == QSPI_FLASH_LITTLEFS_MBR);
+  assert(_storage_type == QSPI_FLASH_FATFS || _storage_type == QSPI_FLASH_FATFS_MBR);
 }
 
 /******************************************************************************
diff --git a/src/Arduino_Portenta_OTA_SD.cpp b/src/Arduino_Portenta_OTA_SD.cpp
@@ -44,10 +44,7 @@ Arduino_Portenta_OTA_SD::Arduino_Portenta_OTA_SD(StorageTypePortenta const stora
 , _block_device()
 , _fs_sd{NULL}
 {
-  assert(_storage_type == SD_FATFS     ||
-         _storage_type == SD_LITTLEFS  ||
-         _storage_type == SD_FATFS_MBR ||
-         _storage_type == SD_LITTLEFS_MBR);
+  assert(_storage_type == SD_FATFS || _storage_type == SD_FATFS_MBR);
 }
 
 /******************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ Arduino_Portenta_OTA_InternalFlash::Arduino_Portenta_OTA_InternalFlash(StorageTy`
`35`	`35`	`, _fs_flash{NULL}`
`36`	`36`	`, _littlefs_fs_flash{NULL}`
`37`	`37`	`{`
`38`		`- assert(_storage_type == INTERNAL_FLASH_FATFS \|\|`
`39`		`- _storage_type == INTERNAL_FLASH_LITTLEFS);`
	`38`	`+ assert(_storage_type == INTERNAL_FLASH_FATFS \|\| _storage_type == INTERNAL_FLASH_LITTLEFS);`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,7 @@ Arduino_Portenta_OTA_QSPI::Arduino_Portenta_OTA_QSPI(StorageTypePortenta const s`
`35`	`35`	`, _fs_qspi{NULL}`
`36`	`36`	`, _block_device_qspi(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000)`
`37`	`37`	`{`
`38`		`- assert(_storage_type == QSPI_FLASH_FATFS \|\|`
`39`		`- _storage_type == QSPI_FLASH_LITTLEFS \|\|`
`40`		`- _storage_type == QSPI_FLASH_FATFS_MBR \|\|`
`41`		`- _storage_type == QSPI_FLASH_LITTLEFS_MBR);`
	`38`	`+ assert(_storage_type == QSPI_FLASH_FATFS \|\| _storage_type == QSPI_FLASH_FATFS_MBR);`
`42`	`39`	`}`
`43`	`40`
`44`	`41`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,7 @@ Arduino_Portenta_OTA_SD::Arduino_Portenta_OTA_SD(StorageTypePortenta const stora`
`44`	`44`	`, _block_device()`
`45`	`45`	`, _fs_sd{NULL}`
`46`	`46`	`{`
`47`		`- assert(_storage_type == SD_FATFS \|\|`
`48`		`- _storage_type == SD_LITTLEFS \|\|`
`49`		`- _storage_type == SD_FATFS_MBR \|\|`
`50`		`- _storage_type == SD_LITTLEFS_MBR);`
	`47`	`+ assert(_storage_type == SD_FATFS \|\| _storage_type == SD_FATFS_MBR);`
`51`	`48`	`}`
`52`	`49`
`53`	`50`	`/******************************************************************************`