From 2254327f477243fec23c13bf8237503158114a7c Mon Sep 17 00:00:00 2001
From: David Lin <linpeng1577@gmail.com>
Date: Fri, 17 Apr 2020 12:36:30 +0800
Subject: [PATCH 1/2] Update fatfs_drv.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加异常处理，防止错误cmd值导致返回RES_OK
---
 board/STM32F103_SIM800A/Hardware/fatfs_drv.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/board/STM32F103_SIM800A/Hardware/fatfs_drv.c b/board/STM32F103_SIM800A/Hardware/fatfs_drv.c
index 50fc9aa7..c32be486 100644
--- a/board/STM32F103_SIM800A/Hardware/fatfs_drv.c
+++ b/board/STM32F103_SIM800A/Hardware/fatfs_drv.c
@@ -8,6 +8,7 @@
 
 #define SPI_FLASH_SECTOR_SIZE   (4 * 1024)
 #define SPI_FLASH_PAGE_SIZE     256
+
  DSTATUS w25q64_fatfs_status(BYTE lun)
 {
     DSTATUS status = STA_NOINIT;
@@ -64,14 +65,14 @@ DRESULT w25q64_fatfs_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
     case GET_BLOCK_SIZE:
         *(DWORD *)buff = 1;
         break;
+    default:
+        return res;
     }
     res = RES_OK;
+  
     return res;
 }
 
-
-
-
 DWORD get_fattime (void)
 {
     return 0;

From feeb55dcede3ae70b90192c8b16a85af571c5ca7 Mon Sep 17 00:00:00 2001
From: David Lin <linpeng1577@gmail.com>
Date: Fri, 17 Apr 2020 15:48:01 +0800
Subject: [PATCH 2/2] Update fatfs_drv.c

---
 board/STM32F103_SIM800A/Hardware/fatfs_drv.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/board/STM32F103_SIM800A/Hardware/fatfs_drv.c b/board/STM32F103_SIM800A/Hardware/fatfs_drv.c
index c32be486..ab01c562 100644
--- a/board/STM32F103_SIM800A/Hardware/fatfs_drv.c
+++ b/board/STM32F103_SIM800A/Hardware/fatfs_drv.c
@@ -52,8 +52,6 @@ DRESULT w25q64_fatfs_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
 
  DRESULT w25q64_fatfs_ioctl(BYTE lun, BYTE cmd, void *buff)
 {
-    DRESULT res = RES_PARERR;
-
     switch (cmd)
     {
     case GET_SECTOR_COUNT:
@@ -66,11 +64,9 @@ DRESULT w25q64_fatfs_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
         *(DWORD *)buff = 1;
         break;
     default:
-        return res;
-    }
-    res = RES_OK;
-  
-    return res;
+        return RES_PARERR;
+    } 
+    return RES_OK;
 }
 
 DWORD get_fattime (void)