diff options
author | Jack Halpin <jack.halpin@gmail.com> | 2010-03-24 02:48:38 +0000 |
---|---|---|
committer | Jack Halpin <jack.halpin@gmail.com> | 2010-03-24 02:48:38 +0000 |
commit | 66f011e8c14a416a167e293dc91767ae6eda818c (patch) | |
tree | fbe02a294097595c20c1a09a48d45efd326aa4af /firmware/target/arm/as3525/sd-as3525v2.c | |
parent | 56199d3dfba2c2454c1226fac5d98e84ecf11cd1 (diff) | |
download | rockbox-66f011e8c14a416a167e293dc91767ae6eda818c.tar.gz rockbox-66f011e8c14a416a167e293dc91767ae6eda818c.zip |
sd-as3525v2.c Adjust comments for MCI_INT bits to show if they are related to CMD, DATA, or a termination signal.
Adjust the initial MCI_MASK value to also mask the MCI_INT_RXDR and MCI_INT_TXDR bits as it seems we don't use them for dma transfers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25314 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sd-as3525v2.c')
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525v2.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 250dfca784..1546bcbd30 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c | |||
@@ -157,23 +157,23 @@ | |||
157 | #define MCI_RAW_STATUS SD_REG(0x44) /* raw interrupt status, also used as | 157 | #define MCI_RAW_STATUS SD_REG(0x44) /* raw interrupt status, also used as |
158 | * status clear */ | 158 | * status clear */ |
159 | 159 | ||
160 | /* interrupt bits */ | 160 | /* interrupt bits */ /* C D E (Cmd) (Data) (End) */ |
161 | #define MCI_INT_CRDDET (1<<0) /* card detect */ | 161 | #define MCI_INT_CRDDET (1<<0) /* card detect */ |
162 | #define MCI_INT_RE (1<<1) /* response error */ | 162 | #define MCI_INT_RE (1<<1) /* x response error */ |
163 | #define MCI_INT_CD (1<<2) /* command done */ | 163 | #define MCI_INT_CD (1<<2) /* x command done */ |
164 | #define MCI_INT_DTO (1<<3) /* data transfer over */ | 164 | #define MCI_INT_DTO (1<<3) /* x data transfer over */ |
165 | #define MCI_INT_TXDR (1<<4) /* tx fifo data request */ | 165 | #define MCI_INT_TXDR (1<<4) /* tx fifo data request */ |
166 | #define MCI_INT_RXDR (1<<5) /* rx fifo data request */ | 166 | #define MCI_INT_RXDR (1<<5) /* rx fifo data request */ |
167 | #define MCI_INT_RCRC (1<<6) /* response crc error */ | 167 | #define MCI_INT_RCRC (1<<6) /* x response crc error */ |
168 | #define MCI_INT_DCRC (1<<7) /* data crc error */ | 168 | #define MCI_INT_DCRC (1<<7) /* x data crc error */ |
169 | #define MCI_INT_RTO (1<<8) /* response timeout */ | 169 | #define MCI_INT_RTO (1<<8) /* x response timeout */ |
170 | #define MCI_INT_DRTO (1<<9) /* data read timeout */ | 170 | #define MCI_INT_DRTO (1<<9) /* x data read timeout */ |
171 | #define MCI_INT_HTO (1<<10) /* data starv timeout */ | 171 | #define MCI_INT_HTO (1<<10) /* x data starv timeout */ |
172 | #define MCI_INT_FRUN (1<<11) /* fifo over/underrun */ | 172 | #define MCI_INT_FRUN (1<<11) /* x fifo over/underrun */ |
173 | #define MCI_INT_HLE (1<<12) /* hw locked while error */ | 173 | #define MCI_INT_HLE (1<<12) /* x x hw locked while error */ |
174 | #define MCI_INT_SBE (1<<13) /* start bit error */ | 174 | #define MCI_INT_SBE (1<<13) /* x start bit error */ |
175 | #define MCI_INT_ACD (1<<14) /* auto command done */ | 175 | #define MCI_INT_ACD (1<<14) /* auto command done */ |
176 | #define MCI_INT_EBE (1<<15) /* end bit error */ | 176 | #define MCI_INT_EBE (1<<15) /* x end bit error */ |
177 | #define MCI_INT_SDIO (0xf<<16) | 177 | #define MCI_INT_SDIO (0xf<<16) |
178 | 178 | ||
179 | /* | 179 | /* |
@@ -631,7 +631,7 @@ static void init_controller(void) | |||
631 | MCI_FIFOTH &= MCI_FIFOTH_MASK; | 631 | MCI_FIFOTH &= MCI_FIFOTH_MASK; |
632 | MCI_FIFOTH |= 0x503f0080; | 632 | MCI_FIFOTH |= 0x503f0080; |
633 | 633 | ||
634 | MCI_MASK = 0xffffffff & ~(MCI_INT_ACD|MCI_INT_CRDDET); | 634 | MCI_MASK = 0xffff & ~(MCI_INT_ACD|MCI_INT_CRDDET|MCI_INT_RXDR|MCI_INT_TXDR); |
635 | 635 | ||
636 | GPIOB_DIR |= (1<<5); /* Pin B5 output */ | 636 | GPIOB_DIR |= (1<<5); /* Pin B5 output */ |
637 | 637 | ||