From 09bc4157516dd59754a3eb1a5dbbb72a758ebe93 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 28 Sep 2020 19:21:17 -0700
Subject: Unify iMX flash config and add Metro M7 1011

This unifies the flash config to the settings used by the Boot ROM.
This makes the config unique per board which allows for changing
quad enable and status bit differences per flash device. It also
allows for timing differences due to the board layout.

This change also tweaks linker layout to leave more ram space for
the CircuitPython heap.
---
 extmod/vfs_fat_diskio.c | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'extmod/vfs_fat_diskio.c')

diff --git a/extmod/vfs_fat_diskio.c b/extmod/vfs_fat_diskio.c
index ac8924394..432c03b7c 100644
--- a/extmod/vfs_fat_diskio.c
+++ b/extmod/vfs_fat_diskio.c
@@ -123,7 +123,7 @@ DRESULT disk_write (
 
 DRESULT disk_ioctl (
     bdev_t pdrv,      /* Physical drive nmuber (0..) */
-    BYTE cmd,        /* Control code */
+    BYTE cmd,         /* Control code */
     void *buff        /* Buffer to send/receive control data */
 )
 {
@@ -133,7 +133,7 @@ DRESULT disk_ioctl (
     }
 
     // First part: call the relevant method of the underlying block device
-    mp_obj_t ret = mp_const_none;
+    mp_int_t out_value = 0;
     if (vfs->flags & FSUSER_HAVE_IOCTL) {
         // new protocol with ioctl
         static const uint8_t op_map[8] = {
@@ -144,9 +144,19 @@ DRESULT disk_ioctl (
         };
         uint8_t bp_op = op_map[cmd & 7];
         if (bp_op != 0) {
-            vfs->u.ioctl[2] = MP_OBJ_NEW_SMALL_INT(bp_op);
-            vfs->u.ioctl[3] = MP_OBJ_NEW_SMALL_INT(0); // unused
-            ret = mp_call_method_n_kw(2, 0, vfs->u.ioctl);
+            if (vfs->flags & FSUSER_NATIVE) {
+                bool (*f)(size_t, mp_int_t*) = (void*)(uintptr_t)vfs->u.ioctl[2];
+                if (!f(bp_op, (mp_int_t*) &out_value)) {
+                    return RES_ERROR;
+                }
+            } else {
+                vfs->u.ioctl[2] = MP_OBJ_NEW_SMALL_INT(bp_op);
+                vfs->u.ioctl[3] = MP_OBJ_NEW_SMALL_INT(0); // unused
+                mp_obj_t ret = mp_call_method_n_kw(2, 0, vfs->u.ioctl);
+                if (ret != mp_const_none) {
+                    out_value = mp_obj_get_int(ret);
+                }
+            }
         }
     } else {
         // old protocol with sync and count
@@ -157,10 +167,13 @@ DRESULT disk_ioctl (
                 }
                 break;
 
-            case GET_SECTOR_COUNT:
-                ret = mp_call_method_n_kw(0, 0, vfs->u.old.count);
+            case GET_SECTOR_COUNT: {
+                mp_obj_t ret = mp_call_method_n_kw(0, 0, vfs->u.old.count);
+                if (ret != mp_const_none) {
+                    out_value = mp_obj_get_int(ret);
+                }
                 break;
-
+            }
             case GET_SECTOR_SIZE:
                 // old protocol has fixed sector size of 512 bytes
                 break;
@@ -177,16 +190,16 @@ DRESULT disk_ioctl (
             return RES_OK;
 
         case GET_SECTOR_COUNT: {
-            *((DWORD*)buff) = mp_obj_get_int(ret);
+            *((DWORD*)buff) = out_value;
             return RES_OK;
         }
 
         case GET_SECTOR_SIZE: {
-            if (ret == mp_const_none) {
+            if (out_value == 0) {
                 // Default sector size
                 *((WORD*)buff) = 512;
             } else {
-                *((WORD*)buff) = mp_obj_get_int(ret);
+                *((WORD*)buff) = out_value;
             }
             #if _MAX_SS != _MIN_SS
             // need to store ssize because we use it in disk_read/disk_write
@@ -202,7 +215,7 @@ DRESULT disk_ioctl (
         case IOCTL_INIT:
         case IOCTL_STATUS: {
             DSTATUS stat;
-            if (ret != mp_const_none && MP_OBJ_SMALL_INT_VALUE(ret) != 0) {
+            if (out_value != 0) {
                 // error initialising
                 stat = STA_NOINIT;
             } else if (vfs->writeblocks[0] == MP_OBJ_NULL) {
-- 
cgit v1.2.3