From 11a54bc8e185c58fa5c72b6913ac07e3a3060be6 Mon Sep 17 00:00:00 2001
From: IngHK <github@hkue.de>
Date: Sat, 30 Mar 2024 14:16:13 +0100
Subject: [PATCH] renamed define NAK_RETRY_HANDLING to
 CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME as official option

---
 src/portable/analog/max3421/hcd_max3421.c | 9 +++++----
 src/tusb_option.h                         | 9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/portable/analog/max3421/hcd_max3421.c b/src/portable/analog/max3421/hcd_max3421.c
index 9209865d4..09de1bc5a 100644
--- a/src/portable/analog/max3421/hcd_max3421.c
+++ b/src/portable/analog/max3421/hcd_max3421.c
@@ -28,7 +28,6 @@
 
 #if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
 
-#define NAK_RETRY_HANDLING 1
 #define PUTCHAR_LOGS 0 // TODO to be deleted later
 
 #include <stdatomic.h>
@@ -169,6 +168,8 @@ enum {
   DEFAULT_HIEN = HIRQ_CONDET_IRQ | HIRQ_FRAME_IRQ | HIRQ_HXFRDN_IRQ | HIRQ_RCVDAV_IRQ
 };
 
+TU_VERIFY_STATIC(CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME >= 0 && CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME <= 1, "unsupported attemp quantity");
+
 //--------------------------------------------------------------------+
 //
 //--------------------------------------------------------------------+
@@ -183,7 +184,7 @@ typedef struct {
     uint8_t data_toggle   : 1;
     uint8_t xfer_pending  : 1;
     uint8_t xfer_complete : 1;
-#if NAK_RETRY_HANDLING
+#if CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME
     uint8_t retry_pending : 1;
 #endif
   };
@@ -832,7 +833,7 @@ static void handle_xfer_done(uint8_t rhport, bool in_isr) {
         // NAK on control, retry immediately
         hxfr_write(rhport, _hcd_data.hxfr, in_isr);
       } else {
-      #if NAK_RETRY_HANDLING
+      #if CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME
         ep->retry_pending = 1;
         ep->xfer_pending = 0;
         max3421_ep_t * next_ep = find_next_pending_ep(ep);
@@ -946,7 +947,7 @@ void hcd_int_handler(uint8_t rhport, bool in_isr) {
 #endif
     _hcd_data.frame_count++;
 
-#if NAK_RETRY_HANDLING
+#if CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME
     // retry EPs
     max3421_ep_t * next_ep = NULL;
     for (size_t i = 0; i < CFG_TUH_MAX3421_ENDPOINT_TOTAL; i++) {
diff --git a/src/tusb_option.h b/src/tusb_option.h
index 22f27e9e1..68eb4882c 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -529,6 +529,15 @@
   #define CFG_TUH_MAX3421  0
 #endif
 
+// MAX3421 Host max. transfer attemps per frame (except control and iso)
+// temporary only one attemp (no retry) per frame allowed (more in work)
+// retry quantity = (CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME - 1)
+// 0 = endless retries in current frame. is default to keep compatibility
+#ifndef CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME
+  #define CFG_TUH_MAX3421_MAX_ATTEMPS_PER_FRAME 0
+#endif
+
+
 //--------------------------------------------------------------------+
 // TypeC Options (Default)
 //--------------------------------------------------------------------+