summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/lpc31xx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-11-22 13:36:07 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-11-22 13:36:07 -0600
commit60e8860892ac78afe91601ec35dbc1bcf29994e8 (patch)
treebbe7dbb39683a5bc0aa0f7f0fc45f414dfe1f24e /nuttx/arch/arm/src/lpc31xx
parent98b2112ad6fd5251d6f131d0403a2546fe538dab (diff)
downloadnuttx-60e8860892ac78afe91601ec35dbc1bcf29994e8.tar.gz
nuttx-60e8860892ac78afe91601ec35dbc1bcf29994e8.tar.bz2
nuttx-60e8860892ac78afe91601ec35dbc1bcf29994e8.zip
Cosmetic changes
Diffstat (limited to 'nuttx/arch/arm/src/lpc31xx')
-rwxr-xr-xnuttx/arch/arm/src/lpc31xx/lpc31_ehci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c b/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c
index 19d1c2c5a..ae96c4115 100755
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -543,7 +543,7 @@ static uint32_t g_framelist[FRAME_LIST_SIZE] __attribute__ ((aligned(4096)));
#else
static uint32_t *g_framelist;
#endif
-#endif
+#endif /* CONFIG_USBHOST_INT_DISABLE */
#ifdef CONFIG_LPC31_EHCI_PREALLOCATE
/* Pools of pre-allocated data structures. These will all be linked into the
@@ -4168,7 +4168,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
#ifdef CONFIG_LPC31_EHCI_PREALLOCATE
DEBUGASSERT(((uintptr_t)g_framelist & 0xfff) == 0);
#endif
-#endif
+#endif /* CONFIG_USBHOST_INT_DISABLE */
/* Software Configuration ****************************************************/
@@ -4247,7 +4247,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
}
#endif
-#ifndef CONFIG_LPC31_EHCI_PREALLOCATE
+#if !defined(CONFIG_LPC31_EHCI_PREALLOCATE) || !defined(CONFIG_USBHOST_INT_DISABLE)
/* Allocate the periodic framelist */
g_framelist = (uint32_t *)