|
17 | 17 |
|
18 | 18 | static void edpt_activate(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc) { |
19 | 19 | dwc2_regs_t* dwc2 = DWC2_REG(rhport); |
20 | | -@@ -336,7 +346,18 @@ |
21 | | - dwc2->epout[epnum].doepctl = dxepctl; |
22 | | - dwc2->daintmsk |= TU_BIT(DAINTMSK_OEPM_Pos + epnum); |
23 | | - } else { |
24 | | -- dwc2->epin[epnum].diepctl = dxepctl | (epnum << DIEPCTL_TXFNUM_Pos); |
| 20 | +@@ -332,7 +342,19 @@ |
| 21 | + (p_endpoint_desc->bmAttributes.xfer != TUSB_XFER_ISOCHRONOUS ? DOEPCTL_SD0PID_SEVNFRM : 0) | |
| 22 | + (xfer->max_size << DOEPCTL_MPSIZ_Pos); |
| 23 | + if (dir == TUSB_DIR_IN) { |
| 24 | +- epctl |= (epnum << DIEPCTL_TXFNUM_Pos); |
| 25 | ++ //epctl |= (epnum << DIEPCTL_TXFNUM_Pos); |
25 | 26 | + uint8_t fifo_num = epnum; |
26 | 27 | +#if defined(TUP_USBIP_DWC2_ESP32) |
27 | 28 | + // Special Case for EP5, which is used by CDC but not actually called by the driver |
|
33 | 34 | + } |
34 | 35 | + //TU_ASSERT(fifo_num != 0); |
35 | 36 | +#endif |
36 | | -+ dwc2->epin[epnum].diepctl = dxepctl | (fifo_num << DIEPCTL_TXFNUM_Pos); |
37 | | - dwc2->daintmsk |= TU_BIT(DAINTMSK_IEPM_Pos + epnum); |
| 37 | ++ epctl |= (fifo_num << DIEPCTL_TXFNUM_Pos); |
38 | 38 | } |
39 | | - } |
40 | | -@@ -850,6 +871,10 @@ |
41 | | - xfer_status[n][TUSB_DIR_IN].max_size = 0; |
| 39 | + |
| 40 | + dwc2_dep_t* dep = &dwc2->ep[1 - dir][epnum]; |
| 41 | +@@ -840,6 +862,10 @@ |
| 42 | + } |
42 | 43 | } |
43 | 44 |
|
44 | 45 | +#if defined(TUP_USBIP_DWC2_ESP32) |
|
48 | 49 | dfifo_flush_tx(dwc2, 0x10); // all tx fifo |
49 | 50 | dfifo_flush_rx(dwc2); |
50 | 51 |
|
51 | | -@@ -1204,6 +1229,9 @@ |
| 52 | +@@ -1186,6 +1212,9 @@ |
52 | 53 | if (int_status & GINTSTS_USBRST) { |
53 | 54 | // USBRST is start of reset. |
54 | 55 | dwc2->gintsts = GINTSTS_USBRST; |
|
58 | 59 | bus_reset(rhport); |
59 | 60 | } |
60 | 61 |
|
61 | | -@@ -1235,7 +1263,11 @@ |
| 62 | +@@ -1217,7 +1246,11 @@ |
62 | 63 |
|
63 | 64 | if (int_status & GINTSTS_USBSUSP) { |
64 | 65 | dwc2->gintsts = GINTSTS_USBSUSP; |
|
71 | 72 | } |
72 | 73 |
|
73 | 74 | if (int_status & GINTSTS_WKUINT) { |
74 | | -@@ -1252,6 +1284,9 @@ |
| 75 | +@@ -1234,6 +1267,9 @@ |
75 | 76 |
|
76 | 77 | if (otg_int & GOTGINT_SEDET) { |
77 | 78 | dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true); |
|
0 commit comments