drivers/sdcard: Fix CSD version 1.0 device size calculation.

GMMan · dpgeorge · commit ab6ad867935e · 2022-06-10T12:56:15.000+10:00
Signed-off-by: Yukai Li &lt;yukaili.geek@gmail.com&gt;
diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
@@ -100,9 +100,10 @@ def init_card(self, baudrate):
         if csd[0] & 0xC0 == 0x40:  # CSD version 2.0
             self.sectors = ((csd[8] << 8 | csd[9]) + 1) * 1024
         elif csd[0] & 0xC0 == 0x00:  # CSD version 1.0 (old, <=2GB)
-            c_size = csd[6] & 0b11 | csd[7] << 2 | (csd[8] & 0b11000000) << 4
-            c_size_mult = ((csd[9] & 0b11) << 1) | csd[10] >> 7
-            self.sectors = (c_size + 1) * (2 ** (c_size_mult + 2))
+            c_size = (csd[6] & 0b11) << 10 | csd[7] << 2 | csd[8] >> 6
+            c_size_mult = (csd[9] & 0b11) << 1 | csd[10] >> 7
+            read_bl_len = csd[5] & 0b1111
+            self.sectors = (c_size + 1) * (2 ** (c_size_mult + 2)) * (2**read_bl_len)
         else:
             raise OSError("SD card CSD format not supported")
         # print('sectors', self.sectors)
