fnSystem: fix SD card detect for non Atari platforms

mozzwald · mozzwald · commit 09b7339e9fd0 · 2024-11-19T16:03:09.000-06:00
diff --git a/include/pinmap/a2_d32pro.h b/include/pinmap/a2_d32pro.h
@@ -4,7 +4,7 @@
 // pins 12-15 are used to interface with the JTAG debugger
 // so leave them alone if we're using JTAG
 #ifndef JTAG
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #endif
 
diff --git a/include/pinmap/a2_rev0.h b/include/pinmap/a2_rev0.h
@@ -2,7 +2,7 @@
 #ifdef PINMAP_A2_REV0
 
 /* SD Card */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5 //fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/include/pinmap/adamv1.h b/include/pinmap/adamv1.h
@@ -2,7 +2,7 @@
 #ifdef PINMAP_ADAMV1
 
 /* SD Card */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5 //fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/include/pinmap/coco_cart.h b/include/pinmap/coco_cart.h
@@ -2,7 +2,7 @@
 #ifdef PINMAP_COCO_CART
 
 /* SD Card - fnFsSD.cpp */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5  // fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/include/pinmap/coco_devkitc.h b/include/pinmap/coco_devkitc.h
@@ -2,7 +2,7 @@
 #ifdef PINMAP_COCO_DEVKITC
 
 /* SD Card - fnFsSD.cpp */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5  // fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/include/pinmap/fujiapple-iec.h b/include/pinmap/fujiapple-iec.h
@@ -4,7 +4,7 @@
 #ifdef PINMAP_FUJIAPPLE_IEC
 
 /* SD Card */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5  // fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/include/pinmap/iec-d32pro.h b/include/pinmap/iec-d32pro.h
@@ -8,7 +8,7 @@
 // pins 12-15 are used to interface with the JTAG debugger
 // so leave them alone if we're using JTAG
 #ifndef JTAG
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #endif
 
diff --git a/include/pinmap/iec-nugget.h b/include/pinmap/iec-nugget.h
@@ -7,7 +7,7 @@
 // pins 12-15 are used to interface with the JTAG debugger
 // so leave them alone if we're using JTAG
 #ifndef JTAG
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #endif
 
diff --git a/include/pinmap/lynx.h b/include/pinmap/lynx.h
@@ -2,7 +2,7 @@
 #ifdef PINMAP_LYNX
 
 /* SD Card */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5  // fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/include/pinmap/rs232_rev0.h b/include/pinmap/rs232_rev0.h
@@ -2,7 +2,7 @@
 #ifdef PINMAP_RS232_REV0
 
 /* SD Card - fnFsSD.cpp */
-#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT         GPIO_NUM_15 // fnSystem.h
 #define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
 #define PIN_SD_HOST_CS          GPIO_NUM_5  // fnFsSD.cpp
 #define PIN_SD_HOST_MISO        GPIO_NUM_19
diff --git a/lib/hardware/fnSystem.cpp b/lib/hardware/fnSystem.cpp
@@ -93,7 +93,6 @@
 
 
 #ifdef ESP_PLATFORM
-#if defined(BUILD_ATARI) || defined(PINMAP_ESP32S3)
 static QueueHandle_t card_detect_evt_queue = NULL;
 
 static void IRAM_ATTR card_detect_isr_handler(void *arg)
@@ -142,8 +141,6 @@ static void setup_card_detect(gpio_num_t pin)
     // Add the card detect handler
     gpio_isr_handler_add(pin, card_detect_isr_handler, (void *)pin);
 }
-#endif // PINMAP_ESP32S3
-
 // ESP_PLATFORM
 #else
 // !ESP_PLATFORM
@@ -1221,12 +1218,14 @@ void SystemManager::check_hardware_ver()
     a2no3state = true;
     Debug_printf("FujiApple NO3STATE force enabled\r\n");
 #   endif
+    setup_card_detect((gpio_num_t)PIN_CARD_DETECT); // enable SD card detect
 #elif defined(BUILD_MAC)
 /*  Mac 68k
     Only Rev0
 */
     _hardware_version = 1;
     safe_reset_gpio = PIN_BUTTON_C;
+    setup_card_detect((gpio_num_t)PIN_CARD_DETECT); // enable SD card detect
 #elif defined(BUILD_IEC)
     /*  Commodore
     */
@@ -1243,6 +1242,7 @@ void SystemManager::check_hardware_ver()
     /* No Safe Reset */
     _hardware_version = 3;
 #   endif
+    setup_card_detect((gpio_num_t)PIN_CARD_DETECT); // enable SD card detect
 #elif defined(BUILD_LYNX)
     /* Atari Lynx
     */
@@ -1252,11 +1252,13 @@ void SystemManager::check_hardware_ver()
     _hardware_version = 1;
     safe_reset_gpio = PIN_BUTTON_C;
 #   endif
+    setup_card_detect((gpio_num_t)PIN_CARD_DETECT); // enable SD card detect
 #elif defined(BUILD_RS232)
     /* RS232
     */
     _hardware_version = 1;
     safe_reset_gpio = PIN_BUTTON_C;
+    setup_card_detect((gpio_num_t)PIN_CARD_DETECT); // enable SD card detect
 #elif defined(BUILD_RC2014)
     /* RC2014
     */
@@ -1267,6 +1269,7 @@ void SystemManager::check_hardware_ver()
     */
     _hardware_version = 1;
     safe_reset_gpio = PIN_BUTTON_C;
+    setup_card_detect((gpio_num_t)PIN_CARD_DETECT); // enable SD card detect
 #endif /* BUILD_COCO */
 
 #else
