Fix compilation errors with floating point is enabled and field widths are disabled (I don't know why you would do that, but the code was wrong)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4562 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-04-05 23:21:13 +00:00
parent eb3bcee181
commit d65b286177
1 changed files with 28 additions and 7 deletions

View File

@ -2763,6 +2763,8 @@ static void stm32_ep0configure(FAR struct stm32_usbdev_s *priv)
static int stm32_epdisable(FAR struct usbdev_ep_s *ep)
{
FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
uint32_t regaddr;
uint32_t regval;
irqstate_t flags;
#ifdef CONFIG_DEBUG
@ -2774,20 +2776,39 @@ static int stm32_epdisable(FAR struct usbdev_ep_s *ep)
#endif
usbtrace(TRACE_EPDISABLE, privep->epphy);
/* Is this an IN or an OUT endpoint */
flags = irqsave();
/* Disable Endpoint */
if (privep->isin)
{
#warning "Missing logic"
/* Deactivate the endpoint */
regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
regval = stm32_getreg(regaddr);
regval &= ~OTGFS_DIEPCTL0_USBAEP;
stm32_putreg(regval, regaddr);
/* Disable endpoint interrupts */
regval = stm32_getreg(STM32_OTGFS_DAINTMSK);
regval &= ~OTGFS_DAINT_IEP(privep->epphy);
stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
}
else
{
#warning "Missing logic"
}
/* Deactivate the endpoint */
privep->stalled = true;
regaddr = priv, STM32_OTGFS_DOEPCTL(privep->epphy);
regval = stm32_getreg(regaddr);
regval &= ~OTGFS_DOEPCTL_USBAEP;
stm32_putreg(regval, regaddr);
/* Disable endpoint interrupts */
regval = stm32_getreg(STM32_OTGFS_DAINTMSK);
regval &= ~OTGFS_DAINT_OEP(privep->epphy);
stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
}
/* Cancel any ongoing activity */