[MC] Report memory card only after RAM is init

Author: darthcloud

main/adapter/memory_card.c

@@ -22,6 +22,7 @@ SOC_RESERVE_MEMORY_REGION(0x3FFE7D98, 0x3FFE7E28, bad_region);
 static uint8_t *mc_buffer[MC_BUFFER_BLOCK_CNT] = {0};
 static esp_timer_handle_t mc_timer_hdl = NULL;
 static int32_t mc_block_state = 0;
+static bool mc_ready = false;
 
 static int32_t mc_restore(void);
 static int32_t mc_store(void);
@@ -157,6 +158,10 @@ int32_t mc_init(void) {
         ret = mc_restore();
     }
 
+    if (ret == 0) {
+        mc_ready = true;
+    }
+
     return ret;
 }
 
@@ -192,3 +197,7 @@ uint8_t IRAM_ATTR *mc_get_ptr(uint32_t addr) {
 uint32_t IRAM_ATTR mc_get_state(void) {
     return mc_block_state;
 }
+
+bool IRAM_ATTR mc_get_ready(void) {
+    return mc_ready;
+}

main/adapter/memory_card.h

@@ -18,5 +18,6 @@ void mc_read(uint32_t addr, uint8_t *data, uint32_t size);
 void mc_write(uint32_t addr, uint8_t *data, uint32_t size);
 uint8_t *mc_get_ptr(uint32_t addr);
 uint32_t mc_get_state(void);
+bool mc_get_ready(void);
 
 #endif /* _MEMORY_CARD_H_ */

main/wired/maple.c

@@ -451,7 +451,7 @@ static unsigned maple_rx(unsigned cause) {
                         if (config.out_cfg[port].acc_mode & ACC_RUMBLE) {
                             pkt.src |= ADDR_RUMBLE;
                         }
-                        if (config.out_cfg[port].acc_mode & ACC_MEM) {
+                        if (config.out_cfg[port].acc_mode & ACC_MEM && mc_get_ready()) {
                             pkt.src |= ADDR_MEM;
                         }
                         pkt.dst = dst;