sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix infinite loop in CDC/ACM driver

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4655 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-04-25 16:47:28 +00:00
parent f1e682bfbe
commit d96b4c1a10
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2681,4 +2681,9 @@
PIC32MX7 Multimedia Board (MMB). PIC32MX7 Multimedia Board (MMB).
* net/recvfrom.c: Fix a compilation problem. Some UDP logic was conditioned * net/recvfrom.c: Fix a compilation problem. Some UDP logic was conditioned
on TCP, not UDP. on TCP, not UDP.
* drivers/usbdev/cdcacm.c: Fix an infinite loop that occurs when the serial
device is unregisters.
* arch/arm/src/stm32/stm32_otgfs.c: The driver needs to reset the software (in
order to flush the requests) and to disable the software connection when the
device is unregistered.

15
arch/arm/src/stm32/stm32_otgfsdev.c
View File

@ -1870,6 +1870,7 @@ static void stm32_usbreset(struct stm32_usbdev_s *priv)
privep->stalled = false; privep->stalled = false;
} }
stm32_putreg(0xffffffff, STM32_OTGFS_DAINT); stm32_putreg(0xffffffff, STM32_OTGFS_DAINT);
/* Mask all device endpoint interrupts except EP0 */ /* Mask all device endpoint interrupts except EP0 */
@ -5283,6 +5284,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
*/ */
FAR struct stm32_usbdev_s *priv = &g_otgfsdev; FAR struct stm32_usbdev_s *priv = &g_otgfsdev;
irqstate_t flags;
usbtrace(TRACE_DEVUNREGISTER, 0); usbtrace(TRACE_DEVUNREGISTER, 0);
@ -5294,6 +5296,13 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
} }
#endif #endif
/* Reset the hardware and cancel all requests. All requests must be
* canceled while the class driver is still bound.
*/
flags = irqsave();
stm32_usbreset(priv);
/* Unbind the class driver */ /* Unbind the class driver */
CLASS_UNBIND(driver, &priv->usbdev); CLASS_UNBIND(driver, &priv->usbdev);
@ -5302,9 +5311,15 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
up_disable_irq(STM32_IRQ_OTGFS); up_disable_irq(STM32_IRQ_OTGFS);
/* Disconnect device */
stm32_pullup(&priv->usbdev, false);
/* Unhook the driver */ /* Unhook the driver */
priv->driver = NULL; priv->driver = NULL;
irqrestore(flags);
return OK; return OK;
} }

18
drivers/usbdev/cdcacm.c
View File

@ -2182,14 +2182,16 @@ void cdcacm_uninitialize(FAR void *handle)
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_UARTUNREGISTER), (uint16_t)-ret); usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_UARTUNREGISTER), (uint16_t)-ret);
} }
/* Unbind the class (if still bound) */ /* Unregister the driver (unless we are a part of a composite device). The
* device unregister logic will (1) return all of the requests to us then
if (priv->usbdev) * (2) all the unbind method.
{ *
cdcacm_unbind(&drvr->drvr, priv->usbdev); * The same thing will happen in the composite case except that: (1) the
} * composite driver will call usbdev_unregister() which will (2) return the
* requests for all members of the composite, and (3) call the unbind
/* Unregister the driver (unless we are a part of a composite device) */ * method in the composite device which will (4) call the unbind method
* for this device.
*/
#ifndef CONFIG_CDCACM_COMPOSITE #ifndef CONFIG_CDCACM_COMPOSITE
usbdev_unregister(&drvr->drvr); usbdev_unregister(&drvr->drvr);