From 4179334aca5b4085912f895ac2e5e8586efefd67 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 6 Apr 2020 17:35:11 +0700
Subject: [PATCH] call tud_irq_handler() for all nrf5x board

---
 hw/bsp/adafruit_clue/adafruit_clue.c                     | 9 +++++++++
 hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c           | 8 ++++++++
 .../circuitplayground_bluefruit.c                        | 8 ++++++++
 .../feather_nrf52840_express/feather_nrf52840_express.c  | 8 ++++++++
 hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c   | 8 ++++++++
 hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c         | 8 ++++++++
 hw/bsp/pca10056/pca10056.c                               | 8 ++++++++
 hw/bsp/pca10059/pca10059.c                               | 8 ++++++++
 hw/bsp/pca10100/pca10100.c                               | 8 ++++++++
 hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c             | 8 ++++++++
 src/device/dcd.h                                         | 2 +-
 src/portable/nordic/nrf5x/dcd_nrf5x.c                    | 4 +++-
 12 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/hw/bsp/adafruit_clue/adafruit_clue.c b/hw/bsp/adafruit_clue/adafruit_clue.c
index 67b5ffda..7b090dd4 100644
--- a/hw/bsp/adafruit_clue/adafruit_clue.c
+++ b/hw/bsp/adafruit_clue/adafruit_clue.c
@@ -35,6 +35,15 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c b/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c
index 941716c2..a3ab49a5 100644
--- a/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c
+++ b/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c
@@ -36,6 +36,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c b/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c
index 30742ab9..17e61970 100644
--- a/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c
+++ b/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c
@@ -35,6 +35,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
index a790b125..e36615ee 100644
--- a/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
+++ b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
@@ -36,6 +36,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c b/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c
index 473abc2d..fb4ef9af 100644
--- a/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c
+++ b/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c
@@ -35,6 +35,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c b/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c
index 86f02d3e..99db842a 100644
--- a/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c
+++ b/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c
@@ -35,6 +35,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/pca10056/pca10056.c b/hw/bsp/pca10056/pca10056.c
index 8d9764c3..ec34dbb9 100644
--- a/hw/bsp/pca10056/pca10056.c
+++ b/hw/bsp/pca10056/pca10056.c
@@ -36,6 +36,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/pca10059/pca10059.c b/hw/bsp/pca10059/pca10059.c
index e0f4bc93..72a85a9f 100644
--- a/hw/bsp/pca10059/pca10059.c
+++ b/hw/bsp/pca10059/pca10059.c
@@ -35,6 +35,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/pca10100/pca10100.c b/hw/bsp/pca10100/pca10100.c
index 8d9764c3..ec34dbb9 100644
--- a/hw/bsp/pca10100/pca10100.c
+++ b/hw/bsp/pca10100/pca10100.c
@@ -36,6 +36,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c b/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c
index 8bb5a173..62e6fa04 100644
--- a/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c
+++ b/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c
@@ -35,6 +35,14 @@
 #include "nrf_soc.h"
 #endif
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USBD_IRQHandler(void)
+{
+  tud_irq_handler(0);
+}
+
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
  *------------------------------------------------------------------*/
diff --git a/src/device/dcd.h b/src/device/dcd.h
index 7e976e0e..dbdc19dd 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -89,7 +89,7 @@ typedef struct TU_ATTR_ALIGNED(4)
 void dcd_init       (uint8_t rhport);
 
 // Interrupt Handler
-void dcd_irq_handler        (uint8_t rhport) TU_ATTR_USED;
+void dcd_irq_handler(uint8_t rhport) TU_ATTR_USED;
 
 // Enable device interrupt
 void dcd_int_enable (uint8_t rhport);
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c
index 2ce288d6..e54f475e 100644
--- a/src/portable/nordic/nrf5x/dcd_nrf5x.c
+++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -359,8 +359,10 @@ void bus_reset(void)
   _dcd.xfer[0][TUSB_DIR_OUT].mps = MAX_PACKET_SIZE;
 }
 
-void USBD_IRQHandler(void)
+void dcd_irq_handler(uint8_t rhport)
 {
+  (void) rhport;
+
   uint32_t const inten  = NRF_USBD->INTEN;
   uint32_t int_status = 0;