Remove card_enable_monitoring() and use a mutex instead. The card_enable_monitoring() method actually didn't eliminate the possible race conditions it was meant to fix.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26627 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 16 deletions

diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index 33b995213e..f4c8a4f599 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -270,6 +270,11 @@ static void init_sdi_controller(const int card_no)
     
     /* Card Detect input */
     S3C2440_GPIO_CONFIG (GPGCON, 8, GPIO_INPUT);
+    /* enable external irq 8-23 on the internal interrupt controller */
+    INTMSK &= ~1<<5;
+    /* enable GPG8 IRQ on the external interrupt controller */
+    EINTMASK &= ~(1<<16);
+    
     
     /* Write Protect input */
     S3C2440_GPIO_CONFIG (GPHCON, 8, GPIO_INPUT);
@@ -523,22 +528,6 @@ static int sd1_oneshot_callback(struct timeout *tmo)
     return 0;
 }
 
-void card_enable_monitoring_target(bool on)
-{
-    if (on)
-    {   /* enable external irq 8-23 on the internal interrupt controller */
-        INTMSK &= ~1<<5;
-        /* enable GPG8 IRQ on the external interrupt controller */
-        EINTMASK &= ~(1<<16);
-    }
-    else
-    {
-        /* mask internal and external IRQs */
-        INTMSK |=  1<<5;
-        EINTMASK |= (1<<16);
-    }
-}
-
 void EINT8_23(void)
 {
     static struct timeout sd1_oneshot;