update tinyusb with latest tuh_max3421_spi_xfer_api() signature

tested with nrf52840, samd21, samd51

Author: hathach

src/arduino/Adafruit_USBH_Host.cpp

@@ -153,7 +153,7 @@ void tuh_max3421_spi_cs_api(uint8_t rhport, bool active) {
 }
 
 bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
-                              size_t tx_len, uint8_t *rx_buf, size_t rx_len) {
+                              uint8_t *rx_buf, size_t xfer_bytes) {
   (void)rhport;
 
   if (!Adafruit_USBH_Host::_instance) {
@@ -167,27 +167,32 @@ bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
   // 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 = 26000000ul;
+  uint32_t const max_clock = 4000000ul;
 #endif
 
   SPISettings config(max_clock, MSBFIRST, SPI_MODE0);
   host->_spi->beginTransaction(config);
 
-  // TODO improve spi speed with burst transfer
-  for (size_t count = 0; count < tx_len || count < rx_len; count++) {
+#ifdef ARDUINO_ARCH_SAMD
+  // SAMD cannot use transfer(tx_buf, rx_buf, len) API since it default to use
+  // DMA. However, since this can be invoked within EIC_Handler (ISR) which may
+  // have priority higher than DMA ISR. That will cause blocking wait for
+  // dma_busy not working
+  for (size_t count = 0; count < xfer_bytes; count++) {
     uint8_t data = 0x00;
-
-    // TX
-    if (count < tx_len) {
+    if (tx_buf) {
       data = tx_buf[count];
     }
     data = host->_spi->transfer(data);
 
-    // RX
-    if (count < rx_len) {
+    if (rx_buf) {
       rx_buf[count] = data;
     }
   }
+#else
+  host->_spi->transfer(tx_buf, rx_buf, xfer_bytes);
+#endif
 
   host->_spi->endTransaction();
   return true;
@@ -241,7 +246,8 @@ void tuh_max3421_int_api(uint8_t rhport, bool enabled) {
 #error "MAX3421e host is not Unsupported by this architecture"
 #endif
 }
-}
+
+} // extern C
 #endif
 
 #endif

src/arduino/Adafruit_USBH_Host.h

@@ -36,7 +36,7 @@
 extern "C" {
 void tuh_max3421_spi_cs_api(uint8_t rhport, bool active);
 bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
-                              size_t tx_len, uint8_t *rx_buf, size_t rx_len);
+                              uint8_t *rx_buf, size_t xfer_bytes);
 void tuh_max3421_int_api(uint8_t rhport, bool enabled);
 }
 
@@ -66,17 +66,9 @@ class Adafruit_USBH_Host {
   static Adafruit_USBH_Host *_instance;
 
 private:
-  //  uint16_t const *descrip`tor_string_cb(uint8_t index, uint16_t langid);
-  //
-  //  friend uint8_t const *tud_descriptor_device_cb(void);
-  //  friend uint8_t const *tud_descriptor_configuration_cb(uint8_t index);
-  //  friend uint16_t const *tud_descriptor_string_cb(uint8_t index,
-  //                                                  uint16_t langid);
-
   friend void tuh_max3421_spi_cs_api(uint8_t rhport, bool active);
   friend bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const *tx_buf,
-                                       size_t tx_len, uint8_t *rx_buf,
-                                       size_t rx_len);
+                                       uint8_t *rx_buf, size_t xfer_bytes);
   friend void tuh_max3421_int_api(uint8_t rhport, bool enabled);
 };
 

src/class/hid/hid_device.c

@@ -36,7 +36,6 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-
 #include "device/usbd.h"
 #include "device/usbd_pvt.h"
 

src/class/midi/midi_device.c

@@ -36,7 +36,6 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-
 #include "device/usbd.h"
 #include "device/usbd_pvt.h"
 

src/class/usbtmc/usbtmc_device.c

@@ -67,15 +67,15 @@
 // Ability to defer status byte transmission
 // Transmission of status byte in response to USB488 SRQ condition
 
-#include "tusb_option.h"
-
-#if (CFG_TUD_ENABLED && CFG_TUD_USBTMC)
-
 // ESP32 out-of-sync
 #ifdef ARDUINO_ARCH_ESP32
 #include "arduino/ports/esp32/tusb_config_esp32.h"
 #endif
 
+#include "tusb_option.h"
+
+#if (CFG_TUD_ENABLED && CFG_TUD_USBTMC)
+
 #include "device/usbd.h"
 #include "device/usbd_pvt.h"
 

src/portable/analog/max3421/hcd_max3421.c

@@ -215,16 +215,21 @@ static max3421_data_t _hcd_data;
 // API: SPI transfer with MAX3421E, must be implemented by application
 //--------------------------------------------------------------------+
 
-void tuh_max3421_spi_cs_api(uint8_t rhport, bool active);
-bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const * tx_buf, size_t tx_len, uint8_t * rx_buf, size_t rx_len);
-void tuh_max3421_int_api(uint8_t rhport, bool enabled);
+// API to control MAX3421 SPI CS
+extern void tuh_max3421_spi_cs_api(uint8_t rhport, bool active);
 
-static void handle_connect_irq(uint8_t rhport, bool in_isr);
-static inline void hirq_write(uint8_t rhport, uint8_t data, bool in_isr);
+// API to transfer data with MAX3421 SPI
+// Either tx_buf or rx_buf can be NULL, which means transfer is write or read only
+extern bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const* tx_buf, uint8_t* rx_buf, size_t xfer_bytes);
+
+// API to enable/disable MAX3421 INTR pin interrupt
+extern void tuh_max3421_int_api(uint8_t rhport, bool enabled);
 
 //--------------------------------------------------------------------+
 // SPI Helper
 //--------------------------------------------------------------------+
+static void handle_connect_irq(uint8_t rhport, bool in_isr);
+static inline void hirq_write(uint8_t rhport, uint8_t data, bool in_isr);
 
 static void max3421_spi_lock(uint8_t rhport, bool in_isr) {
   // disable interrupt and mutex lock (for pre-emptive RTOS) if not in_isr
@@ -254,9 +259,9 @@ static void fifo_write(uint8_t rhport, uint8_t reg, uint8_t const * buffer, uint
 
   max3421_spi_lock(rhport, in_isr);
 
-  tuh_max3421_spi_xfer_api(rhport, &reg, 1, &hirq, 1);
+  tuh_max3421_spi_xfer_api(rhport, &reg, &hirq, 1);
   _hcd_data.hirq = hirq;
-  tuh_max3421_spi_xfer_api(rhport, buffer, len, NULL, 0);
+  tuh_max3421_spi_xfer_api(rhport, buffer, NULL, len);
 
   max3421_spi_unlock(rhport, in_isr);
 
@@ -268,9 +273,9 @@ static void fifo_read(uint8_t rhport, uint8_t * buffer, uint16_t len, bool in_is
 
   max3421_spi_lock(rhport, in_isr);
 
-  tuh_max3421_spi_xfer_api(rhport, &reg, 1, &hirq, 1);
+  tuh_max3421_spi_xfer_api(rhport, &reg, &hirq, 1);
   _hcd_data.hirq = hirq;
-  tuh_max3421_spi_xfer_api(rhport, NULL, 0, buffer, len);
+  tuh_max3421_spi_xfer_api(rhport, NULL, buffer, len);
 
   max3421_spi_unlock(rhport, in_isr);
 }
@@ -281,7 +286,7 @@ static void reg_write(uint8_t rhport, uint8_t reg, uint8_t data, bool in_isr) {
 
   max3421_spi_lock(rhport, in_isr);
 
-  tuh_max3421_spi_xfer_api(rhport, tx_buf, 2, rx_buf, 2);
+  tuh_max3421_spi_xfer_api(rhport, tx_buf, rx_buf, 2);
 
   max3421_spi_unlock(rhport, in_isr);
 
@@ -295,7 +300,7 @@ static uint8_t reg_read(uint8_t rhport, uint8_t reg, bool in_isr) {
 
   max3421_spi_lock(rhport, in_isr);
 
-  bool ret = tuh_max3421_spi_xfer_api(rhport, tx_buf, 2, rx_buf, 2);
+  bool ret = tuh_max3421_spi_xfer_api(rhport, tx_buf, rx_buf, 2);
 
   max3421_spi_unlock(rhport, in_isr);