diff options
Diffstat (limited to 'firmware/target/arm/as3525/ata_sd_as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/ata_sd_as3525.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 26208cc6f6..8383232301 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c | |||
@@ -191,13 +191,13 @@ static int sd_init_card(const int drive) | |||
191 | int max_tries = 100; /* max acmd41 attemps */ | 191 | int max_tries = 100; /* max acmd41 attemps */ |
192 | bool sdhc; | 192 | bool sdhc; |
193 | 193 | ||
194 | if(!send_cmd(drive, GO_IDLE_STATE, 0, MMC_NO_FLAGS, NULL)) | 194 | if(!send_cmd(drive, SD_GO_IDLE_STATE, 0, MMC_NO_FLAGS, NULL)) |
195 | return -1; | 195 | return -1; |
196 | 196 | ||
197 | mci_delay(); | 197 | mci_delay(); |
198 | 198 | ||
199 | sdhc = false; | 199 | sdhc = false; |
200 | if(send_cmd(drive, SEND_IF_COND, 0x1AA, MMC_RESP|MMC_ARG, &response)) | 200 | if(send_cmd(drive, SD_SEND_IF_COND, 0x1AA, MMC_RESP|MMC_ARG, &response)) |
201 | if((response & 0xFFF) == 0x1AA) | 201 | if((response & 0xFFF) == 0x1AA) |
202 | sdhc = true; | 202 | sdhc = true; |
203 | 203 | ||
@@ -205,7 +205,7 @@ static int sd_init_card(const int drive) | |||
205 | mci_delay(); | 205 | mci_delay(); |
206 | 206 | ||
207 | /* app_cmd */ | 207 | /* app_cmd */ |
208 | if( !send_cmd(drive, APP_CMD, 0, MMC_RESP|MMC_ARG, &response) || | 208 | if( !send_cmd(drive, SD_APP_CMD, 0, MMC_RESP|MMC_ARG, &response) || |
209 | !(response & (1<<5)) ) | 209 | !(response & (1<<5)) ) |
210 | { | 210 | { |
211 | return -2; | 211 | return -2; |
@@ -222,17 +222,17 @@ static int sd_init_card(const int drive) | |||
222 | return -4; | 222 | return -4; |
223 | 223 | ||
224 | /* send CID */ | 224 | /* send CID */ |
225 | if(!send_cmd(drive, ALL_SEND_CID, 0, MMC_RESP|MMC_LONG_RESP|MMC_ARG, | 225 | if(!send_cmd(drive, SD_ALL_SEND_CID, 0, MMC_RESP|MMC_LONG_RESP|MMC_ARG, |
226 | card_info[drive].cid)) | 226 | card_info[drive].cid)) |
227 | return -5; | 227 | return -5; |
228 | 228 | ||
229 | /* send RCA */ | 229 | /* send RCA */ |
230 | if(!send_cmd(drive, SEND_RELATIVE_ADDR, 0, MMC_RESP|MMC_ARG, | 230 | if(!send_cmd(drive, SD_SEND_RELATIVE_ADDR, 0, MMC_RESP|MMC_ARG, |
231 | &card_info[drive].rca)) | 231 | &card_info[drive].rca)) |
232 | return -6; | 232 | return -6; |
233 | 233 | ||
234 | /* send CSD */ | 234 | /* send CSD */ |
235 | if(!send_cmd(drive, SEND_CSD, card_info[drive].rca, | 235 | if(!send_cmd(drive, SD_SEND_CSD, card_info[drive].rca, |
236 | MMC_RESP|MMC_LONG_RESP|MMC_ARG, card_info[drive].csd)) | 236 | MMC_RESP|MMC_LONG_RESP|MMC_ARG, card_info[drive].csd)) |
237 | return -7; | 237 | return -7; |
238 | 238 | ||
@@ -259,16 +259,16 @@ static int sd_init_card(const int drive) | |||
259 | } | 259 | } |
260 | #endif | 260 | #endif |
261 | 261 | ||
262 | if(!send_cmd(drive, SELECT_CARD, card_info[drive].rca, MMC_ARG, NULL)) | 262 | if(!send_cmd(drive, SD_SELECT_CARD, card_info[drive].rca, MMC_ARG, NULL)) |
263 | return -9; | 263 | return -9; |
264 | 264 | ||
265 | if(!send_cmd(drive, APP_CMD, card_info[drive].rca, MMC_ARG, NULL)) | 265 | if(!send_cmd(drive, SD_APP_CMD, card_info[drive].rca, MMC_ARG, NULL)) |
266 | return -10; | 266 | return -10; |
267 | 267 | ||
268 | if(!send_cmd(drive, SET_BUS_WIDTH, card_info[drive].rca | 2, MMC_ARG, NULL)) | 268 | if(!send_cmd(drive, SD_SET_BUS_WIDTH, card_info[drive].rca | 2, MMC_ARG, NULL)) |
269 | return -11; | 269 | return -11; |
270 | 270 | ||
271 | if(!send_cmd(drive, SET_BLOCKLEN, card_info[drive].block_size, MMC_ARG, | 271 | if(!send_cmd(drive, SD_SET_BLOCKLEN, card_info[drive].block_size, MMC_ARG, |
272 | NULL)) | 272 | NULL)) |
273 | return -12; | 273 | return -12; |
274 | 274 | ||
@@ -490,7 +490,7 @@ static int sd_wait_for_state(const int drive, unsigned int state) | |||
490 | { | 490 | { |
491 | long us; | 491 | long us; |
492 | 492 | ||
493 | if(!send_cmd(drive, SEND_STATUS, card_info[drive].rca, | 493 | if(!send_cmd(drive, SD_SEND_STATUS, card_info[drive].rca, |
494 | MMC_RESP|MMC_ARG, &response)) | 494 | MMC_RESP|MMC_ARG, &response)) |
495 | return -1; | 495 | return -1; |
496 | 496 | ||
@@ -544,7 +544,7 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int incount, | |||
544 | 544 | ||
545 | last_disk_activity = current_tick; | 545 | last_disk_activity = current_tick; |
546 | 546 | ||
547 | ret = sd_wait_for_state(drive, TRAN); | 547 | ret = sd_wait_for_state(drive, SD_TRAN); |
548 | if (ret < 0) | 548 | if (ret < 0) |
549 | goto sd_read_error; | 549 | goto sd_read_error; |
550 | 550 | ||
@@ -555,9 +555,9 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int incount, | |||
555 | int transfer = (remaining >= 128) ? 127 : remaining; /* sectors */ | 555 | int transfer = (remaining >= 128) ? 127 : remaining; /* sectors */ |
556 | 556 | ||
557 | if(card_info[drive].ocr & (1<<30) ) /* SDHC */ | 557 | if(card_info[drive].ocr & (1<<30) ) /* SDHC */ |
558 | ret = send_cmd(drive, READ_MULTIPLE_BLOCK, start, MMC_ARG, NULL); | 558 | ret = send_cmd(drive, SD_READ_MULTIPLE_BLOCK, start, MMC_ARG, NULL); |
559 | else | 559 | else |
560 | ret = send_cmd(drive, READ_MULTIPLE_BLOCK, start * BLOCK_SIZE, | 560 | ret = send_cmd(drive, SD_READ_MULTIPLE_BLOCK, start * BLOCK_SIZE, |
561 | MMC_ARG, NULL); | 561 | MMC_ARG, NULL); |
562 | 562 | ||
563 | if (ret < 0) | 563 | if (ret < 0) |
@@ -596,13 +596,13 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int incount, | |||
596 | start += transfer; | 596 | start += transfer; |
597 | last_disk_activity = current_tick; | 597 | last_disk_activity = current_tick; |
598 | 598 | ||
599 | if(!send_cmd(drive, STOP_TRANSMISSION, 0, MMC_NO_FLAGS, NULL)) | 599 | if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MMC_NO_FLAGS, NULL)) |
600 | { | 600 | { |
601 | ret = -666; | 601 | ret = -666; |
602 | goto sd_read_error; | 602 | goto sd_read_error; |
603 | } | 603 | } |
604 | 604 | ||
605 | ret = sd_wait_for_state(drive, TRAN); | 605 | ret = sd_wait_for_state(drive, SD_TRAN); |
606 | if (ret < 0) | 606 | if (ret < 0) |
607 | goto sd_read_error; | 607 | goto sd_read_error; |
608 | 608 | ||