From a70808ce9e99faaa668ac75ae7c1a65ef22bbf3c Mon Sep 17 00:00:00 2001
From: SimpleInit <63694297@qq.com>
Date: Mon, 14 Sep 2020 23:54:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9D=9E=E5=AF=B9=E9=BD=90?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=AE=BF=E9=97=AE=E8=AF=AD=E5=8F=A5=E5=92=8C?=
 =?UTF-8?q?=5F=5FCORTEX=5FM=E5=AE=8F=E5=AE=9A=E4=B9=89=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: SimpleInit <63694297@qq.com>
---
 components/drivers/spi/spi_msd.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/components/drivers/spi/spi_msd.c b/components/drivers/spi/spi_msd.c
index 272c21c179..191933e421 100644
--- a/components/drivers/spi/spi_msd.c
+++ b/components/drivers/spi/spi_msd.c
@@ -233,8 +233,8 @@ static rt_err_t _send_cmd(
     }
     else if (type == response_r2)
     {
-    #if defined(__CORTEX_M) && __CORTEX_M == 0
         /* initial message */
+        /* Prevent non-aligned address access, use recv_buffer to receive data */
         message.send_buf = RT_NULL;
         message.recv_buf = recv_buffer;
         message.length = 1;
@@ -243,20 +243,9 @@ static rt_err_t _send_cmd(
         /* transfer message */
         device->bus->ops->xfer(device, &message);
         response[1] = recv_buffer[0];
-    #else
-        /* initial message */
-        message.send_buf = RT_NULL;
-        message.recv_buf = response + 1;
-        message.length = 1;
-        message.cs_take = message.cs_release = 0;
-
-        /* transfer message */
-        device->bus->ops->xfer(device, &message);
-    #endif
     }
     else if ((type == response_r3) || (type == response_r7))
     {
-    #if defined(__CORTEX_M) && __CORTEX_M == 0
         /* initial message */
         message.send_buf = RT_NULL;
         message.recv_buf = recv_buffer;
@@ -269,16 +258,6 @@ static rt_err_t _send_cmd(
         response[2] = recv_buffer[1];
         response[3] = recv_buffer[2];
         response[4] = recv_buffer[3];
-    #else
-        /* initial message */
-        message.send_buf = RT_NULL;
-        message.recv_buf = response + 1;
-        message.length = 4;
-        message.cs_take = message.cs_release = 0;
-
-        /* transfer message */
-        device->bus->ops->xfer(device, &message);
-    #endif
     }
     else
     {
-- 
GitLab