[ADAPTER] Reload bare core on multitap & dev_mode cfg changes

Author: darthcloud

main/adapter/config.c

@@ -15,6 +15,7 @@
 #include "system/fs.h"
 #include "adapter/gameid.h"
 #include "bluetooth/mon.h"
+#include "system/manager.h"
 
 struct config config;
 struct hw_config hw_config = {
@@ -113,6 +114,7 @@ static uint32_t config_version_magic[] = {
 static uint8_t config_default_combo[BR_COMBO_CNT] = {
     PAD_LM, PAD_RM, PAD_MM, PAD_RB_UP, PAD_RB_LEFT, PAD_RB_RIGHT, PAD_RB_DOWN, PAD_LD_UP, PAD_LD_DOWN, PAD_MS
 };
+static bool config_rst_bare_core = false;
 
 static void config_init_struct(struct config *data);
 static void config_init_nvs_patch(struct config *data);
@@ -384,6 +386,36 @@ static int32_t config_store_on_file(struct config *data, char *filename) {
     return ret;
 }
 
+static bool config_is_rst_required(void) {
+    static uint32_t magic = 0;
+    static uint8_t multitap_cfg = 0;
+    static uint8_t dev_mode[WIRED_MAX_DEV] = {0};
+    bool ret = false;
+
+    if (multitap_cfg != config.global_cfg.multitap_cfg) {
+        ret = true;
+    }
+    multitap_cfg = config.global_cfg.multitap_cfg;
+
+    for (uint32_t i = 0; i < WIRED_MAX_DEV; i++) {
+        if (dev_mode[i] != config.out_cfg[i].dev_mode) {
+            ret = true;
+        }
+        dev_mode[i] = config.out_cfg[i].dev_mode;
+    }
+
+    if (magic != config.magic) {
+        ret = false;
+    }
+    magic = config.magic;
+
+    return ret;
+} 
+
+void IRAM_ATTR config_set_rst_bare_core(bool value) {
+    config_rst_bare_core = value;
+}
+
 void hw_config_patch(void) {
     esp_err_t err;
     nvs_handle_t nvs;
@@ -427,6 +459,10 @@ void config_init(uint32_t src) {
     }
 
     config_load_from_file(&config, filename);
+    if (config_rst_bare_core && config_is_rst_required()) {
+        sys_mgr_cmd(SYS_MGR_CMD_WIRED_RST);
+        printf("# %s: Reloaded wired core cfg: %s\n", __FUNCTION__, filename);
+    }
 }
 
 void config_update(uint32_t dst) {
@@ -442,6 +478,10 @@ void config_update(uint32_t dst) {
     }
 
     config_store_on_file(&config, filename);
+    if (config_rst_bare_core && config_is_rst_required()) {
+        sys_mgr_cmd(SYS_MGR_CMD_WIRED_RST);
+        printf("# %s: Reloaded wired core cfg: %s\n", __FUNCTION__, filename);
+    }
 }
 
 uint32_t config_get_src(void) {

main/adapter/config.h

@@ -101,6 +101,7 @@ struct hw_config {
 extern struct config config;
 extern struct hw_config hw_config;
 
+void config_set_rst_bare_core(bool value);
 void hw_config_patch(void);
 void config_init(uint32_t src);
 void config_update(uint32_t dst);

main/system/manager.c

@@ -570,6 +570,13 @@ void sys_mgr_cmd(uint8_t cmd) {
             printf("# %s cmd_q full!\n", __FUNCTION__);
         }
     }
+    else {
+        printf("# %s cmd_q_hdl NULL!\n", __FUNCTION__);
+        if (cmd == SYS_MGR_CMD_WIRED_RST) {
+            /* For gameid cfg we may need to reset bare core very early */
+            sys_mgr_wired_reset();
+        }
+    }
 }
 
 void sys_mgr_init(uint32_t package) {

main/wired/cdi_uart.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, Jacques Gagnon
+ * Copyright (c) 2021-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -270,6 +270,7 @@ static unsigned isr_dispatch(unsigned cause) {
 void cdi_uart_init(uint32_t package) {
 #if defined (CONFIG_BLUERETRO_SYSTEM_CDI)
     gpio_config_t io_conf = {0};
+    config_set_rst_bare_core(true);
 
     for (uint32_t i = 0; i < CDI_PORT_MAX; i++) {
         struct cdi_ctrl_port *p = &cdi_ctrl_ports[i];

main/wired/jag_io.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -451,6 +451,8 @@ void jag_io_init(uint32_t package) {
     uint8_t inputs[] = {P1_J0_PIN, P1_J1_PIN, P1_J2_PIN, P1_J3_PIN};
     uint8_t outputs[] = {P1_J8_PIN, P1_J9_PIN, P1_J10_PIN, P1_J11_PIN, P1_B0_PIN, P1_B1_PIN};
 
+    config_set_rst_bare_core(true);
+
     /* Inputs */
     io_conf.intr_type = GPIO_INTR_DISABLE;
     io_conf.mode = GPIO_MODE_INPUT;

main/wired/npiso_io.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -570,6 +570,8 @@ void npiso_init(uint32_t package)
 {
     gpio_config_t io_conf = {0};
 
+    config_set_rst_bare_core(true);
+
     if (wired_adapter.system_id == NES) {
         switch (config.global_cfg.multitap_cfg) {
             case MT_SLOT_1:

main/wired/pce_io.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, Jacques Gagnon
+ * Copyright (c) 2021-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -351,6 +351,8 @@ static unsigned pce_kb_oe_isr(unsigned cause) {
 void pce_io_init(uint32_t package) {
     gpio_config_t io_conf = {0};
 
+    config_set_rst_bare_core(true);
+
     /* SEL */
     io_conf.intr_type = GPIO_INTR_DISABLE;
     io_conf.pin_bit_mask = 1ULL << P1_SEL_PIN;

main/wired/ps_spi.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -721,6 +721,8 @@ static unsigned isr_dispatch(unsigned cause) {
 }
 
 void ps_spi_init(uint32_t package) {
+    config_set_rst_bare_core(true);
+
     for (uint32_t i = 0; i < PS_PORT_MAX; i++) {
         memset(ps_ctrl_ports[i].dev_id, 0x41, sizeof(ps_ctrl_ports[0].dev_id));
         memset(ps_ctrl_ports[i].pend_dev_id, 0x41, sizeof(ps_ctrl_ports[0].pend_dev_id));

main/wired/sega_io.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -939,6 +939,8 @@ void sega_io_init(uint32_t package) {
     gpio_config_t io_conf = {0};
     uint8_t port_cnt = 0;
 
+    config_set_rst_bare_core(true);
+
     dev_type[0] = DEV_NONE;
     dev_type[1] = DEV_NONE;
 

main/wired/wii_i2c.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, Jacques Gagnon
+ * Copyright (c) 2019-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -294,6 +294,8 @@ static unsigned isr_dispatch(unsigned cause) {
 
 void wii_i2c_init(uint32_t package) {
 #if defined (CONFIG_BLUERETRO_SYSTEM_WII_EXT) || defined(CONFIG_BLUERETRO_SYSTEM_UNIVERSAL)
+    config_set_rst_bare_core(true);
+
     for (uint32_t i = 0; i < WII_PORT_MAX; i++) {
         struct wii_ctrl_port *p = &wii_ctrl_ports[i];