1. 在rt-thread\bsp\nrf5x\nrf52840\.ci\attachconfig\ci.attachconfig.yml中添加了spim的相关设置。

HaryyZ · HaryyZ · commit 1d13e5061c58 · 2025-08-15T19:38:35.000+08:00
devices.spim:
    kconfig:
      - CONFIG_RT_USING_SPIM=y
      - CONFIG_BSP_USING_SPIM=y
2. nrfx_dpim.h 注释中纠正了错误的拼写
3. 多个文件中：nrfx_spim.c drv_spim.c drv_spim.h 删减了多余的宏定义：USING_SPI_DMA
4. nrfx_spim.c中删除了DMA_TRANS_MIN_LEN，该宏定义定义了spi+dma最小传输字节，直接定义20。
diff --git a/bsp/nrf5x/libraries/drivers/drv_spim.c b/bsp/nrf5x/libraries/drivers/drv_spim.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include "board.h"
 #include "drv_spim.h"
-#include "nrfx_spim.h"
 #include "rtconfig.h"
 #include <rtthread.h>
 #include <rtdevice.h>
@@ -233,28 +232,24 @@ static rt_err_t spim_configure(struct rt_spi_device *device,
     void * context = RT_NULL;
     nrfx_spim_evt_handler_t handler = RT_NULL;    /* spi send callback handler ,default NULL */
 
-    #if USING_SPI_DMA
-        /* create and init completion */
-        struct rt_completion *cpt = (struct rt_completion*)rt_malloc(sizeof(struct rt_completion));
-        rt_completion_init(cpt);
-
-        /* create and init message about spim */
-        struct spi_dma_message *mess = (struct spi_dma_message*)rt_malloc(sizeof(struct spi_dma_message));
-        /* step 1 */
-        mess->cs_pin         = device->cs_pin;
-        /* step 2 */
-        mess->cs_take        = 0;
-        mess->cs_release     = 0;
-        /* step 3 */
-        mess->use_hw_ss      = config.use_hw_ss;
-        /* step 4 */
-        mess->ss_active_high = config.ss_active_high;
-        /* step 6 */
-        mess->cpt            = cpt;
-
-        context              = (void*)mess;
-        handler              = spim_handler[index];
-    #endif
+    /* create and init completion */
+    struct rt_completion *cpt = (struct rt_completion*)rt_malloc(sizeof(struct rt_completion));
+    rt_completion_init(cpt);
+    /* create and init message about spim */
+    struct spi_dma_message *mess = (struct spi_dma_message*)rt_malloc(sizeof(struct spi_dma_message));
+    /* step 1: cs pin */
+    mess->cs_pin         = device->cs_pin;
+    /* step 2: cs pin behavior */
+    mess->cs_take        = 0;
+    mess->cs_release     = 0;
+    /* step 3 */
+    mess->use_hw_ss      = config.use_hw_ss;
+    /* step 4: cs pin active */
+    mess->ss_active_high = config.ss_active_high;
+    /* step 6 */
+    mess->cpt            = cpt;
+    context              = (void*)mess;
+    handler              = spim_handler[index];
 
     nrfx_err_t nrf_ret = nrfx_spim_init(&spim, &config, handler, context);
     if(NRFX_SUCCESS == nrf_ret)
diff --git a/bsp/nrf5x/libraries/drivers/drv_spim.h b/bsp/nrf5x/libraries/drivers/drv_spim.h
@@ -11,10 +11,6 @@
 #include "nrf_spi.h"
 #include "rtconfig.h"
 
-#define USING_SPI_DMA 1
-
-#if USING_SPI_DMA
-
 struct spi_dma_message
 {
     rt_base_t cs_pin;
@@ -30,8 +26,6 @@ struct spi_dma_message
 
 };
 
-#endif
-
 /**
  * @brief Attach the spi device to SPIM bus, this function must be used after initialization.
  * @param bus_name     spim bus name  "spim0"/"spim1"/"spim2"/"spim3"
diff --git a/bsp/nrf5x/libraries/drivers/nrfx_spim.c b/bsp/nrf5x/libraries/drivers/nrfx_spim.c
@@ -569,58 +569,32 @@ static void spim_int_enable(NRF_SPIM_Type * p_spim, bool enable);
 
 static void finish_transfer(spim_control_block_t * p_cb)
 {
-
-    #if USING_SPI_DMA
-        struct spi_dma_message *mess = (struct spi_dma_message*)(p_cb->p_context);
-        if (mess->cs_pin != PIN_NONE && mess->cs_release)
+    struct spi_dma_message *mess = (struct spi_dma_message*)(p_cb->p_context);
+    if (mess->cs_pin != PIN_NONE && mess->cs_release)
+    {
+    #if NRFX_CHECK(NRFX_SPIM_EXTENDED_ENABLED)
+        if (!mess->use_hw_ss)
+    #endif
         {
-        #if NRFX_CHECK(NRFX_SPIM_EXTENDED_ENABLED)
-            if (!mess->use_hw_ss)
-        #endif
+            if (mess->ss_active_high)
             {
-                if (mess->ss_active_high)
-                {
-                    nrf_gpio_pin_clear(mess->cs_pin);
-                }
-                else
-                {
-                    nrf_gpio_pin_set(mess->cs_pin);
-                }
+                nrf_gpio_pin_clear(mess->cs_pin);
             }
-        }
-
-    #else
-        /* If Slave Select signal is used, this is the time to deactivate it. */
-        if (p_cb->ss_pin != NRFX_SPIM_PIN_NOT_USED)
-        {
-        #if NRFX_CHECK(NRFX_SPIM_EXTENDED_ENABLED)
-            if (!p_cb->use_hw_ss)
-        #endif
+            else
             {
-                if (p_cb->ss_active_high)
-                {
-                    nrf_gpio_pin_clear(p_cb->ss_pin);
-                }
-                else
-                {
-                    nrf_gpio_pin_set(p_cb->ss_pin);
-                }
+                nrf_gpio_pin_set(mess->cs_pin);
             }
         }
-    #endif
-
-
+    }
     /* By clearing this flag before calling the handler we allow subsequent */
     /* transfers to be started directly from the handler function. */
     p_cb->transfer_in_progress = false;
 
     p_cb->evt.type = NRFX_SPIM_EVENT_DONE;
     p_cb->handler(&p_cb->evt, p_cb->p_context);
 
-    #if USING_SPI_DMA
-        spim_int_enable(mess->spim, ((mess->flags) & NRFX_SPIM_FLAG_NO_XFER_EVT_HANDLER));
-        rt_completion_done(mess->cpt);
-    #endif
+    spim_int_enable(mess->spim, ((mess->flags) & NRFX_SPIM_FLAG_NO_XFER_EVT_HANDLER));
+    rt_completion_done(mess->cpt);
 }
 
 static void spim_int_enable(NRF_SPIM_Type * p_spim, bool enable)
@@ -813,8 +787,6 @@ static nrfx_err_t rtt_spim_xfer(NRF_SPIM_Type           * p_spim,
                             struct rt_spi_message       * message,
                             struct rt_spi_device        * dev)
 {
-    #define DMA_TRANS_MIN_LEN  (20) /* only buffer length >= DMA_TRANS_MIN_LEN will use DMA mode */
-
     nrfx_err_t err_code;
     /* EasyDMA requires that transfer buffers are placed in Data RAM region; */
     /* signal error if they are not. */
@@ -829,13 +801,11 @@ static nrfx_err_t rtt_spim_xfer(NRF_SPIM_Type           * p_spim,
         return err_code;
     }
 
-    #if USING_SPI_DMA
-        struct spi_dma_message *mess = (struct spi_dma_message *)(p_cb->p_context);
-        mess->cs_take = message->cs_take;
-        mess->cs_release = message->cs_release;
-        mess->flags = flags;
-        mess->spim = p_spim;
-    #endif
+    struct spi_dma_message *mess = (struct spi_dma_message *)(p_cb->p_context);
+    mess->cs_take = message->cs_take;
+    mess->cs_release = message->cs_release;
+    mess->flags = flags;
+    mess->spim = p_spim;
 
     nrf_spim_event_clear(p_spim, NRF_SPIM_EVENT_END);
 
@@ -873,9 +843,9 @@ static nrfx_err_t rtt_spim_xfer(NRF_SPIM_Type           * p_spim,
     }
 #endif
 
-    if (p_cb->handler == RT_NULL || (p_xfer_desc->rx_length<= DMA_TRANS_MIN_LEN && p_xfer_desc->tx_length<= DMA_TRANS_MIN_LEN))
+    if (p_cb->handler == RT_NULL || (p_xfer_desc->rx_length<= 20 && p_xfer_desc->tx_length<= 20))
     {
-        /* no cb func or lenth < DMA_TRANS_MIN_LEN, wait for transfer end */
+        /* no cb func or lenth < 20, wait for transfer end */
 /*      spim_int_enable(p_spim, ((mess->flags) & NRFX_SPIM_FLAG_NO_XFER_EVT_HANDLER)); */
         if (!(flags & NRFX_SPIM_FLAG_HOLD_XFER))
         {
@@ -909,17 +879,13 @@ static nrfx_err_t rtt_spim_xfer(NRF_SPIM_Type           * p_spim,
     }
     else
     {
-        #if USING_SPI_DMA
-            spim_int_enable(p_spim, !(flags & NRFX_SPIM_FLAG_NO_XFER_EVT_HANDLER));
-            p_cb->transfer_in_progress = false;
-            if (rt_completion_wait(mess->cpt, 5000) != RT_EOK)
-                {
-                    rt_kprintf("wait for DMA interrupt overtime!");
-                    return NRFX_ERROR_TIMEOUT;
-                }
-        #else
-            spim_int_enable(p_spim, !(flags & NRFX_SPIM_FLAG_NO_XFER_EVT_HANDLER));
-        #endif
+        spim_int_enable(p_spim, !(flags & NRFX_SPIM_FLAG_NO_XFER_EVT_HANDLER));
+        p_cb->transfer_in_progress = false;
+        if (rt_completion_wait(mess->cpt, 5000) != RT_EOK)
+            {
+                rt_kprintf("wait for DMA interrupt overtime!");
+                return NRFX_ERROR_TIMEOUT;
+            }
     }
     err_code = NRFX_SUCCESS;
     NRFX_LOG_INFO("Function: %s, error code: %s.", __func__, NRFX_LOG_ERROR_STRING_GET(err_code));
diff --git a/bsp/nrf5x/libraries/drivers/nrfx_spim.h b/bsp/nrf5x/libraries/drivers/nrfx_spim.h
@@ -160,7 +160,7 @@ typedef struct
  * - SS pin active low
  * - over-run character set to 0xFF
  * - clock frequency: 4 MHz
- * - mode: 0 (SCK active high, sample on leading edge of the clock signa;)
+ * - mode: 0 (SCK active high, sample on leading edge of the clock signal;)
  * - MSB shifted out first
  * - MISO pull-up disabled
  *
@@ -334,7 +334,6 @@ nrfx_err_t nrfx_spim_xfer(nrfx_spim_t const *           p_instance,
                           nrfx_spim_xfer_desc_t const * p_xfer_desc,
                           uint32_t                      flags);
 
-
 nrfx_err_t rtt_nrfx_spim_xfer(nrfx_spim_t const *         p_instance,
                             nrfx_spim_xfer_desc_t const * p_xfer_desc,
                             uint32_t                      flags,
diff --git a/bsp/nrf5x/nrf52840/.ci/attachconfig/ci.attachconfig.yml b/bsp/nrf5x/nrf52840/.ci/attachconfig/ci.attachconfig.yml
@@ -19,6 +19,10 @@ devices.spi:
     kconfig:
       - CONFIG_RT_USING_SPI=y
       - CONFIG_BSP_USING_SPI=y
+devices.spim:
+    kconfig:
+      - CONFIG_RT_USING_SPIM=y
+      - CONFIG_BSP_USING_SPIM=y
 devices.uart:
     kconfig:
       - CONFIG_BSP_USING_UART=y
diff --git a/bsp/nrf5x/nrf52840/board/Kconfig b/bsp/nrf5x/nrf52840/board/Kconfig
@@ -351,7 +351,6 @@ menu "On-chip Peripheral Drivers"
                     range 0 47
                     default 31
             endif
-            
 
         config BSP_USING_SPIM3
             bool "Enable SPIM3 bus"
