From fb56c02a6f7cc03b2f9fd970a5b1bc772ccf4795 Mon Sep 17 00:00:00 2001
From: Peter Lawrence <12226419+majbthrd@users.noreply.github.com>
Date: Sun, 15 Mar 2020 17:10:14 -0500
Subject: NUC505 : fix operation with net_lwip_webserver

---
 src/portable/nuvoton/nuc505/dcd_nuc505.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/portable/nuvoton/nuc505/dcd_nuc505.c b/src/portable/nuvoton/nuc505/dcd_nuc505.c
index 2b6a66bc2..031bfc5e4 100644
--- a/src/portable/nuvoton/nuc505/dcd_nuc505.c
+++ b/src/portable/nuvoton/nuc505/dcd_nuc505.c
@@ -211,6 +211,7 @@ static void bus_reset(void)
   current_dma_xfer = NULL;
 }
 
+#if 0
 /* this must only be called by the ISR; it does its best to share the single DMA engine across all user EPs (IN and OUT) */
 static void service_dma(void)
 {
@@ -243,6 +244,7 @@ static void service_dma(void)
     return;
   }
 }
+#endif
 
 /* centralized location for USBD interrupt enable bit masks */
 static const uint32_t enabled_irqs = USBD_GINTEN_USBIEN_Msk | \
@@ -366,7 +368,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to
       for (int count = 0; count < total_bytes; count++)
         *buffer++ = USBD->CEPDAT_BYTE;
       
-      usb_control_send_zlp();
+      dcd_event_xfer_complete(0, ep_addr, total_bytes, XFER_RESULT_SUCCESS, true);
     }
   }
   else
@@ -465,6 +467,7 @@ void USBD_IRQHandler(void)
 
     if (bus_state & USBD_BUSINTSTS_DMADONEIF_Msk)
     {
+#if 0
       if (current_dma_xfer)
       {
         current_dma_xfer->dma_requested = false;
@@ -480,6 +483,7 @@ void USBD_IRQHandler(void)
         current_dma_xfer = NULL;
         service_dma();
       }
+#endif
     }
 
     if (bus_state & USBD_BUSINTSTS_VBUSDETIF_Msk)
@@ -597,7 +601,7 @@ void USBD_IRQHandler(void)
 
         if (out_ep)
         {
-#if 1
+#if 0
           xfer->dma_requested = true;
           service_dma();
 #else
-- 
cgit v1.3.1


From df05440d92f0d05532476df5f544d00751f03bce Mon Sep 17 00:00:00 2001
From: Peter Lawrence <12226419+majbthrd@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:20:17 -0500
Subject: NUC505 : added comment on DMA choice

---
 src/portable/nuvoton/nuc505/dcd_nuc505.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/portable/nuvoton/nuc505/dcd_nuc505.c b/src/portable/nuvoton/nuc505/dcd_nuc505.c
index 031bfc5e4..e05e73eff 100644
--- a/src/portable/nuvoton/nuc505/dcd_nuc505.c
+++ b/src/portable/nuvoton/nuc505/dcd_nuc505.c
@@ -33,6 +33,12 @@
   nomenclature of EPA through EPL.
 */
 
+/*
+  Note on OPT_MCU_NUC505_USB_DMA: the author suggests against using this option.
+  The DMA functionality of the USBD peripheral does not appear to succeed with
+  transfer lengths that are longer (> 64 bytes) and are not a multiple of 4.
+*/
+
 #include "tusb_option.h"
 
 #if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_NUC505)
@@ -211,7 +217,7 @@ static void bus_reset(void)
   current_dma_xfer = NULL;
 }
 
-#if 0
+#ifdef OPT_MCU_NUC505_USB_DMA
 /* this must only be called by the ISR; it does its best to share the single DMA engine across all user EPs (IN and OUT) */
 static void service_dma(void)
 {
@@ -467,7 +473,7 @@ void USBD_IRQHandler(void)
 
     if (bus_state & USBD_BUSINTSTS_DMADONEIF_Msk)
     {
-#if 0
+#ifdef OPT_MCU_NUC505_USB_DMA
       if (current_dma_xfer)
       {
         current_dma_xfer->dma_requested = false;
@@ -601,7 +607,7 @@ void USBD_IRQHandler(void)
 
         if (out_ep)
         {
-#if 0
+#ifdef OPT_MCU_NUC505_USB_DMA
           xfer->dma_requested = true;
           service_dma();
 #else
-- 
cgit v1.3.1