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

SAMA5D3x-EK: Fix some backward conditional compilation

Browse Source
This commit is contained in:
Gregory Nutt 2013-08-24 14:06:47 -06:00
parent 5f78f6998f
commit 0582148cfd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/sama5/sam_ehci.c
View File

@ -3872,7 +3872,9 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
*
* REVISIT:
* - Should be done elsewhere in OTG mode.
* - Can we postpone enabling VBUS to save power?
* - Can we postpone enabling VBUS to save power? I think it can be
* done in sam_enumerate() and can probably be disabled when the
* port is disconnected.
* - Some EHCI implementations require setting the power bit in the
* PORTSC register to enable power.
*/

4
arch/arm/src/sama5/sam_ohci.c
View File

@ -3207,7 +3207,9 @@ FAR struct usbhost_connection_s *sam_ohci_initialize(int controller)
*
* REVISIT:
* - Should be done elsewhere in OTG mode.
* - Can we postpone enabling VBUS to save power?
* - Can we postpone enabling VBUS to save power? I think it can be
* done in sam_enumerate() and can probably be disabled when the
* port is disconnected.
*/
#ifdef CONFIG_SAMA5_UHPHS_RHPORT1

6
configs/sama5d3x-ek/src/sam_usb.c
View File

@ -393,7 +393,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
switch (rhport)
{
case SAM_RHPORT1:
#ifdef CONFIG_SAMA5_UHPHS_RHPORT1
#ifndef CONFIG_SAMA5_UHPHS_RHPORT1
udbg("ERROR: RHPort1 is not available in this configuration\n");
return;
#else
@ -402,7 +402,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
#endif
case SAM_RHPORT2:
#ifdef CONFIG_SAMA5_UHPHS_RHPORT2
#ifndef CONFIG_SAMA5_UHPHS_RHPORT2
udbg("ERROR: RHPort2 is not available in this configuration\n");
return;
#else
@ -411,7 +411,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
#endif
case SAM_RHPORT3:
#ifdef CONFIG_SAMA5_UHPHS_RHPORT3
#ifndef CONFIG_SAMA5_UHPHS_RHPORT3
udbg("ERROR: RHPort3 is not available in this configuration\n");
return;
#else