diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-07-01 17:03:51 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-07-01 17:03:51 +0000 |
commit | f3a4a7635ea24de86562cf854b897d0e5b0cffe7 (patch) | |
tree | ecab23490e3e480e121552c5bdd46ea71f16a187 /firmware/target/mips/ingenic_jz47xx | |
parent | 9bff845b49e277af46d6b7a09bb111472f3d3f49 (diff) | |
download | rockbox-f3a4a7635ea24de86562cf854b897d0e5b0cffe7.tar.gz rockbox-f3a4a7635ea24de86562cf854b897d0e5b0cffe7.zip |
Ingenic Jz4740 SD driver: remove some unneeded stuff + fill the OCR field in card_get_info_target()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21596 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/mips/ingenic_jz47xx')
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c index 084fdb66d0..31a9f7d2b0 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | |||
@@ -309,18 +309,12 @@ struct mmc_response_r3 | |||
309 | /* the information structure of MMC/SD Card */ | 309 | /* the information structure of MMC/SD Card */ |
310 | typedef struct MMC_INFO | 310 | typedef struct MMC_INFO |
311 | { | 311 | { |
312 | int id; /* Card index */ | ||
313 | int sd; /* MMC or SD card */ | ||
314 | int rca; /* RCA */ | 312 | int rca; /* RCA */ |
315 | unsigned int scr; /* SCR 63:32*/ | ||
316 | int flags; /* Ejected, inserted */ | ||
317 | |||
318 | /* Card specific information */ | ||
319 | struct mmc_cid cid; | 313 | struct mmc_cid cid; |
320 | struct mmc_csd csd; | 314 | struct mmc_csd csd; |
321 | unsigned int block_num; | 315 | unsigned int block_num; |
322 | unsigned int block_len; | 316 | unsigned int block_len; |
323 | unsigned int erase_unit; | 317 | unsigned int ocr; |
324 | } mmc_info; | 318 | } mmc_info; |
325 | 319 | ||
326 | struct mmc_request | 320 | struct mmc_request |
@@ -1470,7 +1464,8 @@ static int mmc_init_card_state(struct mmc_request *request) | |||
1470 | } | 1464 | } |
1471 | 1465 | ||
1472 | DEBUG("mmc_init_card_state: read ocr value = 0x%08x", r3.ocr); | 1466 | DEBUG("mmc_init_card_state: read ocr value = 0x%08x", r3.ocr); |
1473 | 1467 | mmcinfo.ocr = r3.ocr; | |
1468 | |||
1474 | if(!(r3.ocr & MMC_CARD_BUSY || ocr == 0)){ | 1469 | if(!(r3.ocr & MMC_CARD_BUSY || ocr == 0)){ |
1475 | udelay(10000); | 1470 | udelay(10000); |
1476 | mmc_simple_cmd(request, MMC_APP_CMD, 0, RESPONSE_R1); | 1471 | mmc_simple_cmd(request, MMC_APP_CMD, 0, RESPONSE_R1); |
@@ -1675,7 +1670,7 @@ tCardInfo* card_get_info_target(int card_no) | |||
1675 | static tCardInfo card; | 1670 | static tCardInfo card; |
1676 | 1671 | ||
1677 | card.initialized = true; | 1672 | card.initialized = true; |
1678 | card.ocr = 0; | 1673 | card.ocr = mmcinfo.ocr; |
1679 | for(i=0; i<4; i++) | 1674 | for(i=0; i<4; i++) |
1680 | card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i]; | 1675 | card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i]; |
1681 | for(i=0; i<4; i++) | 1676 | for(i=0; i<4; i++) |