SD AMSv2: fix r29625

The number of blocks could have been checked while the card was not initialized yet.
See FS#11870 for details

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29637 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 15 insertions, 8 deletions

diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 171acec3bb..60c15597af 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -394,7 +394,7 @@ static bool send_cmd(const int drive, const int cmd, const int arg, const int fl
         unsigned long *response)
 {
     int card_no;
-    
+
     if ((flags & MCI_ACMD) && /* send SD_APP_CMD first */
         !send_cmd(drive, SD_APP_CMD, card_info[drive].rca, MCI_RESP, response))
         return false;
@@ -559,7 +559,7 @@ static int sd_init_card(const int drive)
         /* CMD6 */
         if(!send_cmd(drive, SD_SWITCH_FUNC, 0x80fffff1, MCI_RESP, &response))
             return -9;
-            
+
         /* This delay is a bit of a hack, but seems to fix card detection
            problems with some SD cards (particularly 16 GB and bigger cards).
            Preferably we should handle this properly instead of using a delay,
@@ -831,6 +831,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
     int retry_all = 0;
     int const retry_data_max = 100; /* Generous, methinks */
     int retry_data;
+    int real_numblocks;
 
     mutex_lock(&sd_mtx);
 #ifndef BOOTLOADER
@@ -844,12 +845,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
         goto sd_transfer_error_no_dma;
     }
 
-    if((start+count) > card_info[drive].numblocks)
-    {
-        ret = -19;
-        goto sd_transfer_error_no_dma;
-    }
-
     /* skip SanDisk OF */
     if (drive == INTERNAL_AS3525)
         start += AMS_OF_SIZE;
@@ -866,6 +861,18 @@ sd_transfer_retry_with_reinit:
             goto sd_transfer_error_no_dma;
     }
 
+    /* Check the real block size after the card has been initialized */
+    real_numblocks = card_info[drive].numblocks;
+    /* 'start' represents the real (physical) starting sector
+     *  so we must compare it to the real (physical) number of sectors */
+    if (drive == INTERNAL_AS3525)
+        real_numblocks += AMS_OF_SIZE;
+    if ((start+count) > real_numblocks)
+    {
+        ret = -19;
+        goto sd_transfer_error_no_dma;
+    }
+
     /*  CMD7 w/rca: Select card to put it in TRAN state */
     if(!send_cmd(drive, SD_SELECT_CARD, card_info[drive].rca, MCI_NO_RESP, NULL))
     {