diff options
| -rwxr-xr-x | nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c | 6 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/sama5/sam_ehci.c | 6 | ||||
| -rw-r--r-- | nuttx/configs/olimex-lpc-h3131/include/board.h | 19 |
3 files changed, 25 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 *) diff --git a/nuttx/configs/olimex-lpc-h3131/include/board.h b/nuttx/configs/olimex-lpc-h3131/include/board.h index 512fc4b65..b0f020ffb 100644 --- a/nuttx/configs/olimex-lpc-h3131/include/board.h +++ b/nuttx/configs/olimex-lpc-h3131/include/board.h @@ -196,5 +196,24 @@ void lpc31_boardinitialize(void); void lpc31_setled(int led, bool ledon); void lpc31_setleds(uint8_t ledset); +/************************************************************************************ + * Name: lpc31_setup_overcurrent + * + * Description: + * Setup to receive an interrupt-level callback if an overcurrent condition is + * detected. + * + * Input parameter: + * handler - New overcurrent interrupt handler + * + * Returned value: + * Old overcurrent interrupt handler + * + ************************************************************************************/ + +#if 0 /* Not ready yet */ +xcpt_t lpc31_setup_overcurrent(xcpt_t handler); +#endif + #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_OLIMEX_LPC_H3131_INCLUDE_BOARD_H */ |