4 files changed, 26 insertions, 21 deletions

diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index 1dc330c538..0fe89c5be8 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -425,25 +425,25 @@ static int initialize_card(int card_no)
     if (rc)
         return rc * 10 - 5;
 
-    blk_exp = card_extract_bits(card->csd, 44, 4);
+    blk_exp = card_extract_bits(card->csd, 83, 4);
     if (blk_exp < 9) /* block size < 512 bytes not supported */
         return -6;
 
-    card->numblocks = (card_extract_bits(card->csd, 54, 12) + 1)
-                   << (card_extract_bits(card->csd, 78, 3) + 2 + blk_exp - 9);
+    card->numblocks = (card_extract_bits(card->csd, 73, 12) + 1)
+                   << (card_extract_bits(card->csd, 49, 3) + 2 + blk_exp - 9);
     card->blocksize = BLOCK_SIZE;
 
     /* max transmission speed, clock divider */
-    ts_exp = card_extract_bits(card->csd, 29, 3);
+    ts_exp = card_extract_bits(card->csd, 98, 3);
     ts_exp = (ts_exp > 3) ? 3 : ts_exp;
-    card->speed = mantissa[card_extract_bits(card->csd, 25, 4)]
+    card->speed = mantissa[card_extract_bits(card->csd, 102, 4)]
                 * exponent[ts_exp + 4];
     card->bitrate_register = (FREQ/4-1) / card->speed;
 
     /* NSAC, TAAC, read timeout */
-    card->nsac = 100 * card_extract_bits(card->csd, 16, 8);
-    card->taac = mantissa[card_extract_bits(card->csd, 9, 4)];
-    taac_exp = card_extract_bits(card->csd, 13, 3);
+    card->nsac = 100 * card_extract_bits(card->csd, 111, 8);
+    card->taac = mantissa[card_extract_bits(card->csd, 118, 4)];
+    taac_exp = card_extract_bits(card->csd, 114, 3);
     card->read_timeout = ((FREQ/4) / (card->bitrate_register + 1)
                          * card->taac / exponent[9 - taac_exp]
                          + (10 * card->nsac));
@@ -451,7 +451,7 @@ static int initialize_card(int card_no)
     card->taac = card->taac * exponent[taac_exp] / 10;
 
     /* r2w_factor, write timeout */
-    card->r2w_factor = BIT_N(card_extract_bits(card->csd, 99, 3));
+    card->r2w_factor = BIT_N(card_extract_bits(card->csd, 28, 3));
     card->write_timeout = card->read_timeout * card->r2w_factor;
 
     if (card->r2w_factor > 32) /* Such cards often need extra read delay */
diff --git a/firmware/hotswap.c b/firmware/hotswap.c
index 97c162ce39..ec298f7243 100644
--- a/firmware/hotswap.c
+++ b/firmware/hotswap.c
@@ -33,9 +33,14 @@ unsigned long card_extract_bits(
     unsigned int start,     /* bit no. to start reading  */
     unsigned int size)      /* how many bits to read */
 {
-    unsigned int long_index = start / 32;
-    unsigned int bit_index = start % 32;
+    unsigned int long_index, bit_index;
     unsigned long result;
+
+    /* we assume words of CSD/CID are stored least significant word first */
+    start = 127 - start;
+
+    long_index = start / 32;
+    bit_index = start % 32;
     
     result = p[long_index] << bit_index;
 
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index ade5b8090b..8f30195791 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -1306,12 +1306,12 @@ tCardInfo *card_get_info_target(int card_no)
     for(i=0; i<4; i++)  card.cid[i] = card_info[card_no].cid[3-i];
     card.numblocks    = card_info[card_no].numblocks;
     card.blocksize    = card_info[card_no].blocksize;
-    temp              = card_extract_bits(card.csd, 29, 3);
-    card.speed        = mantissa[card_extract_bits(card.csd, 25, 4)]
+    temp              = card_extract_bits(card.csd, 98, 3);
+    card.speed        = mantissa[card_extract_bits(card.csd, 102, 4)]
                       * exponent[temp > 2 ? 7 : temp + 4];
-    card.nsac         = 100 * card_extract_bits(card.csd, 16, 8);
-    temp              = card_extract_bits(card.csd, 13, 3);
-    card.taac         = mantissa[card_extract_bits(card.csd, 9, 4)]
+    card.nsac         = 100 * card_extract_bits(card.csd, 111, 8);
+    temp              = card_extract_bits(card.csd, 114, 3);
+    card.taac         = mantissa[card_extract_bits(card.csd, 118, 4)]
                       * exponent[temp] / 10;
     card.cid[0]       = htobe32(card.cid[0]); /* ascii chars here */
     card.cid[1]       = htobe32(card.cid[1]); /* ascii chars here */
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 31a9f7d2b0..6e7f62a2e5 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -1675,12 +1675,12 @@ tCardInfo* card_get_info_target(int card_no)
         card.csd[i] = ((unsigned long*)&mmcinfo.csd)[i];
     for(i=0; i<4; i++)
         card.cid[i] = ((unsigned long*)&mmcinfo.cid)[i];
-    temp              = card_extract_bits(card.csd, 29, 3);
-    card.speed        = sd_mantissa[card_extract_bits(card.csd, 25, 4)]
+    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, 16, 8);
-    temp              = card_extract_bits(card.csd, 13, 3);
-    card.taac         = sd_mantissa[card_extract_bits(card.csd, 9, 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 = mmcinfo.block_num;
     card.blocksize = mmcinfo.block_len;