From 349e5bc3ec91e4c047eadd21a7641d4851ef07a0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 14 Feb 2016 19:35:40 -0600 Subject: [PATCH] Fix some LPC31 and LPC43 errors introduced by a recent pull request --- arch/arm/src/lpc31xx/lpc31_ehci.c | 6 +++--- arch/arm/src/lpc31xx/lpc31_usbdev.c | 2 +- arch/arm/src/lpc43xx/lpc43_ehci.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index 924b4f6408a..67ef095f2d3 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -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 diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c index 6eacff1df95..c1ece00bf6f 100644 --- a/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -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 */ diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c index 48691731e6b..08b2ae8e0f9 100644 --- a/arch/arm/src/lpc43xx/lpc43_ehci.c +++ b/arch/arm/src/lpc43xx/lpc43_ehci.c @@ -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