Fixed bug #674.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8536 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
be48aa8f69
commit
db0b9dbf0b
|
@ -168,7 +168,7 @@ static void otg_disable_ep(USBDriver *usbp) {
|
||||||
if ((otgp->oe[i].DOEPCTL & DOEPCTL_EPENA) != 0) {
|
if ((otgp->oe[i].DOEPCTL & DOEPCTL_EPENA) != 0) {
|
||||||
otgp->oe[i].DOEPCTL = DOEPCTL_EPDIS;
|
otgp->oe[i].DOEPCTL = DOEPCTL_EPDIS;
|
||||||
/* Wait for endpoint disable.*/
|
/* Wait for endpoint disable.*/
|
||||||
while (!(otgp->oe[i].DOEPINT & DOEPINT_OTEPDIS))
|
while (!(otgp->oe[i].DOEPCTL & DOEPCTL_EPDIS))
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -135,6 +135,8 @@
|
||||||
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
|
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
|
||||||
for STM32F030xC, STM32F070x6, STM32F070xB, STM32F091xC,
|
for STM32F030xC, STM32F070x6, STM32F070xB, STM32F091xC,
|
||||||
STM32F098xx devices.
|
STM32F098xx devices.
|
||||||
|
- HAL: Fixed usbStop() hangs in STM32 OTGv1 driver (bug #674)(backported
|
||||||
|
to 3.0.4 and 2.6.10).
|
||||||
- HAL: Fixed STM32 I2Cv2 driver fails on transfers greater than 255 bytes
|
- HAL: Fixed STM32 I2Cv2 driver fails on transfers greater than 255 bytes
|
||||||
(bug #673)(backported to 3.0.4).
|
(bug #673)(backported to 3.0.4).
|
||||||
- HAL: Fixed STM32 I2Cv2 DMA conflict (bug #671)(backported to 3.0.4).
|
- HAL: Fixed STM32 I2Cv2 DMA conflict (bug #671)(backported to 3.0.4).
|
||||||
|
|
|
@ -213,6 +213,10 @@ int main(void) {
|
||||||
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
||||||
shelltp = NULL; /* Triggers spawning of a new shell. */
|
shelltp = NULL; /* Triggers spawning of a new shell. */
|
||||||
}
|
}
|
||||||
|
if (palReadPad(GPIOI, GPIOI_BUTTON_USER)) {
|
||||||
|
usbDisconnectBus(serusbcfg.usbp);
|
||||||
|
usbStop(serusbcfg.usbp);
|
||||||
|
}
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue