Merge pull request #343 from adafruit/more-max3421-2

move SPI beginTransaction()/endTransaction() to tuh_max3421_spi_cs_api()

Author: hathach

src/arduino/Adafruit_USBH_Host.cpp

@@ -197,11 +197,29 @@ extern "C" {
 
 void tuh_max3421_spi_cs_api(uint8_t rhport, bool active) {
   (void)rhport;
+
   if (!Adafruit_USBH_Host::_instance) {
     return;
   }
+  Adafruit_USBH_Host *host = Adafruit_USBH_Host::_instance;
+  SPIClass *spi = host->_spi;
 
-  digitalWrite(Adafruit_USBH_Host::_instance->_cs, active ? LOW : HIGH);
+  if (active) {
+    // MAX3421e max clock is 26MHz
+    // Depending on mcu ports, it may need to be clipped down
+#ifdef ARDUINO_ARCH_SAMD
+    // SAMD 21/51 can only work reliably at 12MHz
+    uint32_t const max_clock = 12000000ul;
+#else
+    uint32_t const max_clock = 26000000ul;
+#endif
+
+    spi->beginTransaction(SPISettings(max_clock, MSBFIRST, SPI_MODE0));
+    digitalWrite(Adafruit_USBH_Host::_instance->_cs, LOW);
+  } else {
+    spi->endTransaction();
+    digitalWrite(Adafruit_USBH_Host::_instance->_cs, HIGH);
+  }
 }
 
 bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
@@ -212,19 +230,7 @@ bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
     return false;
   }
   Adafruit_USBH_Host *host = Adafruit_USBH_Host::_instance;
-
-  // MAX3421e max clock is 26MHz
-  // Depending on mcu ports, it may need to be clipped down
-#ifdef ARDUINO_ARCH_SAMD
-  // SAMD 21/51 can only work reliably at 12MHz
-  uint32_t const max_clock = 12000000ul;
-#else
-  uint32_t const max_clock = 26000000ul;
-//  uint32_t const max_clock = 4000000ul;
-#endif
-
-  SPISettings config(max_clock, MSBFIRST, SPI_MODE0);
-  host->_spi->beginTransaction(config);
+  SPIClass *spi = host->_spi;
 
 #ifdef ARDUINO_ARCH_SAMD
   // SAMD cannot use transfer(tx_buf, rx_buf, len) API since it default to use
@@ -236,19 +242,18 @@ bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
     if (tx_buf) {
       data = tx_buf[count];
     }
-    data = host->_spi->transfer(data);
+    data = spi->transfer(data);
 
     if (rx_buf) {
       rx_buf[count] = data;
     }
   }
 #elif defined(ARDUINO_ARCH_ESP32)
-  host->_spi->transferBytes(tx_buf, rx_buf, xfer_bytes);
+  spi->transferBytes(tx_buf, rx_buf, xfer_bytes);
 #else
-  host->_spi->transfer(tx_buf, rx_buf, xfer_bytes);
+  spi->transfer(tx_buf, rx_buf, xfer_bytes);
 #endif
 
-  host->_spi->endTransaction();
   return true;
 }
 

src/portable/analog/max3421/hcd_max3421.c

@@ -422,7 +422,6 @@ bool hcd_init(uint8_t rhport) {
   (void) rhport;
 
   tuh_max3421_int_api(rhport, false);
-  tuh_max3421_spi_cs_api(rhport, false);
 
   TU_LOG2_INT(sizeof(max3421_ep_t));
   TU_LOG2_INT(sizeof(max3421_data_t));