From 12729ccc5ec76ef2b2818c2cd3b3d3e661682f38 Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Fri, 11 Mar 2022 17:30:23 +0800 Subject: [PATCH] remove unused comments --- port/ch32/usb_dc_usbfs.c | 15 ++++++--------- port/ch32/usb_dc_usbhs.c | 17 +++++++---------- port/fsdev/usb_dc_fsdev.c | 5 ----- port/mm32/usb_dc_mm32.c | 21 ++++++++------------- port/musb/usb_dc_musb.c | 6 +----- port/nuvoton/usb_dc_nuvoton.c | 5 ----- port/synopsys/usb_dc_synopsys.c | 5 ----- port/template/usb_dc.c | 5 ----- 8 files changed, 22 insertions(+), 57 deletions(-) diff --git a/port/ch32/usb_dc_usbfs.c b/port/ch32/usb_dc_usbfs.c index b8019570..af832838 100644 --- a/port/ch32/usb_dc_usbfs.c +++ b/port/ch32/usb_dc_usbfs.c @@ -1,6 +1,10 @@ #include "usbd_core.h" #include "usb_ch32_usbfs_reg.h" +#ifndef USBD_IRQHandler +#define USBD_IRQHandler OTG_FS_IRQHandler //use actual usb irq name instead +#endif + #ifndef USB_NUM_BIDIR_ENDPOINTS #define USB_NUM_BIDIR_ENDPOINTS 8 #endif @@ -33,7 +37,7 @@ __attribute__((aligned(4))) uint8_t EP5_DatabufHD[64 + 64]; //ep5_out(64)+ep5_in __attribute__((aligned(4))) uint8_t EP6_DatabufHD[64 + 64]; //ep6_out(64)+ep6_in(64) __attribute__((aligned(4))) uint8_t EP7_DatabufHD[64 + 64]; //ep7_out(64)+ep7_in(64) -void OTG_FS_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast"))); +void USBD_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast"))); volatile uint8_t mps_over_flag = 0; @@ -435,14 +439,7 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/********************************************************************* - * @fn OTG_FS_IRQHandler - * - * @brief This function handles OTG_FS exception. - * - * @return none - */ -void OTG_FS_IRQHandler(void) +void USBD_IRQHandler(void) { uint8_t intflag = 0; diff --git a/port/ch32/usb_dc_usbhs.c b/port/ch32/usb_dc_usbhs.c index 70b8875d..44cb3db0 100644 --- a/port/ch32/usb_dc_usbhs.c +++ b/port/ch32/usb_dc_usbhs.c @@ -1,6 +1,10 @@ #include "usbd_core.h" #include "usb_ch32_usbhs_reg.h" +#ifndef USBD_IRQHandler +#define USBD_IRQHandler USBHS_IRQHandler //use actual usb irq name instead +#endif + #ifndef USB_NUM_BIDIR_ENDPOINTS #define USB_NUM_BIDIR_ENDPOINTS 8 #endif @@ -33,7 +37,7 @@ __attribute__ ((aligned(4))) uint8_t EP2_DatabufHD[512+512]; //ep2_out(64)+ep2_ void USBHS_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast"))); volatile uint8_t mps_over_flag = 0; -volatile uint8_t USBHS_Dev_Endp0_Tog = 0x01; /* USB2.0高速设备端点0同步标志 */ +volatile uint8_t USBHS_Dev_Endp0_Tog = 0x01; /* USB2.0锟斤拷锟斤拷锟借备锟剿碉拷0同锟斤拷锟斤拷志 */ __WEAK void usb_dc_low_level_init(void) { @@ -380,14 +384,7 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/********************************************************************* - * @fn USBHS_IRQHandler - * - * @brief This function handles OTG_FS exception. - * - * @return none - */ -void USBHS_IRQHandler(void) +void USBD_IRQHandler(void) { uint32_t end_num, rx_token; uint8_t intflag = 0; @@ -411,7 +408,7 @@ void USBHS_IRQHandler(void) } else if (end_num == 1) { if (rx_token == PID_IN) { //USBHS_Endp1_Up_Flag = 0x00; - /* 默认回NAK */ + /* 默锟较伙拷NAK */ USBHS_DEVICE->UEP1_TX_CTRL = (USBHS_DEVICE->UEP1_TX_CTRL & ~(USBHS_EP_T_RES_MASK | USBHS_EP_T_TOG_MASK)) | USBHS_EP_T_RES_NAK | USBHS_EP_T_TOG_0; } else if (rx_token == PID_OUT) { } diff --git a/port/fsdev/usb_dc_fsdev.c b/port/fsdev/usb_dc_fsdev.c index aefb5817..c6f27493 100644 --- a/port/fsdev/usb_dc_fsdev.c +++ b/port/fsdev/usb_dc_fsdev.c @@ -309,11 +309,6 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/** - * @brief This function handles PCD interrupt request. - * @param hpcd PCD handle - * @retval HAL status - */ void USBD_IRQHandler(void) { uint16_t wIstr, wEPVal; diff --git a/port/mm32/usb_dc_mm32.c b/port/mm32/usb_dc_mm32.c index f0230583..c783103f 100644 --- a/port/mm32/usb_dc_mm32.c +++ b/port/mm32/usb_dc_mm32.c @@ -1,6 +1,14 @@ #include "usbd_core.h" #include "usb_mm32_reg.h" +#ifndef USBD_IRQHandler +#define USBD_IRQHandler USB_HP_CAN1_TX_IRQHandler //use actual usb irq name instead +#endif + +#ifndef USB_NUM_BIDIR_ENDPOINTS +#define USB_NUM_BIDIR_ENDPOINTS 5 +#endif + #define USB_GET_EPX_INT_STATE(ep_idx) (*(volatile uint32_t *)(&USB->rEP1_INT_STATE + (ep_idx - 1))) #define USB_SET_EPX_INT_STATE(ep_idx, val) (*(volatile uint32_t *)(&USB->rEP1_INT_STATE + (ep_idx - 1)) = val) #define USB_SET_EP_INT(ep_idx, val) (*(volatile uint32_t *)(&USB->rEP1_INT_EN + (ep_idx - 1)) = val) @@ -10,14 +18,6 @@ #define USB_GET_EP_FIFO(ep_idx) (*(volatile uint32_t *)(&USB->rEP0_FIFO + ep_idx)) #define USB_SET_EP_FIFO(ep_idx, val) (*(volatile uint32_t *)(&USB->rEP0_FIFO + ep_idx) = val) -#ifndef USBD_IRQHandler -#define USBD_IRQHandler USB_HP_CAN1_TX_IRQHandler //use actual usb irq name instead -#endif - -#ifndef USB_NUM_BIDIR_ENDPOINTS -#define USB_NUM_BIDIR_ENDPOINTS 5 -#endif - /* Endpoint state */ struct usb_dc_ep_state { /** Endpoint max packet size */ @@ -204,11 +204,6 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/** - * @brief This function handles PCD interrupt request. - * @param hpcd PCD handle - * @retval HAL status - */ void USBD_IRQHandler(void) { uint32_t int_status; diff --git a/port/musb/usb_dc_musb.c b/port/musb/usb_dc_musb.c index 8b193cd2..6979eb12 100644 --- a/port/musb/usb_dc_musb.c +++ b/port/musb/usb_dc_musb.c @@ -524,11 +524,7 @@ static void handle_ep0(void) break; } } -/** - * @brief This function handles PCD interrupt request. - * @param hpcd PCD handle - * @retval HAL status - */ + void USBD_IRQHandler(void) { uint32_t is; diff --git a/port/nuvoton/usb_dc_nuvoton.c b/port/nuvoton/usb_dc_nuvoton.c index 1e40da6e..d8faadc7 100644 --- a/port/nuvoton/usb_dc_nuvoton.c +++ b/port/nuvoton/usb_dc_nuvoton.c @@ -314,11 +314,6 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/** - * @brief This function handles PCD interrupt request. - * @param hpcd PCD handle - * @retval HAL status - */ void USBD_IRQHandler(void) { volatile uint32_t IrqStL, IrqSt; diff --git a/port/synopsys/usb_dc_synopsys.c b/port/synopsys/usb_dc_synopsys.c index 0963e859..4c5e8955 100644 --- a/port/synopsys/usb_dc_synopsys.c +++ b/port/synopsys/usb_dc_synopsys.c @@ -509,11 +509,6 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/** - * @brief This function handles PCD interrupt request. - * @param hpcd PCD handle - * @retval HAL status - */ void USBD_IRQHandler(void) { USB_OTG_GlobalTypeDef *USBx = usb_dc_cfg.Instance; diff --git a/port/template/usb_dc.c b/port/template/usb_dc.c index 19162865..3c68f099 100644 --- a/port/template/usb_dc.c +++ b/port/template/usb_dc.c @@ -129,11 +129,6 @@ int usbd_ep_read(const uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_ return 0; } -/** - * @brief This function handles PCD interrupt request. - * @param hpcd PCD handle - * @retval HAL status - */ void USBD_IRQHandler(void) {