Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-06 08:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix some LPC31 and LPC43 errors introduced by a recent pull request

Browse source
This commit is contained in:
Gregory Nutt 2016-02-14 19:35:40 -06:00
parent 8b7dd552a3
commit 349e5bc3ec
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/src/lpc31xx/lpc31_ehci.c
View file

@ -5080,10 +5080,10 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
*/
#ifdef CONFIG_LPC31_EHCI_SDIS
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
LPC31_USBDEV_USBMODE);
#else
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_VBPS, LPC31_USBDEV_USBMODE);
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_VBPS, LPC31_USBDEV_USBMODE);
#endif
/* Host Controller Initialization. Paragraph 4.1 */
@ -5101,7 +5101,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
* host configuration in the reset.
*/
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
LPC31_USBDEV_USBMODE);
/* "In order to initialize the host controller, software should perform the

2
arch/arm/src/lpc31xx/lpc31_usbdev.c
View file

@ -2581,7 +2581,7 @@ void up_usbinitialize(void)
/* Program the controller to be the USB device controller */
lpc31_putreg (USBDEV_USBMODE_SDIS | USBDEV_USBMODE_SLOM | USBDEV_USBMODE_CMDEVICE,
lpc31_putreg (USBDEV_USBMODE_SDIS | USBDEV_USBMODE_SLOM | USBDEV_USBMODE_CM_DEVICE,
LPC31_USBDEV_USBMODE);
/* Disconnect device */

8
arch/arm/src/lpc43xx/lpc43_ehci.c
View file

@ -4880,10 +4880,10 @@ FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller)
*/
#ifdef CONFIG_LPC43_EHCI_SDIS
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
LPC43_USBDEV_USBMODE);
#else
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_VBPS, LPC43_USBDEV_USBMODE);
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_VBPS, LPC43_USBDEV_USBMODE);
#endif
/* Host Controller Initialization. Paragraph 4.1 */
@ -4902,10 +4902,10 @@ FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller)
*/
#ifdef CONFIG_LPC43_EHCI_SDIS
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_SDIS | USBHOST_USBMODE_VBPS,
LPC43_USBDEV_USBMODE);
#else
putreg32(USBHOST_USBMODE_CMHOST | USBHOST_USBMODE_VBPS, LPC43_USBDEV_USBMODE);
putreg32(USBHOST_USBMODE_CM_HOST | USBHOST_USBMODE_VBPS, LPC43_USBDEV_USBMODE);
#endif
/* "In order to initialize the host controller, software should perform the