len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 05:05:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ingenic Jz4740 SD driver: remove some unneeded stuff + fill the OCR field in card_get_info_target()

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21596 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-07-01 17:03:51 +00:00
parent 9bff845b49
commit f3a4a7635e
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
View file

@ -309,18 +309,12 @@ struct mmc_response_r3
/* the information structure of MMC/SD Card */ /* the information structure of MMC/SD Card */
typedef struct MMC_INFO typedef struct MMC_INFO
{ {
int id; /* Card index */
int sd; /* MMC or SD card */
int rca; /* RCA */ int rca; /* RCA */
unsigned int scr; /* SCR 63:32*/
int flags; /* Ejected, inserted */
/* Card specific information */
struct mmc_cid cid; struct mmc_cid cid;
struct mmc_csd csd; struct mmc_csd csd;
unsigned int block_num; unsigned int block_num;
unsigned int block_len; unsigned int block_len;
unsigned int erase_unit; unsigned int ocr;
} mmc_info; } mmc_info;
struct mmc_request struct mmc_request
@ -1470,7 +1464,8 @@ static int mmc_init_card_state(struct mmc_request *request)
} }
DEBUG("mmc_init_card_state: read ocr value = 0x%08x", r3.ocr); DEBUG("mmc_init_card_state: read ocr value = 0x%08x", r3.ocr);
mmcinfo.ocr = r3.ocr;
if(!(r3.ocr & MMC_CARD_BUSY || ocr == 0)){ if(!(r3.ocr & MMC_CARD_BUSY || ocr == 0)){
udelay(10000); udelay(10000);
mmc_simple_cmd(request, MMC_APP_CMD, 0, RESPONSE_R1); mmc_simple_cmd(request, MMC_APP_CMD, 0, RESPONSE_R1);
@ -1675,7 +1670,7 @@ tCardInfo* card_get_info_target(int card_no)
static tCardInfo card; static tCardInfo card;
card.initialized = true; card.initialized = true;
card.ocr = 0; card.ocr = mmcinfo.ocr;
for(i=0; i<4; i++) for(i=0; i<4; i++)
card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i]; card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i];
for(i=0; i<4; i++) for(i=0; i<4; i++)