- removed transfer(buf, rxbuf, t count) to comply with the requirement that no new functions shall be added that are not defined in the standard Arduino API

Author: RudolphRiedel

libraries/SPI/SPI.cpp

@@ -300,87 +300,6 @@ void ArduinoSPI::transfer(void *buf, size_t count)
     }
 }
 
-void ArduinoSPI::transfer(void *buf, void *rxbuf, size_t count)
-{
-    if (_is_sci) {
-        _spi_cb_event[_cb_event_idx] = SPI_EVENT_TRANSFER_ABORTED;
-
-        _write_then_read(&_spi_sci_ctrl, buf, rxbuf, count, SPI_BIT_WIDTH_8_BITS);
-
-        for (auto const start = millis();
-            (SPI_EVENT_TRANSFER_COMPLETE != _spi_cb_event[_cb_event_idx]) && (millis() - start < 1000); )
-        {
-            __NOP();
-        }
-        if (SPI_EVENT_TRANSFER_ABORTED == _spi_cb_event[_cb_event_idx])
-        {
-            end();
-        }
-    }
-    else {
-        size_t n32 = count / 4U;
-        if (n32 != 0U) {
-            _spi_ctrl.p_regs->SPCR_b.SPE = 0; /* disable SPI unit */
-            _spi_ctrl.p_regs->SPDCR = R_SPI0_SPDCR_SPLW_Msk; /* SPI word access */
-            _spi_ctrl.p_regs->SPCMD_b[0].SPB = 2; /* spi bit width = 32 */
-            _spi_ctrl.p_regs->SPCR_b.SPE = 1; /* enable SPI unit */
-
-            const uint32_t* tx32 = (const uint32_t *) buf;
-            uint32_t* rx32 = (uint32_t *) rxbuf;
-            size_t index_rx = 0;
-            size_t index_tx = 0;
-
-            while ((index_tx < 2U) && (index_tx < n32)) {
-                if (_spi_ctrl.p_regs->SPSR_b.SPTEF) {
-                    _spi_ctrl.p_regs->SPDR = (buf != NULL) ? tx32[index_tx] : 0xFFFFFFFF;
-                    index_tx++;
-                }
-            }
-
-            while (index_tx < n32) {
-                if (_spi_ctrl.p_regs->SPSR_b.SPRF) {
-                    uint32_t tmp = _spi_ctrl.p_regs->SPDR;
-                    _spi_ctrl.p_regs->SPDR = (buf != NULL) ? tx32[index_tx] : 0xFFFFFFFF;
-                    if (rxbuf != NULL) {
-                        rx32[index_rx] = tmp;
-                    }
-                    index_rx++;
-                    index_tx++;
-                }
-            }
-
-            while (index_rx < n32) { /* collect the last word received */
-                if (_spi_ctrl.p_regs->SPSR_b.SPRF) {
-                    uint32_t tmp = _spi_ctrl.p_regs->SPDR;
-                    if (rxbuf != NULL) {
-                        rx32[index_rx] = tmp;
-                    }
-                    index_rx++;
-                }
-            }
-
-            _spi_ctrl.p_regs->SPCR_b.SPE = 0; /* disable SPI unit */
-            _spi_ctrl.p_regs->SPDCR = R_SPI0_SPDCR_SPBYT_Msk; /* SPI byte access */
-            _spi_ctrl.p_regs->SPCMD_b[0].SPB = 7; /* spi bit width = 8 */
-            _spi_ctrl.p_regs->SPCR_b.SPE = 1; /* enable SPI unit */
-        }
-
-        /* send the remaining bytes with 8-bit transfers */
-        if (count != (4U * n32)) {
-            uint8_t *rx = (uint8_t *) rxbuf;
-            const uint8_t* tx = (const uint8_t *) buf;
-            for (size_t i = 4U * n32; i < count; i++) {
-                _spi_ctrl.p_regs->SPDR_BY = (buf != NULL) ? tx[i] : 0xFF;
-                while (0U == _spi_ctrl.p_regs->SPSR_b.SPRF) {}
-                uint8_t tmp = _spi_ctrl.p_regs->SPDR_BY;
-                if (rxbuf != NULL) {
-                    rx[i] = tmp;
-                }
-            }
-        }
-    }
-}
-
 void ArduinoSPI::beginTransaction(arduino::SPISettings settings)
 {
   if (!_is_initialized)

libraries/SPI/SPI.h

@@ -71,7 +71,6 @@ class ArduinoSPI : public SPIClass
     virtual uint8_t transfer(uint8_t data);
     virtual uint16_t transfer16(uint16_t data);
     virtual void transfer(void *buf, size_t count);
-    virtual void transfer(void *buf, void *rxbuf, size_t count);
 
     // Transaction Functions
     virtual void usingInterrupt(int __attribute__((unused)) interruptNumber) { }