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/tcc780x/sd-tcc780x.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/tcc780x/sd-tcc780x.c')
-rw-r--r-- | firmware/target/arm/tcc780x/sd-tcc780x.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c index bfab9fdddd..88ccf187f0 100644 --- a/firmware/target/arm/tcc780x/sd-tcc780x.c +++ b/firmware/target/arm/tcc780x/sd-tcc780x.c | |||
@@ -214,18 +214,6 @@ static inline bool card_detect_target(void) | |||
214 | #endif | 214 | #endif |
215 | } | 215 | } |
216 | 216 | ||
217 | void card_enable_monitoring_target(bool on) | ||
218 | { | ||
219 | if (on) | ||
220 | { | ||
221 | IEN |= EXT0_IRQ_MASK; | ||
222 | } | ||
223 | else | ||
224 | { | ||
225 | IEN &= ~EXT0_IRQ_MASK; | ||
226 | } | ||
227 | } | ||
228 | |||
229 | static int sd1_oneshot_callback(struct timeout *tmo) | 217 | static int sd1_oneshot_callback(struct timeout *tmo) |
230 | { | 218 | { |
231 | (void)tmo; | 219 | (void)tmo; |
@@ -786,6 +774,7 @@ int sd_init(void) | |||
786 | /* Configure interrupts for the card slot */ | 774 | /* Configure interrupts for the card slot */ |
787 | TMODE &= ~EXT0_IRQ_MASK; /* edge-triggered */ | 775 | TMODE &= ~EXT0_IRQ_MASK; /* edge-triggered */ |
788 | TMODEA |= EXT0_IRQ_MASK; /* trigger on both edges */ | 776 | TMODEA |= EXT0_IRQ_MASK; /* trigger on both edges */ |
777 | IEN |= EXT0_IRQ_MASK; /* enable the interrupt */ | ||
789 | #endif | 778 | #endif |
790 | } | 779 | } |
791 | 780 | ||