diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-11-22 13:36:07 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-11-22 13:36:07 -0600 |
| commit | 60e8860892ac78afe91601ec35dbc1bcf29994e8 (patch) | |
| tree | bbe7dbb39683a5bc0aa0f7f0fc45f414dfe1f24e /nuttx/arch/arm | |
| parent | 98b2112ad6fd5251d6f131d0403a2546fe538dab (diff) | |
| download | nuttx-60e8860892ac78afe91601ec35dbc1bcf29994e8.tar.gz nuttx-60e8860892ac78afe91601ec35dbc1bcf29994e8.tar.bz2 nuttx-60e8860892ac78afe91601ec35dbc1bcf29994e8.zip | |
Cosmetic changes
Diffstat (limited to 'nuttx/arch/arm')
| -rwxr-xr-x | nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c | 6 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/sama5/sam_ehci.c | 6 |
2 files changed, 6 insertions, 6 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 *) diff --git a/nuttx/arch/arm/src/sama5/sam_ehci.c b/nuttx/arch/arm/src/sama5/sam_ehci.c index cd77f4f5a..4c96ca6be 100755 --- a/nuttx/arch/arm/src/sama5/sam_ehci.c +++ b/nuttx/arch/arm/src/sama5/sam_ehci.c @@ -421,7 +421,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_SAMA5_EHCI_PREALLOCATE /* Pools of pre-allocated data structures. These will all be linked into the @@ -4046,7 +4046,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller) #ifdef CONFIG_SAMA5_EHCI_PREALLOCATE DEBUGASSERT(((uintptr_t)g_framelist & 0xfff) == 0); #endif -#endif +#endif /* CONFIG_USBHOST_INT_DISABLE */ /* SAMA5 Configuration *******************************************************/ /* For High-speed operations, the user has to perform the following: @@ -4182,7 +4182,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller) } #endif -#ifndef CONFIG_SAMA5_EHCI_PREALLOCATE +#if !defined(CONFIG_SAMA5_EHCI_PREALLOCATE) || !defined(CONFIG_USBHOST_INT_DISABLE) /* Allocate the periodic framelist */ g_framelist = (uint32_t *) |