Ver Fonte

refactor: remove unwanted usb_reset()

Dmitry há 8 anos atrás
pai
commit
811ec90f50

+ 0 - 4
inc/usbd_core.h

@@ -218,9 +218,6 @@ typedef usbd_respond (*usbd_cfg_callback)(usbd_device *dev, uint8_t cfg);
  */
 typedef void (*usbd_hw_enable)(bool enable);
 
-/**\brief Resets USB hardware.*/
-typedef void (*usbd_hw_reset)(void);
-
 /** Connects or disconnects USB hardware to/from usb host
  * \param connect Connects USB to host if TRUE, disconnects otherwise
  * \return lanes connection status.
@@ -296,7 +293,6 @@ typedef uint16_t (*usbd_hw_get_serialno)(void *buffer);
 struct usbd_driver {
     uint32_t                caps;               /**<\brief HW capabilities */
     usbd_hw_enable          enable;             /**<\copybrief usbd_hw_enable */
-    usbd_hw_reset           reset;              /**<\copybrief usbd_hw_reset */
     usbd_hw_connect         connect;            /**<\copybrief usbd_hw_connect */
     usbd_hw_setaddr         setaddr;            /**<\copybrief usbd_hw_setaddr */
     usbd_hw_ep_config       ep_config;          /**<\copybrief usbd_hw_ep_config */

+ 0 - 6
src/usbd_stm32f103_devfs.c

@@ -203,11 +203,6 @@ bool ep_isstalled(uint8_t ep) {
     }
 }
 
-void reset (void) {
-    USB->CNTR |= USB_CNTR_FRES;
-    USB->CNTR &= ~USB_CNTR_FRES;
-}
-
 uint8_t connect(bool connect) {
 #if defined(USBD_DP_PORT) && defined(USBD_DP_PIN) && defined(STM32F3)
     uint32_t _t = USBD_DP_PORT->MODER & ~(0x03 << (2 * USBD_DP_PIN));
@@ -531,7 +526,6 @@ uint16_t get_serialno_desc(void *buffer) {
 const struct usbd_driver usbd_devfs = {
     0,
     enable,
-    reset,
     connect,
     setaddr,
     ep_config,

+ 0 - 14
src/usbd_stm32f103_devfs_asm.S

@@ -138,7 +138,6 @@
 usbd_devfs_asm:
     .long   0
     .long   _enable
-    .long   _reset
     .long   _connect
     .long   _setaddr
     .long   _ep_config
@@ -262,19 +261,6 @@ _setaddr:
     .size   _setaddr, . - _setaddr
 
     .thumb_func
-    .type   _reset, %function
-_reset:
-    ldr     r2, =#USB_REGBASE
-    movs    r0, #0x01           //FRES
-    ldrh    r1, [r2, #USB_CNTR]
-    orrs    r1, r0
-    strh    r1, [r2, #USB_CNTR]  // set FRES
-    bics    r1, r0
-    strh    r1, [r2, #USB_CNTR]  // clr FRES
-    bx      lr
-    .size   _reset, . - _reset
-
-    .thumb_func
     .type   _get_frame, %function
 _get_frame:
     ldr     r0, =#USB_REGBASE

+ 0 - 6
src/usbd_stm32f429_otgfs.c

@@ -145,11 +145,6 @@ void enable(bool enable) {
     }
 }
 
-void reset (void) {
-   // _BST(OTG->GRSTCTL, USB_OTG_GRSTCTL_CSRST);
-   // _WBC(OTG->GRSTCTL, USB_OTG_GRSTCTL_CSRST);
-}
-
 uint8_t connect(bool connect) {
     if (connect) {
 /* The ST made a strange thing again. Really i dont'understand what is the reason to name
@@ -463,7 +458,6 @@ uint16_t get_serialno_desc(void *buffer) {
 const struct usbd_driver usbd_otgfs = {
     USBD_HW_ADDRFST,
     enable,
-    reset,
     connect,
     setaddr,
     ep_config,

+ 0 - 6
src/usbd_stm32l052_devfs.c

@@ -157,11 +157,6 @@ void enable(bool enable) {
     }
 }
 
-void reset (void) {
-    USB->CNTR |= USB_CNTR_FRES;
-    USB->CNTR &= ~USB_CNTR_FRES;
-}
-
 uint8_t connect(bool connect) {
     uint8_t res;
     USB->BCDR = USB_BCDR_BCDEN | USB_BCDR_DCDEN;
@@ -457,7 +452,6 @@ uint16_t get_serialno_desc(void *buffer) {
 const struct usbd_driver usbd_devfs = {
     USBD_HW_BC,
     enable,
-    reset,
     connect,
     setaddr,
     ep_config,

+ 0 - 14
src/usbd_stm32l052_devfs_asm.S

@@ -85,7 +85,6 @@
 usbd_devfs_asm:
     .long   USBD_HW_BC
     .long   _enable
-    .long   _reset
     .long   _connect
     .long   _setaddr
     .long   _ep_config
@@ -205,19 +204,6 @@ _setaddr:
     .size   _setaddr, . - _setaddr
 
     .thumb_func
-    .type   _reset, %function
-_reset:
-    ldr     r2, =#USB_REGBASE
-    movs    r0, #0x01           //FRES
-    ldrh    r1, [r2, #USB_CNTR] //USB->CNTR
-    orrs    r1, r0
-    strh    r1, [r2, #USB_CNTR] // set FRES
-    bics    r1, r0
-    strh    r1, [r2, #USB_CNTR] // clr FRES
-    bx      lr
-    .size   _reset, . - _reset
-
-    .thumb_func
     .type   _get_frame, %function
 _get_frame:
     ldr     r0, =#USB_REGBASE

+ 0 - 6
src/usbd_stm32l100_devfs.c

@@ -159,11 +159,6 @@ void enable(bool enable) {
     }
 }
 
-void reset (void) {
-    USB->CNTR |= USB_CNTR_FRES;
-    USB->CNTR &= ~USB_CNTR_FRES;
-}
-
 uint8_t connect(bool connect) {
     if (connect) {
         SYSCFG->PMC |= SYSCFG_PMC_USB_PU;
@@ -446,7 +441,6 @@ uint16_t get_serialno_desc(void *buffer) {
 const struct usbd_driver usbd_devfs = {
     0,
     enable,
-    reset,
     connect,
     setaddr,
     ep_config,

+ 0 - 14
src/usbd_stm32l100_devfs_asm.S

@@ -86,7 +86,6 @@
 usbd_devfs_asm:
     .long   0
     .long   _enable
-    .long   _reset
     .long   _connect
     .long   _setaddr
     .long   _ep_config
@@ -185,19 +184,6 @@ _setaddr:
     .size   _setaddr, . - _setaddr
 
     .thumb_func
-    .type   _reset, %function
-_reset:
-    ldr     r2, =#USB_REGBASE
-    movs    r0, #0x01           //FRES
-    ldrh    r1, [r2, #USB_CNTR]
-    orrs    r1, r0
-    strh    r1, [r2, #USB_CNTR]  // set FRES
-    bics    r1, r0
-    strh    r1, [r2, #USB_CNTR]  // clr FRES
-    bx      lr
-    .size   _reset, . - _reset
-
-    .thumb_func
     .type   _get_frame, %function
 _get_frame:
     ldr     r0, =#USB_REGBASE

+ 0 - 7
src/usbd_stm32l476_otgfs.c

@@ -147,12 +147,6 @@ void enable(bool enable) {
     }
 }
 
-void reset (void) {
-   // _BST(OTG->GRSTCTL, USB_OTG_GRSTCTL_CSRST);
-   // _WBC(OTG->GRSTCTL, USB_OTG_GRSTCTL_CSRST);
-}
-
-
 uint8_t connect(bool connect) {
     uint8_t res;
 #if defined(USBD_VBUS_DETECT)
@@ -481,7 +475,6 @@ uint16_t get_serialno_desc(void *buffer) {
 const struct usbd_driver usbd_otgfs = {
     USBD_HW_ADDRFST | USBD_HW_BC,
     enable,
-    reset,
     connect,
     setaddr,
     ep_config,