andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NUC505 : fix operation with net_lwip_webserver

Browse Source
This commit is contained in:
Peter Lawrence
2020-03-15 17:10:14 -05:00
parent a0eb8a2651
commit fb56c02a6f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/net_lwip_webserver/src/tusb_config.h
View File

@@ -39,7 +39,7 @@
#error CFG_TUSB_MCU must be defined #error CFG_TUSB_MCU must be defined
#endif #endif
#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX #if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || CFG_TUSB_MCU == OPT_MCU_NUC505
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED)
#else #else
#define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE

8
src/portable/nuvoton/nuc505/dcd_nuc505.c
View File

@@ -211,6 +211,7 @@ static void bus_reset(void)
current_dma_xfer = NULL; 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) */ /* 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) static void service_dma(void)
{ {
@@ -243,6 +244,7 @@ static void service_dma(void)
return; return;
} }
} }
#endif
/* centralized location for USBD interrupt enable bit masks */ /* centralized location for USBD interrupt enable bit masks */
static const uint32_t enabled_irqs = USBD_GINTEN_USBIEN_Msk | \ 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++) for (int count = 0; count < total_bytes; count++)
*buffer++ = USBD->CEPDAT_BYTE; *buffer++ = USBD->CEPDAT_BYTE;
usb_control_send_zlp(); dcd_event_xfer_complete(0, ep_addr, total_bytes, XFER_RESULT_SUCCESS, true);
} }
} }
else else
@@ -465,6 +467,7 @@ void USBD_IRQHandler(void)
if (bus_state & USBD_BUSINTSTS_DMADONEIF_Msk) if (bus_state & USBD_BUSINTSTS_DMADONEIF_Msk)
{ {
#if 0
if (current_dma_xfer) if (current_dma_xfer)
{ {
current_dma_xfer->dma_requested = false; current_dma_xfer->dma_requested = false;
@@ -480,6 +483,7 @@ void USBD_IRQHandler(void)
current_dma_xfer = NULL; current_dma_xfer = NULL;
service_dma(); service_dma();
} }
#endif
} }
if (bus_state & USBD_BUSINTSTS_VBUSDETIF_Msk) if (bus_state & USBD_BUSINTSTS_VBUSDETIF_Msk)
@@ -597,7 +601,7 @@ void USBD_IRQHandler(void)
if (out_ep) if (out_ep)
{ {
#if 1 #if 0
xfer->dma_requested = true; xfer->dma_requested = true;
service_dma(); service_dma();
#else #else