|
28 | 28 | /* Private typedef -----------------------------------------------------------*/
|
29 | 29 | /* Private define ------------------------------------------------------------*/
|
30 | 30 | /* Size in words, byte size divided by 2 */
|
31 |
| -#define PMA_EP0_OUT_ADDR (8 * 3) |
| 31 | +#define PMA_EP0_OUT_ADDR (8 * 4) |
32 | 32 | #define PMA_EP0_IN_ADDR (PMA_EP0_OUT_ADDR + USB_MAX_EP0_SIZE)
|
33 |
| -#define PMA_CDC_OUT_ADDR (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE) |
34 |
| -#define PMA_CDC_IN_ADDR (PMA_CDC_OUT_ADDR + USB_FS_MAX_PACKET_SIZE) |
| 33 | +#define PMA_CDC_OUT_BASE (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE) |
| 34 | +#define PMA_CDC_OUT_ADDR ((PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) | \ |
| 35 | + (PMA_CDC_OUT_BASE << 16U)) |
| 36 | +#define PMA_CDC_IN_ADDR (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) |
35 | 37 | #define PMA_CDC_CMD_ADDR (PMA_CDC_IN_ADDR + USB_FS_MAX_PACKET_SIZE)
|
36 | 38 | /* Private macro -------------------------------------------------------------*/
|
37 | 39 | /* Private variables ---------------------------------------------------------*/
|
@@ -376,6 +378,9 @@ void OTG_FS_IRQHandler(void)
|
376 | 378 | void USB_IRQHandler(void)
|
377 | 379 | #endif
|
378 | 380 | {
|
| 381 | + CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk; |
| 382 | + DWT->CYCCNT = 0; |
| 383 | + DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; |
379 | 384 | HAL_PCD_IRQHandler(&g_hpcd);
|
380 | 385 | }
|
381 | 386 |
|
@@ -489,9 +494,9 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
|
489 | 494 | #else
|
490 | 495 | HAL_PCDEx_PMAConfig(&g_hpcd, 0x00, PCD_SNG_BUF, PMA_EP0_OUT_ADDR);
|
491 | 496 | HAL_PCDEx_PMAConfig(&g_hpcd, 0x80, PCD_SNG_BUF, PMA_EP0_IN_ADDR);
|
492 |
| - HAL_PCDEx_PMAConfig(&g_hpcd, 0x01, PCD_SNG_BUF, PMA_CDC_OUT_ADDR); |
493 |
| - HAL_PCDEx_PMAConfig(&g_hpcd, 0x81, PCD_SNG_BUF, PMA_CDC_IN_ADDR); |
494 |
| - HAL_PCDEx_PMAConfig(&g_hpcd, 0x82, PCD_SNG_BUF, PMA_CDC_CMD_ADDR); |
| 497 | + HAL_PCDEx_PMAConfig(&g_hpcd, 0x01, PCD_DBL_BUF, PMA_CDC_OUT_ADDR); |
| 498 | + HAL_PCDEx_PMAConfig(&g_hpcd, 0x82, PCD_SNG_BUF, PMA_CDC_IN_ADDR); |
| 499 | + HAL_PCDEx_PMAConfig(&g_hpcd, 0x83, PCD_SNG_BUF, PMA_CDC_CMD_ADDR); |
495 | 500 | #endif
|
496 | 501 | #endif /* USE_USB_HS */
|
497 | 502 | return USBD_OK;
|
|
0 commit comments