summaryrefslogtreecommitdiff
path: root/firmware/target
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2008-12-04 21:55:09 +0000
committerRafaël Carré <rafael.carre@gmail.com>2008-12-04 21:55:09 +0000
commit8e19a739bef0114d6a0367b5239890eff6203156 (patch)
treeaa286c785dd76551085336910881a4e4daa4e25c /firmware/target
parent9f76f23ca52ec48b5a006d74a7d424956a277ed3 (diff)
downloadrockbox-8e19a739bef0114d6a0367b5239890eff6203156.tar.gz
rockbox-8e19a739bef0114d6a0367b5239890eff6203156.zip
Sansa AMS SD driver: don't check non fatal flags of MCI_STATUS
Correct the logic when enabling interrupt line (multivolume) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19337 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/arm/as3525/ata_sd_as3525.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 3ec1892542..b71941adad 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -393,14 +393,15 @@ static void init_pl180_controller(const int drive)
393 MCI_COMMAND(drive) = MCI_DATA_CTRL(drive) = 0; 393 MCI_COMMAND(drive) = MCI_DATA_CTRL(drive) = 0;
394 MCI_CLEAR(drive) = 0x7ff; 394 MCI_CLEAR(drive) = 0x7ff;
395 395
396 MCI_MASK0(drive) = MCI_MASK1(drive) = MCI_DATA_CRC_FAIL | MCI_DATA_TIMEOUT | 396 MCI_MASK0(drive) = MCI_MASK1(drive) =
397 MCI_RX_OVERRUN | MCI_TX_UNDERRUN | MCI_RX_FIFO_FULL | MCI_TX_FIFO_EMPTY; 397 MCI_DATA_CRC_FAIL | MCI_DATA_TIMEOUT | MCI_RX_OVERRUN | MCI_TX_UNDERRUN;
398 398
399 VIC_INT_ENABLE |= INTERRUPT_NAND
400#ifdef HAVE_MULTIVOLUME 399#ifdef HAVE_MULTIVOLUME
401 | INTERRUPT_MCI0 400 VIC_INT_ENABLE |=
401 (drive == INTERNAL_AS3525) ? INTERRUPT_NAND : INTERRUPT_MCI0;
402#else
403 VIC_INT_ENABLE |= INTERRUPT_NAND;
402#endif 404#endif
403 ;
404 405
405 MCI_POWER(drive) = MCI_POWER_UP|(10 /*voltage*/ << 2); /* use OF voltage */ 406 MCI_POWER(drive) = MCI_POWER_UP|(10 /*voltage*/ << 2); /* use OF voltage */
406 mci_delay(); 407 mci_delay();