2 files changed, 12 insertions, 11 deletions

diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index 70e0778d2b..df39cba495 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -446,7 +446,7 @@ static int sd_init_card(const int drive)
     sd_parse_csd(&card_info[drive]);
 
 #if defined(HAVE_MULTIDRIVE)
-    hs_card = (card_info[drive].speed == 50000000);
+    hs_card = (card_info[drive].speed >= 50000000);
 #endif
 
     /* Boost MCICLK to operating speed */
@@ -455,7 +455,7 @@ static int sd_init_card(const int drive)
 #if defined(HAVE_MULTIDRIVE)
     else
         /* MCICLK = PCLK/2 = 31MHz(HS) or PCLK/4 = 15.5 Mhz (STD)*/
-        MCI_CLOCK(drive) = (hs_card ? MCI_HALFSPEED : MCI_QUARTERSPEED) | 
+        MCI_CLOCK(drive) = (hs_card ? MCI_HALFSPEED : MCI_QUARTERSPEED) |
                            MCI_CLOCK_POWERSAVE; /* SD supports powersave */
 #endif
 
@@ -680,7 +680,7 @@ static int sd_select_bank(signed char bank)
     return 0;
 }
 
-static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start,
+static int sd_transfer_sectors(IF_MD(int drive,) sector_t start,
                                int count, void* buf, const bool write)
 {
 #ifndef HAVE_MULTIDRIVE
@@ -735,7 +735,8 @@ static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start,
         unsigned int transfer = (count >= 128) ? 127 : count; /* sectors */
         void *dma_buf;
 
-        unsigned long bank_start = start;
+        sector_t bank_start = start;
+        // XXX 64-bit sectors?
 
         /* Only switch banks for internal storage */
         if(drive == INTERNAL_AS3525)
@@ -869,7 +870,7 @@ sd_transfer_error_nodma:
     return ret;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count,
                      void* buf)
 {
     int ret;
@@ -881,11 +882,11 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
     return ret;
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                      const void* buf)
 {
 #ifdef VERIFY_WRITE
-    unsigned long saved_start = start;
+    sector_t saved_start = start;
     int saved_count = count;
     void *saved_buf = (void*)buf;
 #endif
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index b512cc2ea4..f9ef7d9c97 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -677,7 +677,7 @@ int sd_init(void)
     return 0;
 }
 
-static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start,
+static int sd_transfer_sectors(IF_MD(int drive,) sector_t start,
                                 int count, void* buf, bool write)
 {
     unsigned long response;
@@ -776,7 +776,7 @@ retry_with_reinit:
 
         MCI_BYTCNT = transfer * SD_BLOCK_SIZE;
 
-        int arg = start;
+        sector_t arg = start;  // XXX 64-bit
         if(!(card_info[drive].ocr & (1<<30))) /* not SDHC */
             arg *= SD_BLOCK_SIZE;
 
@@ -858,13 +858,13 @@ exit:
     return ret;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count,
                     void* buf)
 {
     return sd_transfer_sectors(IF_MD(drive,) start, count, buf, false);
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                      const void* buf)
 {
     return sd_transfer_sectors(IF_MD(drive,) start, count, (void*)buf, true);