diff options
Diffstat (limited to 'firmware/target/arm/as3525/ata_sd_as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/ata_sd_as3525.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 2b8578ff59..3dea237a5d 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "config.h" /* for HAVE_MULTIVOLUME */ | 24 | #include "config.h" /* for HAVE_MULTIVOLUME */ |
25 | 25 | ||
26 | #include "as3525.h" | 26 | #include "as3525.h" |
27 | #include "mmci.h" | 27 | #include "pl180.h" |
28 | #include "panic.h" | 28 | #include "panic.h" |
29 | #include "stdbool.h" | 29 | #include "stdbool.h" |
30 | #include "ata.h" | 30 | #include "ata.h" |
@@ -87,7 +87,7 @@ static void mci_set_clock_divider(const int drive, int divider) | |||
87 | if(divider > 1) | 87 | if(divider > 1) |
88 | { | 88 | { |
89 | /* use divide logic */ | 89 | /* use divide logic */ |
90 | clock &= ~MCI_CLK_BYPASS; | 90 | clock &= ~MCI_CLOCK_BYPASS; |
91 | 91 | ||
92 | /* convert divider to MMC_CLOCK logic */ | 92 | /* convert divider to MMC_CLOCK logic */ |
93 | divider = (divider/2) - 1; | 93 | divider = (divider/2) - 1; |
@@ -97,7 +97,7 @@ static void mci_set_clock_divider(const int drive, int divider) | |||
97 | else | 97 | else |
98 | { | 98 | { |
99 | /* bypass dividing logic */ | 99 | /* bypass dividing logic */ |
100 | clock |= MCI_CLK_BYPASS; | 100 | clock |= MCI_CLOCK_BYPASS; |
101 | divider = 0; | 101 | divider = 0; |
102 | } | 102 | } |
103 | 103 | ||
@@ -110,20 +110,20 @@ static int send_cmd(const int drive, struct mmc_command *cmd) | |||
110 | { | 110 | { |
111 | int val, status; | 111 | int val, status; |
112 | 112 | ||
113 | while(MMC_STATUS(drive) & MCI_CMDACTIVE); /* useless */ | 113 | while(MMC_STATUS(drive) & MCI_CMD_ACTIVE); /* useless */ |
114 | 114 | ||
115 | if(MMC_COMMAND(drive) & MCI_CPSM_ENABLE) /* clears existing command */ | 115 | if(MMC_COMMAND(drive) & MCI_COMMAND_ENABLE) /* clears existing command */ |
116 | { | 116 | { |
117 | MMC_COMMAND(drive) = 0; | 117 | MMC_COMMAND(drive) = 0; |
118 | mci_delay(); | 118 | mci_delay(); |
119 | } | 119 | } |
120 | 120 | ||
121 | val = cmd->cmd | MCI_CPSM_ENABLE; | 121 | val = cmd->cmd | MCI_COMMAND_ENABLE; |
122 | if(cmd->flags & MMC_RESP) | 122 | if(cmd->flags & MMC_RESP) |
123 | { | 123 | { |
124 | val |= MCI_CPSM_RESPONSE; | 124 | val |= MCI_COMMAND_RESPONSE; |
125 | if(cmd->flags & MMC_LONG_RESP) | 125 | if(cmd->flags & MMC_LONG_RESP) |
126 | val |= MCI_CPSM_LONGRSP; | 126 | val |= MCI_COMMAND_LONG_RESPONSE; |
127 | } | 127 | } |
128 | 128 | ||
129 | MMC_CLEAR(drive) = 0x7ff; | 129 | MMC_CLEAR(drive) = 0x7ff; |
@@ -131,7 +131,7 @@ static int send_cmd(const int drive, struct mmc_command *cmd) | |||
131 | MMC_ARGUMENT(drive) = (cmd->flags & MMC_ARG) ? cmd->arg : 0; | 131 | MMC_ARGUMENT(drive) = (cmd->flags & MMC_ARG) ? cmd->arg : 0; |
132 | MMC_COMMAND(drive) = val; | 132 | MMC_COMMAND(drive) = val; |
133 | 133 | ||
134 | while(MMC_STATUS(drive) & MCI_CMDACTIVE); | 134 | while(MMC_STATUS(drive) & MCI_CMD_ACTIVE); |
135 | 135 | ||
136 | MMC_COMMAND(drive) = 0; | 136 | MMC_COMMAND(drive) = 0; |
137 | MMC_ARGUMENT(drive) = ~0; | 137 | MMC_ARGUMENT(drive) = ~0; |
@@ -141,13 +141,13 @@ static int send_cmd(const int drive, struct mmc_command *cmd) | |||
141 | status = MMC_STATUS(drive); | 141 | status = MMC_STATUS(drive); |
142 | if(cmd->flags & MMC_RESP) | 142 | if(cmd->flags & MMC_RESP) |
143 | { | 143 | { |
144 | if(status & MCI_CMDTIMEOUT) | 144 | if(status & MCI_CMD_TIMEOUT) |
145 | { | 145 | { |
146 | if(cmd->cmd == SEND_IF_COND) | 146 | if(cmd->cmd == SEND_IF_COND) |
147 | break; /* SDHC test can fail */ | 147 | break; /* SDHC test can fail */ |
148 | panicf("Response timeout"); | 148 | panicf("Response timeout"); |
149 | } | 149 | } |
150 | else if(status & (MCI_CMDCRCFAIL|MCI_CMDRESPEND)) | 150 | else if(status & (MCI_CMD_CRC_FAIL|MCI_CMD_RESP_END)) |
151 | { /* resp received */ | 151 | { /* resp received */ |
152 | cmd->resp[0] = MMC_RESP0(drive); | 152 | cmd->resp[0] = MMC_RESP0(drive); |
153 | if(cmd->flags & MMC_LONG_RESP) | 153 | if(cmd->flags & MMC_LONG_RESP) |
@@ -160,7 +160,7 @@ static int send_cmd(const int drive, struct mmc_command *cmd) | |||
160 | } | 160 | } |
161 | } | 161 | } |
162 | else | 162 | else |
163 | if(status & MCI_CMDSENT) | 163 | if(status & MCI_CMD_SENT) |
164 | break; | 164 | break; |
165 | 165 | ||
166 | } while(1); | 166 | } while(1); |
@@ -183,7 +183,7 @@ static void sd_init_card(const int drive) | |||
183 | cmd_idle.cmd = GO_IDLE_STATE; | 183 | cmd_idle.cmd = GO_IDLE_STATE; |
184 | cmd_idle.arg = 0; | 184 | cmd_idle.arg = 0; |
185 | cmd_idle.flags = MMC_NO_FLAGS; | 185 | cmd_idle.flags = MMC_NO_FLAGS; |
186 | if(send_cmd(drive, &cmd_idle) != MCI_CMDSENT) | 186 | if(send_cmd(drive, &cmd_idle) != MCI_CMD_SENT) |
187 | panicf("goto idle failed!"); | 187 | panicf("goto idle failed!"); |
188 | #ifdef DEBUG | 188 | #ifdef DEBUG |
189 | else | 189 | else |
@@ -209,7 +209,7 @@ static void sd_init_card(const int drive) | |||
209 | 209 | ||
210 | sdhc = false; | 210 | sdhc = false; |
211 | status = send_cmd(drive, &cmd_if_cond); | 211 | status = send_cmd(drive, &cmd_if_cond); |
212 | if(status & (MCI_CMDCRCFAIL|MCI_CMDRESPEND)) | 212 | if(status & (MCI_CMD_CRC_FAIL|MCI_CMD_RESP_END)) |
213 | { | 213 | { |
214 | if((cmd_if_cond.resp[0] & 0xFFF) == cmd_if_cond.arg) | 214 | if((cmd_if_cond.resp[0] & 0xFFF) == cmd_if_cond.arg) |
215 | sdhc = true; | 215 | sdhc = true; |
@@ -240,7 +240,7 @@ static void sd_init_card(const int drive) | |||
240 | #endif | 240 | #endif |
241 | /* app_cmd */ | 241 | /* app_cmd */ |
242 | status = send_cmd(drive, &cmd_app); | 242 | status = send_cmd(drive, &cmd_app); |
243 | if( !(status & (MCI_CMDCRCFAIL|MCI_CMDRESPEND)) || | 243 | if( !(status & (MCI_CMD_CRC_FAIL|MCI_CMD_RESP_END)) || |
244 | !(cmd_app.resp[0] & (1<<5)) ) | 244 | !(cmd_app.resp[0] & (1<<5)) ) |
245 | { | 245 | { |
246 | panicf("app_cmd failed"); | 246 | panicf("app_cmd failed"); |
@@ -248,7 +248,7 @@ static void sd_init_card(const int drive) | |||
248 | 248 | ||
249 | cmd_op_cond.arg = sdhc ? 0x40FF8000 : (8<<0x14); /* ocr */ | 249 | cmd_op_cond.arg = sdhc ? 0x40FF8000 : (8<<0x14); /* ocr */ |
250 | status = send_cmd(drive, &cmd_op_cond); | 250 | status = send_cmd(drive, &cmd_op_cond); |
251 | if(!(status & (MCI_CMDCRCFAIL|MCI_CMDRESPEND))) | 251 | if(!(status & (MCI_CMD_CRC_FAIL|MCI_CMD_RESP_END))) |
252 | panicf("cmd_op_cond failed"); | 252 | panicf("cmd_op_cond failed"); |
253 | 253 | ||
254 | #ifdef DEBUG | 254 | #ifdef DEBUG |
@@ -268,16 +268,16 @@ static void init_pl180_controller(const int drive) | |||
268 | 268 | ||
269 | MMC_MASK0(drive) = MMC_MASK1(drive) = 0; /* disable all interrupts */ | 269 | MMC_MASK0(drive) = MMC_MASK1(drive) = 0; /* disable all interrupts */ |
270 | 270 | ||
271 | MMC_POWER(drive) = MCI_PWR_UP | (10 /*voltage*/ << 2); /* use OF voltage */ | 271 | MMC_POWER(drive) = MCI_POWER_UP|(10 /*voltage*/ << 2); /* use OF voltage */ |
272 | mci_delay(); | 272 | mci_delay(); |
273 | 273 | ||
274 | MMC_POWER(drive) |= MCI_PWR_ON; | 274 | MMC_POWER(drive) |= MCI_POWER_ON; |
275 | mci_delay(); | 275 | mci_delay(); |
276 | 276 | ||
277 | MMC_SELECT(drive) = 0; | 277 | MMC_SELECT(drive) = 0; |
278 | 278 | ||
279 | MMC_CLOCK(drive) = MCI_CLK_ENABLE; | 279 | MMC_CLOCK(drive) = MCI_CLOCK_ENABLE; |
280 | MMC_CLOCK(drive) &= ~MCI_CLK_PWRSAVE; | 280 | MMC_CLOCK(drive) &= ~MCI_CLOCK_POWERSAVE; |
281 | 281 | ||
282 | /* set MCLK divider */ | 282 | /* set MCLK divider */ |
283 | mci_set_clock_divider(drive, 200); | 283 | mci_set_clock_divider(drive, 200); |