diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-11-22 20:28:49 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-11-22 20:28:49 +0300 |
| commit | cb5606e536862ba545b47a4498d94ff462a641fb (patch) | |
| tree | c637db3044028a906cbc4c1ddea108cd15485e95 | |
| parent | 1e0e6c99252dee6aa20194f212aca3be6e68415a (diff) | |
Fixed a problem with the WiFi code when using the PDC
| -rw-r--r-- | src/Networking/ESP8266WiFi/WiFiInterface.cpp | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.cpp b/src/Networking/ESP8266WiFi/WiFiInterface.cpp index ed27f7dc..e91d626a 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.cpp +++ b/src/Networking/ESP8266WiFi/WiFiInterface.cpp @@ -1381,12 +1381,10 @@ static xdmac_channel_config_t xdmac_tx_cfg, xdmac_rx_cfg; #endif +#if !USE_PDC + static inline void spi_rx_dma_enable() noexcept { -#if USE_PDC - pdc_enable_transfer(spi_pdc, PERIPH_PTCR_RXTEN); -#endif - #if USE_DMAC dmac_channel_enable(DMAC, DmacChanWiFiRx); #endif @@ -1402,10 +1400,6 @@ static inline void spi_rx_dma_enable() noexcept static inline void spi_tx_dma_enable() noexcept { -#if USE_PDC - pdc_enable_transfer(spi_pdc, PERIPH_PTCR_TXTEN); -#endif - #if USE_DMAC dmac_channel_enable(DMAC, DmacChanWiFiTx); #endif @@ -1421,10 +1415,6 @@ static inline void spi_tx_dma_enable() noexcept static inline void spi_rx_dma_disable() noexcept { -#if USE_PDC - pdc_disable_transfer(spi_pdc, PERIPH_PTCR_RXTDIS); -#endif - #if USE_DMAC dmac_channel_disable(DMAC, DmacChanWiFiRx); #endif @@ -1440,10 +1430,6 @@ static inline void spi_rx_dma_disable() noexcept static inline void spi_tx_dma_disable() noexcept { -#if USE_PDC - pdc_disable_transfer(spi_pdc, PERIPH_PTCR_TXTDIS); -#endif - #if USE_DMAC dmac_channel_disable(DMAC, DmacChanWiFiTx); #endif @@ -1457,19 +1443,23 @@ static inline void spi_tx_dma_disable() noexcept #endif } +#endif + static void spi_dma_disable() noexcept { +#if USE_PDC + pdc_disable_transfer(spi_pdc, PERIPH_PTCR_TXTDIS | PERIPH_PTCR_RXTDIS); +#else spi_tx_dma_disable(); spi_rx_dma_disable(); +#endif } static inline void spi_dma_enable() noexcept { #if USE_PDC pdc_enable_transfer(spi_pdc, PERIPH_PTCR_TXTEN | PERIPH_PTCR_RXTEN); -#endif - -#if USE_DMAC || USE_XDMAC || USE_DMAC_MANAGER +#else spi_rx_dma_enable(); spi_tx_dma_enable(); #endif @@ -1643,19 +1633,10 @@ static void spi_rx_dma_setup(void *buf, uint32_t transferLength) noexcept */ void WiFiInterface::spi_slave_dma_setup(uint32_t dataOutSize, uint32_t dataInSize) noexcept { -#if USE_PDC - pdc_disable_transfer(spi_pdc, PERIPH_PTCR_TXTDIS | PERIPH_PTCR_RXTDIS); - spi_rx_dma_setup(&bufferIn, dataInSize + sizeof(MessageHeaderEspToSam)); - spi_tx_dma_setup(&bufferOut, dataOutSize + sizeof(MessageHeaderSamToEsp)); -#endif - -#if USE_DMAC || USE_XDMAC || USE_DMAC_MANAGER spi_dma_disable(); // if we don't do this we get strange crashes on the Duet 3 Mini DisableSpi(); spi_rx_dma_setup(bufferIn, dataInSize + sizeof(MessageHeaderEspToSam)); spi_tx_dma_setup(bufferOut, dataOutSize + sizeof(MessageHeaderSamToEsp)); -#endif - spi_dma_enable(); } |