1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c
index 834d8a1..ae43908 100644
--- a/firmware/drivers/sd.c
+++ b/firmware/drivers/sd.c
@@ -53,7 +53,7 @@ void sd_parse_csd(tCardInfo *card)
     card->blocksize = 512;  /* Always use 512 byte blocks */

     card->speed = sd_mantissa[card_extract_bits(card->csd, 102, 4)] *
-                  sd_exponent[card_extract_bits(card->csd,  98, 3) + 4];
+                  sd_exponent[card_extract_bits(card->csd,  98, 3)];

     card->nsac = 100 * card_extract_bits(card->csd, 111, 8);

diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index d95c88c..ca52ccf 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -164,67 +164,13 @@ struct sd_response_r1
     unsigned int   status;
 };

-struct sd_cid
-{
-    unsigned char  mid;
-    unsigned short oid;
-    unsigned char  pnm[7];   /* Product name (we null-terminate) */
-    unsigned char  prv;
-    unsigned int   psn;
-    unsigned char  mdt;
-};
-
-struct sd_csd
-{
-    unsigned char  csd_structure;
-    unsigned char  spec_vers;
-    unsigned char  taac;
-    unsigned char  nsac;
-    unsigned char  tran_speed;
-    unsigned short ccc;
-    unsigned char  read_bl_len;
-    unsigned char  read_bl_partial;
-    unsigned char  write_blk_misalign;
-    unsigned char  read_blk_misalign;
-    unsigned char  dsr_imp;
-    unsigned short c_size;
-    unsigned char  vdd_r_curr_min;
-    unsigned char  vdd_r_curr_max;
-    unsigned char  vdd_w_curr_min;
-    unsigned char  vdd_w_curr_max;
-    unsigned char  c_size_mult;
-    union
-    {
-        struct /* MMC system specification version 3.1 */
-        {
-            unsigned char  erase_grp_size;  
-            unsigned char  erase_grp_mult; 
-        } v31;
-        struct /* MMC system specification version 2.2 */
-        {
-            unsigned char  sector_size;
-            unsigned char  erase_grp_size;
-        } v22;
-    } erase;
-    unsigned char  wp_grp_size;
-    unsigned char  wp_grp_enable;
-    unsigned char  default_ecc;
-    unsigned char  r2w_factor;
-    unsigned char  write_bl_len;
-    unsigned char  write_bl_partial;
-    unsigned char  file_format_grp;
-    unsigned char  copy;
-    unsigned char  perm_write_protect;
-    unsigned char  tmp_write_protect;
-    unsigned char  file_format;
-    unsigned char  ecc;
-};
-
 struct sd_response_r3
 {  
     unsigned int ocr;
 };

+static tCardInfo card;
+
 #define SD_VDD_145_150  0x00000001    /* VDD voltage 1.45 - 1.50 */
 #define SD_VDD_150_155  0x00000002    /* VDD voltage 1.50 - 1.55 */
 #define SD_VDD_155_160  0x00000004    /* VDD voltage 1.55 - 1.60 */
@@ -262,17 +208,6 @@ struct sd_response_r3
 #define CSD_SPEC_VER_2      2          /* Implements system specification 2.0 - 2.2 */
 #define CSD_SPEC_VER_3      3          /* Implements system specification 3.1 */

-/* the information structure of SD Card */
-typedef struct SD_INFO
-{
-    int             rca;    /* RCA */
-    struct sd_cid  cid;
-    struct sd_csd  csd;
-    unsigned int    block_num;
-    unsigned int    block_len;
-    unsigned int    ocr;
-} sd_info;
-
 struct sd_request
 {
     int               index;      /* Slot index - used for CS lines */
@@ -304,7 +239,6 @@ struct sd_request
 static int use_4bit = 1;        /* Use 4-bit data bus */
 static int num_6 = 0;
 static int sd2_0 = 0;
-static sd_info sdinfo;

 /**************************************************************************
  * Utility functions
@@ -317,197 +251,6 @@ static sd_info sdinfo;
 #define PARSE_U16(_buf,_index) \
     (((unsigned short)_buf[_index]) << 8) | ((unsigned short)_buf[_index+1]);

-int sd_unpack_csd(struct sd_request *request, struct sd_csd *csd)
-{
-    unsigned char *buf = request->response;
-    int num = 0;
-    
-    if (request->result)
-        return request->result;
-
-    csd->csd_structure      = (buf[1] & 0xc0) >> 6;
-    if (csd->csd_structure)
-        sd2_0 = 1;
-    else
-        sd2_0 = 0;
-    
-    switch (csd->csd_structure) {
-    case 0 :
-        csd->taac               = buf[2];
-        csd->nsac               = buf[3];
-        csd->tran_speed         = buf[4];
-        csd->ccc                = (((unsigned short)buf[5]) << 4) | ((buf[6] & 0xf0) >> 4);
-        csd->read_bl_len        = buf[6] & 0x0f;
-        /* for support 2GB card*/
-        if (csd->read_bl_len >= 10) 
-        {
-            num = csd->read_bl_len - 9;
-            csd->read_bl_len = 9;
-        }
-        
-        csd->read_bl_partial    = (buf[7] & 0x80) ? 1 : 0;
-        csd->write_blk_misalign = (buf[7] & 0x40) ? 1 : 0;
-        csd->read_blk_misalign  = (buf[7] & 0x20) ? 1 : 0;
-        csd->dsr_imp            = (buf[7] & 0x10) ? 1 : 0;
-        csd->c_size             = ((((unsigned short)buf[7]) & 0x03) << 10) | (((unsigned short)buf[8]) << 2) | (((unsigned short)buf[9]) & 0xc0) >> 6;
-
-        if (num)
-            csd->c_size = csd->c_size << num;
-        
-        
-        csd->vdd_r_curr_min     = (buf[9] & 0x38) >> 3;
-        csd->vdd_r_curr_max     = buf[9] & 0x07;
-        csd->vdd_w_curr_min     = (buf[10] & 0xe0) >> 5;
-        csd->vdd_w_curr_max     = (buf[10] & 0x1c) >> 2;
-        csd->c_size_mult        = ((buf[10] & 0x03) << 1) | ((buf[11] & 0x80) >> 7);
-        switch (csd->csd_structure) {
-        case CSD_STRUCT_VER_1_0:
-        case CSD_STRUCT_VER_1_1:
-            csd->erase.v22.sector_size    = (buf[11] & 0x7c) >> 2;
-            csd->erase.v22.erase_grp_size = ((buf[11] & 0x03) << 3) | ((buf[12] & 0xe0) >> 5);
-
-            break;
-        case CSD_STRUCT_VER_1_2:
-        default:
-            csd->erase.v31.erase_grp_size = (buf[11] & 0x7c) >> 2;
-            csd->erase.v31.erase_grp_mult = ((buf[11] & 0x03) << 3) | ((buf[12] & 0xe0) >> 5);
-            break;
-        }
-        csd->wp_grp_size        = buf[12] & 0x1f;
-        csd->wp_grp_enable      = (buf[13] & 0x80) ? 1 : 0;
-        csd->default_ecc        = (buf[13] & 0x60) >> 5;
-        csd->r2w_factor         = (buf[13] & 0x1c) >> 2;
-        csd->write_bl_len       = ((buf[13] & 0x03) << 2) | ((buf[14] & 0xc0) >> 6);
-        if (csd->write_bl_len >= 10)
-            csd->write_bl_len = 9;
-        
-        csd->write_bl_partial   = (buf[14] & 0x20) ? 1 : 0;
-        csd->file_format_grp    = (buf[15] & 0x80) ? 1 : 0;
-        csd->copy               = (buf[15] & 0x40) ? 1 : 0;
-        csd->perm_write_protect = (buf[15] & 0x20) ? 1 : 0;
-        csd->tmp_write_protect  = (buf[15] & 0x10) ? 1 : 0;
-        csd->file_format        = (buf[15] & 0x0c) >> 2;
-        csd->ecc                = buf[15] & 0x03;
-        
-        DEBUG("csd_structure=%d  spec_vers=%d  taac=%02x  nsac=%02x  tran_speed=%02x",
-              csd->csd_structure, csd->spec_vers, 
-              csd->taac, csd->nsac, csd->tran_speed);
-        DEBUG("ccc=%04x  read_bl_len=%d  read_bl_partial=%d  write_blk_misalign=%d",
-              csd->ccc, csd->read_bl_len, 
-              csd->read_bl_partial, csd->write_blk_misalign);
-        DEBUG("read_blk_misalign=%d  dsr_imp=%d  c_size=%d  vdd_r_curr_min=%d",
-              csd->read_blk_misalign, csd->dsr_imp, 
-              csd->c_size, csd->vdd_r_curr_min);
-        DEBUG("vdd_r_curr_max=%d  vdd_w_curr_min=%d  vdd_w_curr_max=%d  c_size_mult=%d",
-              csd->vdd_r_curr_max, csd->vdd_w_curr_min, 
-              csd->vdd_w_curr_max, csd->c_size_mult);
-        DEBUG("wp_grp_size=%d  wp_grp_enable=%d  default_ecc=%d  r2w_factor=%d",
-              csd->wp_grp_size, csd->wp_grp_enable,
-              csd->default_ecc, csd->r2w_factor);
-        DEBUG("write_bl_len=%d  write_bl_partial=%d  file_format_grp=%d  copy=%d",
-              csd->write_bl_len, csd->write_bl_partial,
-              csd->file_format_grp, csd->copy);
-        DEBUG("perm_write_protect=%d  tmp_write_protect=%d  file_format=%d  ecc=%d",
-              csd->perm_write_protect, csd->tmp_write_protect,
-              csd->file_format, csd->ecc);
-        switch (csd->csd_structure) {
-        case CSD_STRUCT_VER_1_0:
-        case CSD_STRUCT_VER_1_1:
-            DEBUG("V22 sector_size=%d erase_grp_size=%d", 
-                  csd->erase.v22.sector_size, 
-                  csd->erase.v22.erase_grp_size);
-            break;
-        case CSD_STRUCT_VER_1_2:
-        default:
-            DEBUG("V31 erase_grp_size=%d erase_grp_mult=%d", 
-                  csd->erase.v31.erase_grp_size,
-                  csd->erase.v31.erase_grp_mult);
-            break;
-            
-        }
-        break;    
-        
-    case 1 :
-        csd->taac               = 0;
-        csd->nsac               = 0;
-        csd->tran_speed         = buf[4];
-        csd->ccc                = (((unsigned short)buf[5]) << 4) | ((buf[6] & 0xf0) >> 4);
-
-        csd->read_bl_len        = 9;
-        csd->read_bl_partial    = 0;
-        csd->write_blk_misalign = 0;
-        csd->read_blk_misalign  = 0;
-        csd->dsr_imp            = (buf[7] & 0x10) ? 1 : 0;
-        csd->c_size             = ((((unsigned short)buf[8]) & 0x3f) << 16) | (((unsigned short)buf[9]) << 8) | ((unsigned short)buf[10]) ;
-        switch (csd->csd_structure) {
-        case CSD_STRUCT_VER_1_0:
-        case CSD_STRUCT_VER_1_1:
-            csd->erase.v22.sector_size    = 0x7f;
-            csd->erase.v22.erase_grp_size = 0;
-            break;
-        case CSD_STRUCT_VER_1_2:
-        default:
-            csd->erase.v31.erase_grp_size = 0x7f;
-            csd->erase.v31.erase_grp_mult = 0;
-            break;
-        }
-        csd->wp_grp_size        = 0;
-        csd->wp_grp_enable      = 0;
-        csd->default_ecc        = (buf[13] & 0x60) >> 5;
-        csd->r2w_factor         = 4;/* Unused */
-        csd->write_bl_len       = 9;
-        
-        csd->write_bl_partial   = 0;
-        csd->file_format_grp    = 0;
-        csd->copy               = (buf[15] & 0x40) ? 1 : 0;
-        csd->perm_write_protect = (buf[15] & 0x20) ? 1 : 0;
-        csd->tmp_write_protect  = (buf[15] & 0x10) ? 1 : 0;
-        csd->file_format        = 0;
-        csd->ecc                = buf[15] & 0x03;
-        
-        DEBUG("csd_structure=%d  spec_vers=%d  taac=%02x  nsac=%02x  tran_speed=%02x",
-              csd->csd_structure, csd->spec_vers, 
-              csd->taac, csd->nsac, csd->tran_speed);
-        DEBUG("ccc=%04x  read_bl_len=%d  read_bl_partial=%d  write_blk_misalign=%d",
-              csd->ccc, csd->read_bl_len, 
-              csd->read_bl_partial, csd->write_blk_misalign);
-        DEBUG("read_blk_misalign=%d  dsr_imp=%d  c_size=%d  vdd_r_curr_min=%d",
-              csd->read_blk_misalign, csd->dsr_imp, 
-              csd->c_size, csd->vdd_r_curr_min);
-        DEBUG("vdd_r_curr_max=%d  vdd_w_curr_min=%d  vdd_w_curr_max=%d  c_size_mult=%d",
-              csd->vdd_r_curr_max, csd->vdd_w_curr_min, 
-              csd->vdd_w_curr_max, csd->c_size_mult);
-        DEBUG("wp_grp_size=%d  wp_grp_enable=%d  default_ecc=%d  r2w_factor=%d",
-              csd->wp_grp_size, csd->wp_grp_enable,
-              csd->default_ecc, csd->r2w_factor);
-        DEBUG("write_bl_len=%d  write_bl_partial=%d  file_format_grp=%d  copy=%d",
-              csd->write_bl_len, csd->write_bl_partial,
-              csd->file_format_grp, csd->copy);
-        DEBUG("perm_write_protect=%d  tmp_write_protect=%d  file_format=%d  ecc=%d",
-              csd->perm_write_protect, csd->tmp_write_protect,
-              csd->file_format, csd->ecc);
-        switch (csd->csd_structure) {
-        case CSD_STRUCT_VER_1_0:
-        case CSD_STRUCT_VER_1_1:
-            DEBUG("V22 sector_size=%d erase_grp_size=%d", 
-                  csd->erase.v22.sector_size, 
-                  csd->erase.v22.erase_grp_size);
-            break;
-        case CSD_STRUCT_VER_1_2:
-        default:
-            DEBUG("V31 erase_grp_size=%d erase_grp_mult=%d", 
-                  csd->erase.v31.erase_grp_size,
-                  csd->erase.v31.erase_grp_mult);
-            break;
-        }
-    }
-
-    if (buf[0] != 0x3f)
-        return SD_ERROR_HEADER_MISMATCH;
-
-    return 0;
-}
-
 int sd_unpack_r1(struct sd_request *request, struct sd_response_r1 *r1)
 {
     unsigned char *buf = request->response;
@@ -557,44 +300,20 @@ int sd_unpack_scr(struct sd_request *request, struct sd_response_r1 *r1, unsigne
     return sd_unpack_r1(request, r1); 
 }

-int sd_unpack_r6(struct sd_request *request, struct sd_response_r1 *r1, int *rca)
+static inline int sd_unpack_r6(struct sd_request *request, struct sd_response_r1 *r1, unsigned long *rca)
 {
     unsigned char *buf = request->response;

-    if (request->result)        return request->result;
-        
-        *rca = PARSE_U16(buf,1);  /* Save RCA returned by the SD Card */
-        
-        *(buf+1) = 0;
-        *(buf+2) = 0;
+    if (request->result)
+        return request->result;

-        return sd_unpack_r1(request, r1);
-}   
-
-int sd_unpack_cid(struct sd_request *request, struct sd_cid *cid)
-{
-    unsigned char *buf = request->response;
-    int i;
-
-    if (request->result) return request->result;
-
-    cid->mid = buf[1];
-    cid->oid = PARSE_U16(buf,2);
-    for (i = 0 ; i < 6 ; i++)
-        cid->pnm[i] = buf[4+i];
-    cid->pnm[6] = 0;
-    cid->prv = buf[10];
-    cid->psn = PARSE_U32(buf,11);
-    cid->mdt = buf[15];
+    *rca = PARSE_U16(buf,1);  /* Save RCA returned by the SD Card */

-    DEBUG("sd_unpack_cid: mid=%d oid=%d pnm=%s prv=%d.%d psn=%08x mdt=%d/%d",
-          cid->mid, cid->oid, cid->pnm, 
-          (cid->prv>>4), (cid->prv&0xf), 
-          cid->psn, (cid->mdt>>4), (cid->mdt&0xf)+1997);
-
-    if (buf[0] != 0x3f)  return SD_ERROR_HEADER_MISMATCH;
-          return 0;
-}
+    *(buf+1) = 0;
+    *(buf+2) = 0;
+    
+    return sd_unpack_r1(request, r1);
+}   

 int sd_unpack_r3(struct sd_request *request, struct sd_response_r3 *r3)
 {
@@ -924,10 +643,10 @@ static int jz_sd_transmit_data(struct sd_request *req)
     return SD_NO_ERROR;
 }

-static inline unsigned int jz_sd_calc_clkrt(int is_sd, unsigned int rate)
+static inline unsigned int jz_sd_calc_clkrt(unsigned int rate)
 {
     unsigned int clkrt;
-    unsigned int clk_src = is_sd ? (sd2_0 ? 48000000 : 24000000) : 20000000;
+    unsigned int clk_src = sd2_0 ? SD_CLOCK_HIGH : SD_CLOCK_FAST;

     clkrt = 0;
     while (rate < clk_src)
@@ -939,30 +658,23 @@ static inline unsigned int jz_sd_calc_clkrt(int is_sd, unsigned int rate)
 }

 /* Set the MMC clock frequency */
-static void jz_sd_set_clock(int sd, unsigned int rate)
+static void jz_sd_set_clock(unsigned int rate)
 {
-    int clkrt = 0;
-
-    sd = sd ? 1 : 0;
+    int clkrt;

     jz_sd_stop_clock();

+    /* select clock source from CPM */
     if (sd2_0)
-    {
-        __cpm_select_msc_hs_clk(sd);        /* select clock source from CPM */
-        REG_CPM_CPCCR |= CPM_CPCCR_CE;
-        clkrt = jz_sd_calc_clkrt(sd, rate);
-        REG_MSC_CLKRT = clkrt;
-    }
+        __cpm_select_msc_hs_clk(1);        
     else
-    {
-        __cpm_select_msc_clk(sd);           /* select clock source from CPM */
-        REG_CPM_CPCCR |= CPM_CPCCR_CE;
-        clkrt = jz_sd_calc_clkrt(sd, rate);
-        REG_MSC_CLKRT = clkrt;
-    }
+        __cpm_select_msc_clk(1);
+
+    REG_CPM_CPCCR |= CPM_CPCCR_CE;
+    clkrt = jz_sd_calc_clkrt(rate);
+    REG_MSC_CLKRT = clkrt;

-    DEBUG("set clock to %u Hz is_sd=%d clkrt=%d", rate, sd, clkrt);
+    DEBUG("set clock to %u Hz clkrt=%d", rate, clkrt);
 }

 /********************************************************************************************************************
@@ -987,7 +699,7 @@ static int jz_sd_exec_cmd(struct sd_request *request)
         __msc_reset();

         /* On reset, drop SD clock down */
-        jz_sd_set_clock(1, MMC_CLOCK_SLOW);
+        jz_sd_set_clock(MMC_CLOCK_SLOW);

         /* On reset, stop SD clock */
         jz_sd_stop_clock();
@@ -1324,49 +1036,6 @@ static void sd_simple_cmd(struct sd_request *request, int cmd, unsigned int arg,
     sd_send_cmd(request, cmd, arg, 0, 0, rtype, NULL);
 }

-#define KBPS 1
-#define MBPS 1000
-static unsigned int ts_exp[] = { 100*KBPS, 1*MBPS, 10*MBPS, 100*MBPS, 0, 0, 0, 0 };
-static unsigned int ts_mul[] = { 0,    1000, 1200, 1300, 1500, 2000, 2500, 3000, 
-            3500, 4000, 4500, 5000, 5500, 6000, 7000, 8000 };
-
-unsigned int sd_tran_speed(unsigned char ts)
-{
-    unsigned int rate = ts_exp[(ts & 0x7)] * ts_mul[(ts & 0x78) >> 3];
-
-    if (rate <= 0)
-    {
-        DEBUG("sd_tran_speed: error - unrecognized speed 0x%02x", ts);
-        return 1;
-    }
-
-    return rate;
-}
-
-static void sd_configure_card(void)
-{
-    unsigned int rate;
-
-    /* Get card info */
-    if (sd2_0)
-        sdinfo.block_num = (sdinfo.csd.c_size + 1) << 10;
-    else
-        sdinfo.block_num = (sdinfo.csd.c_size + 1) * (1 << (sdinfo.csd.c_size_mult + 2));
-
-    sdinfo.block_len = 1 << sdinfo.csd.read_bl_len;
-
-    /* Fix the clock rate */
-    rate = sd_tran_speed(sdinfo.csd.tran_speed);
-    if (rate < MMC_CLOCK_SLOW)
-        rate = MMC_CLOCK_SLOW;
-    if (rate > SD_CLOCK_FAST)
-        rate = SD_CLOCK_FAST;
-
-    DEBUG("sd_configure_card: block_len=%d block_num=%d rate=%d", sdinfo.block_len, sdinfo.block_num, rate);
-
-    jz_sd_set_clock(1, rate);
-}
-
 #define SD_INIT_DOING   0
 #define SD_INIT_PASSED  1
 #define SD_INIT_FAILED  2
@@ -1415,7 +1084,7 @@ static int sd_init_card_state(struct sd_request *request)
             }

             DEBUG("sd_init_card_state: read ocr value = 0x%08x", r3.ocr);
-            sdinfo.ocr = r3.ocr;
+            card.ocr = r3.ocr;

             if(!(r3.ocr & SD_CARD_BUSY || ocr == 0)){
                 udelay(10000);
@@ -1429,21 +1098,16 @@ static int sd_init_card_state(struct sd_request *request)
             }
             break;

-        case SD_ALL_SEND_CID: 
-            retval = sd_unpack_cid( request, &sdinfo.cid );
+        case SD_ALL_SEND_CID:
+            memcpy(card.cid, &request->response[1], 16);

-            if ( retval && (retval != SD_ERROR_CRC)) {
-                DEBUG("sd_init_card_state: unable to ALL_SEND_CID error=%d", 
-                      retval);
-                return SD_INIT_FAILED;
-            }
             sd_simple_cmd(request, SD_SEND_RELATIVE_ADDR, 0, RESPONSE_R6);
             break;

         case SD_SEND_RELATIVE_ADDR:
-            retval = sd_unpack_r6(request, &r1, &sdinfo.rca);
-            sdinfo.rca = sdinfo.rca << 16; 
-            DEBUG("sd_init_card_state: Get RCA from SD: 0x%04x Status: %x", sdinfo.rca, r1.status);
+            retval = sd_unpack_r6(request, &r1, &card.rca);
+            card.rca = card.rca << 16; 
+            DEBUG("sd_init_card_state: Get RCA from SD: 0x%04x Status: %x", card.rca, r1.status);
             if (retval)
             {
                 DEBUG("sd_init_card_state: unable to SET_RELATIVE_ADDR error=%d", 
@@ -1451,22 +1115,15 @@ static int sd_init_card_state(struct sd_request *request)
                 return SD_INIT_FAILED;
             }

-            sd_simple_cmd(request, SD_SEND_CSD, sdinfo.rca, RESPONSE_R2_CSD);
+            sd_simple_cmd(request, SD_SEND_CSD, card.rca, RESPONSE_R2_CSD);
             break;

         case SD_SEND_CSD:
-            retval = sd_unpack_csd(request, &sdinfo.csd);
+            memcpy(card.csd, &request->response[1], 16);
+            sd_parse_csd(&card);

             DEBUG("SD card is ready");
-                    
-            /*FIXME:ignore CRC error for CMD2/CMD9/CMD10 */
-            if (retval && (retval != SD_ERROR_CRC))
-            {
-                DEBUG("sd_init_card_state: unable to SEND_CSD error=%d", 
-                      retval);
-                return SD_INIT_FAILED;
-            }
-            sd_configure_card();
+            jz_sd_set_clock(SD_CLOCK_HIGH);
             return SD_INIT_PASSED;

         default:
@@ -1525,7 +1182,7 @@ int sd_select_card(void)
     struct sd_response_r1 r1;
     int retval;

-    sd_simple_cmd(&request, SD_SELECT_CARD, sdinfo.rca,
+    sd_simple_cmd(&request, SD_SELECT_CARD, card.rca,
                RESPONSE_R1B);
     retval = sd_unpack_r1(&request, &r1);
     if (retval)
@@ -1537,11 +1194,11 @@ int sd_select_card(void)
         if (!retval)
         {
             sd_switch_hs(&request);
-            jz_sd_set_clock(1, SD_CLOCK_HIGH);
+            jz_sd_set_clock(SD_CLOCK_HIGH);
         }
     }
     num_6 = 3;
-    sd_simple_cmd(&request, SD_APP_CMD, sdinfo.rca,
+    sd_simple_cmd(&request, SD_APP_CMD, card.rca,
                RESPONSE_R1);
     retval = sd_unpack_r1(&request, &r1);
     if (retval)
@@ -1597,34 +1254,9 @@ void card_enable_monitoring_target(bool on)
 }
 #endif

-/* TODO */
 tCardInfo* card_get_info_target(int card_no)
 {
     (void)card_no;
-    int i, temp;
-    static tCardInfo card;
-
-    static const unsigned char sd_mantissa[] = {  /* *10 */
-        0,  10, 12, 13, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 70, 80 };
-    static const unsigned int sd_exponent[] = {  /* use varies */
-        1,10,100,1000,10000,100000,1000000,10000000,100000000,1000000000 };
-
-    card.initialized = true;
-    card.ocr = sdinfo.ocr;
-    for(i=0; i<4; i++)
-        card.csd[i] = ((unsigned long*)&sdinfo.csd)[i];
-    for(i=0; i<4; i++)
-        card.cid[i] = ((unsigned long*)&sdinfo.cid)[i];
-    temp              = card_extract_bits(card.csd, 98, 3);
-    card.speed        = sd_mantissa[card_extract_bits(card.csd, 102, 4)]
-                      * sd_exponent[temp > 2 ? 7 : temp + 4];
-    card.nsac         = 100 * card_extract_bits(card.csd, 111, 8);
-    temp              = card_extract_bits(card.csd, 114, 3);
-    card.taac         = sd_mantissa[card_extract_bits(card.csd, 118, 4)]
-                      * sd_exponent[temp] / 10;
-    card.numblocks = sdinfo.block_num;
-    card.blocksize = sdinfo.block_len;
-    
     return &card;
 }

@@ -1639,10 +1271,10 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf
     struct sd_response_r1 r1;
     int retval; 

-    if (!card_detect_target() || count == 0 || start > sdinfo.block_num)
+    if (!card_detect_target() || count == 0 || start > card.numblocks)
         return -1;

-    sd_simple_cmd(&request, SD_SEND_STATUS, sdinfo.rca, RESPONSE_R1);
+    sd_simple_cmd(&request, SD_SEND_STATUS, card.rca, RESPONSE_R1);
     retval = sd_unpack_r1(&request, &r1);
     if (retval && (retval != SD_ERROR_STATE_MISMATCH))
         return retval;
@@ -1689,10 +1321,10 @@ int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const vo
     struct sd_response_r1 r1;
     int retval;

-    if (!card_detect_target() || count == 0 || start > sdinfo.block_num)
+    if (!card_detect_target() || count == 0 || start > card.numblocks)
         return -1;

-    sd_simple_cmd(&request, SD_SEND_STATUS, sdinfo.rca, RESPONSE_R1);
+    sd_simple_cmd(&request, SD_SEND_STATUS, card.rca, RESPONSE_R1);
     retval = sd_unpack_r1(&request, &r1);
     if (retval && (retval != SD_ERROR_STATE_MISMATCH))
         return retval;
@@ -1760,7 +1392,7 @@ bool sd_present(IF_MV_NONVOID(int drive))
 #ifdef HAVE_MULTIVOLUME
     (void)drive;
 #endif
-    return (sdinfo.block_num > 0 && card_detect_target());
+    return (card.numblocks > 0 && card_detect_target());
 }

 #ifdef STORAGE_GET_INFO
@@ -1776,7 +1408,7 @@ void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
     info->product="SD Storage";

     /* blocks count */
-    info->num_sectors = sdinfo.block_num;
-    info->sector_size = sdinfo.block_len;
+    info->num_sectors = card.numblocks;
+    info->sector_size = card.blocksize;
 }
 #endif