summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimpleInit <[email protected]>2020-09-14 23:54:17 +0800
committerSimpleInit <[email protected]>2020-09-14 23:57:14 +0800
commita70808ce9e99faaa668ac75ae7c1a65ef22bbf3c (patch)
tree65bfa378e57136918e77cad0c33276740ca6f409
parentbfebcac4d3a3526d75d1e2d9be11e57bba7506df (diff)
删除非对齐地址访问语句和__CORTEX_M宏定义判断
Signed-off-by: SimpleInit <[email protected]>
-rw-r--r--components/drivers/spi/spi_msd.c23
1 files changed, 1 insertions, 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
{