From fc78430a35be252a1cd5a29b5b66290a68cd9ca3 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 27 八月 2024 17:21:18 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/include/drivers/mk_spi.c | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/keil/include/drivers/mk_spi.c b/keil/include/drivers/mk_spi.c
index 5bcd345..431f7d0 100644
--- a/keil/include/drivers/mk_spi.c
+++ b/keil/include/drivers/mk_spi.c
@@ -91,37 +91,37 @@
// update state
switch (spi_handle[id].state)
{
- case SPI_STATE_READY:
- spi_handle[id].state = state;
- break;
- case SPI_STATE_BUSY_RX:
- if (state == SPI_STATE_BUSY_TX)
- {
- spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
- }
- else
- {
- ret = DRV_BUSY;
- }
- break;
- case SPI_STATE_BUSY_TX:
- if (state == SPI_STATE_BUSY_RX)
- {
- spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
- }
- else
- {
- ret = DRV_BUSY;
- }
- break;
- case SPI_STATE_BUSY_TX_RX:
+ case SPI_STATE_READY:
+ spi_handle[id].state = state;
+ break;
+ case SPI_STATE_BUSY_RX:
+ if (state == SPI_STATE_BUSY_TX)
+ {
+ spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
+ }
+ else
+ {
ret = DRV_BUSY;
- break;
- case SPI_STATE_RESET:
- case SPI_STATE_TIMEOUT:
- case SPI_STATE_ERROR:
- ret = DRV_ERROR;
- break;
+ }
+ break;
+ case SPI_STATE_BUSY_TX:
+ if (state == SPI_STATE_BUSY_RX)
+ {
+ spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
+ }
+ else
+ {
+ ret = DRV_BUSY;
+ }
+ break;
+ case SPI_STATE_BUSY_TX_RX:
+ ret = DRV_BUSY;
+ break;
+ case SPI_STATE_RESET:
+ case SPI_STATE_TIMEOUT:
+ case SPI_STATE_ERROR:
+ ret = DRV_ERROR;
+ break;
}
int_unlock(lock);
--
Gitblit v1.9.3