3 files changed, 11 insertions, 4 deletions

diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index 8c7ebcddc7..e4ab922f24 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -18,9 +18,7 @@
  ****************************************************************************/
 #include "fat.h"
 #include "hotswap.h"
-#ifdef BOOTLOADER
 #include "ata-sd-target.h"
-#endif
 #include "ata_idle_notify.h"
 #include "system.h"
 #include <string.h>
@@ -1278,16 +1276,20 @@ tCardInfo *card_get_info_target(int card_no)
     return &card;
 }
 
-#ifdef HAVE_HOTSWAP
 bool card_detect_target(void)
 {
+#ifdef HAVE_HOTSWAP
 #ifdef SANSA_E200
     return (GPIOA_INPUT_VAL & 0x80) == 0; /* low active */
 #elif defined SANSA_C200
     return (GPIOL_INPUT_VAL & 0x08) != 0; /* high active */
 #endif
+#else
+    return false;
+#endif
 }
 
+#ifdef HAVE_HOTSWAP
 static bool sd1_oneshot_callback(struct timeout *tmo)
 {
     (void)tmo;
diff --git a/firmware/target/arm/ata-sd-target.h b/firmware/target/arm/ata-sd-target.h
index dce2ca9030..33106156cc 100644
--- a/firmware/target/arm/ata-sd-target.h
+++ b/firmware/target/arm/ata-sd-target.h
@@ -40,6 +40,9 @@ typedef struct
 
 tCardInfo *card_get_info_target(int card_no);
 bool       card_detect_target(void);
+
+#ifdef HAVE_HOTSWAP
 void       card_enable_monitoring_target(bool on);
+#endif
 
 #endif
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 9b335fe223..4e3f2c0cf0 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -54,17 +54,19 @@ void irq(void)
         else if (CPU_HI_INT_STAT & I2C_MASK)
             ipod_4g_button_int();
 #elif defined(SANSA_E200)
+#ifdef HAVE_HOTSWAP
         else if (CPU_HI_INT_STAT & GPIO0_MASK) {
             if (GPIOA_INT_STAT & 0x80)
                 microsd_int();
         }
+#endif
         else if (CPU_HI_INT_STAT & GPIO1_MASK) {
             if (GPIOF_INT_STAT & 0xff)
                 button_int();
             if (GPIOH_INT_STAT & 0xc0)
                 clickwheel_int();
         }
-#elif defined(SANSA_C200)
+#elif defined(SANSA_C200) && defined(HAVE_HOTSWAP)
         else if (CPU_HI_INT_STAT & GPIO2_MASK) {
             if (GPIOL_INT_STAT & 0x08)
                 microsd_int();