diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-06-06 13:20:47 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-06-06 13:20:47 +0000 |
commit | 9c43b2ce17cbc1f88b825ab8a5021575cee46dd7 (patch) | |
tree | 8d96e95861b3b0df1a7efa6b660395c317ecb475 /firmware/target/arm/as3525/sd-as3525.c | |
parent | 4a2cab6aa1008a4f5ac05dac44c99b7f1a05e8f4 (diff) | |
download | rockbox-9c43b2ce17cbc1f88b825ab8a5021575cee46dd7.tar.gz rockbox-9c43b2ce17cbc1f88b825ab8a5021575cee46dd7.zip |
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
Diffstat (limited to 'firmware/target/arm/as3525/sd-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c index 9c0b4124ac..8aaae55cf4 100644 --- a/firmware/target/arm/as3525/sd-as3525.c +++ b/firmware/target/arm/as3525/sd-as3525.c | |||
@@ -508,6 +508,8 @@ static void init_pl180_controller(const int drive) | |||
508 | GPIOA_IS &= ~EXT_SD_BITS; | 508 | GPIOA_IS &= ~EXT_SD_BITS; |
509 | /* detect both raising and falling edges */ | 509 | /* detect both raising and falling edges */ |
510 | GPIOA_IBE |= EXT_SD_BITS; | 510 | GPIOA_IBE |= EXT_SD_BITS; |
511 | /* enable the card detect interrupt */ | ||
512 | GPIOA_IE |= EXT_SD_BITS; | ||
511 | 513 | ||
512 | #else | 514 | #else |
513 | VIC_INT_ENABLE = INTERRUPT_NAND; | 515 | VIC_INT_ENABLE = INTERRUPT_NAND; |
@@ -922,16 +924,6 @@ tCardInfo *card_get_info_target(int card_no) | |||
922 | return &card_info[card_no]; | 924 | return &card_info[card_no]; |
923 | } | 925 | } |
924 | 926 | ||
925 | #ifdef HAVE_HOTSWAP | ||
926 | void card_enable_monitoring_target(bool on) | ||
927 | { | ||
928 | if (on) /* enable interrupt */ | ||
929 | GPIOA_IE |= EXT_SD_BITS; | ||
930 | else /* disable interrupt */ | ||
931 | GPIOA_IE &= ~EXT_SD_BITS; | ||
932 | } | ||
933 | #endif /* HAVE_HOTSWAP */ | ||
934 | |||
935 | #endif /* !BOOTLOADER */ | 927 | #endif /* !BOOTLOADER */ |
936 | 928 | ||
937 | #ifdef CONFIG_STORAGE_MULTI | 929 | #ifdef CONFIG_STORAGE_MULTI |