samd/flash: Implement the review comments.

robert-hh · robert-hh · commit da5b78b89345 · 2023-06-05T10:44:16.000+02:00
Signed-off-by: robert-hh &lt;robert@hammelrath.com&gt;
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
@@ -35,9 +35,14 @@
 extern const mp_obj_type_t samd_flash_type;
 #ifdef MICROPY_HW_QSPIFLASH
 extern const mp_obj_type_t samd_qspiflash_type;
+#define SPIFLASH_TYPE samd_qspiflash_type
 #endif
 #if MICROPY_HW_SPIFLASH
 extern const mp_obj_type_t spiflash_type;
+#define SPIFLASH_TYPE spiflash_type
+#endif
+#if MICROPY_HW_MCUFLASH
+#define SPIFLASH_TYPE samd_flash_type
 #endif
 
 STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
@@ -74,24 +79,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(samd_pininfo_obj, samd_pininfo);
 STATIC const mp_rom_map_elem_t samd_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_samd) },
     { MP_ROM_QSTR(MP_QSTR_pininfo),  MP_ROM_PTR(&samd_pininfo_obj) },
-    #if MICROPY_HW_MCUFLASH
-    #if defined(MICROPY_HW_QSPIFLASH) || defined(MICROPY_HW_SPIFLASH)
-    #error Only one type of flash must be used
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&samd_flash_type) },
-    #endif
-    #ifdef MICROPY_HW_QSPIFLASH
-    #if defined(MICROPY_HW_MCUFLASH) || defined(MICROPY_HW_SPIFLASH)
-    #error Only one type of flash must be used
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&samd_qspiflash_type) },
-    #endif
-    #if defined(MICROPY_HW_SPIFLASH) && defined(MICROPY_HW_SPIFLASH_ID)
-    #if defined(MICROPY_HW_MCUFLASH) || defined(MICROPY_HW_QSPIFLASH)
-    #error Only one type of flash must be used
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&spiflash_type) },
-    #endif
+    { MP_ROM_QSTR(MP_QSTR_Flash),    MP_ROM_PTR(&SPIFLASH_TYPE) },
 };
 STATIC MP_DEFINE_CONST_DICT(samd_module_globals, samd_module_globals_table);
 
diff --git a/ports/samd/samd_qspiflash.c b/ports/samd/samd_qspiflash.c
@@ -124,14 +124,6 @@ static void samd_peripherals_enable_cache(void) {
     CMCC->CTRL.bit.CEN = 1;
 }
 
-/*
-    @brief Run a single QSPI instruction.
-    @param command instruction code
-    @param iframe iframe register value (configured by caller according to command code)
-    @param addr the address to read or write from. If the instruction doesn't require an address, this parameter is meaningless.
-    @param buffer pointer to the data to be written or stored depending on the type is Read or Write
-    @param size the number of bytes to read or write.
-*/
 bool run_instruction(uint8_t command, uint32_t iframe, uint32_t addr, uint8_t *buffer, uint32_t size) {
 
     samd_peripherals_disable_and_clear_cache();
