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

Cosmetic changes

Browse Source
This commit is contained in:
Gregory Nutt 2013-11-22 13:36:07 -06:00
parent be8d067a1e
commit d2ce5423cd
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/lpc31xx/lpc31_ehci.c
View File

@ -543,7 +543,7 @@ static uint32_t g_framelist[FRAME_LIST_SIZE] __attribute__ ((aligned(4096)));
#else #else
static uint32_t *g_framelist; static uint32_t *g_framelist;
#endif #endif
#endif #endif /* CONFIG_USBHOST_INT_DISABLE */
#ifdef CONFIG_LPC31_EHCI_PREALLOCATE #ifdef CONFIG_LPC31_EHCI_PREALLOCATE
/* Pools of pre-allocated data structures. These will all be linked into the /* 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 #ifdef CONFIG_LPC31_EHCI_PREALLOCATE
DEBUGASSERT(((uintptr_t)g_framelist & 0xfff) == 0); DEBUGASSERT(((uintptr_t)g_framelist & 0xfff) == 0);
#endif #endif
#endif #endif /* CONFIG_USBHOST_INT_DISABLE */
/* Software Configuration ****************************************************/ /* Software Configuration ****************************************************/
@ -4247,7 +4247,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
} }
#endif #endif
#ifndef CONFIG_LPC31_EHCI_PREALLOCATE #if !defined(CONFIG_LPC31_EHCI_PREALLOCATE) || !defined(CONFIG_USBHOST_INT_DISABLE)
/* Allocate the periodic framelist */ /* Allocate the periodic framelist */
g_framelist = (uint32_t *) g_framelist = (uint32_t *)

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

@ -421,7 +421,7 @@ static uint32_t g_framelist[FRAME_LIST_SIZE] __attribute__ ((aligned(4096)));
#else #else
static uint32_t *g_framelist; static uint32_t *g_framelist;
#endif #endif
#endif #endif /* CONFIG_USBHOST_INT_DISABLE */
#ifdef CONFIG_SAMA5_EHCI_PREALLOCATE #ifdef CONFIG_SAMA5_EHCI_PREALLOCATE
/* Pools of pre-allocated data structures. These will all be linked into the /* 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 #ifdef CONFIG_SAMA5_EHCI_PREALLOCATE
DEBUGASSERT(((uintptr_t)g_framelist & 0xfff) == 0); DEBUGASSERT(((uintptr_t)g_framelist & 0xfff) == 0);
#endif #endif
#endif #endif /* CONFIG_USBHOST_INT_DISABLE */
/* SAMA5 Configuration *******************************************************/ /* SAMA5 Configuration *******************************************************/
/* For High-speed operations, the user has to perform the following: /* 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 #endif
#ifndef CONFIG_SAMA5_EHCI_PREALLOCATE #if !defined(CONFIG_SAMA5_EHCI_PREALLOCATE) || !defined(CONFIG_USBHOST_INT_DISABLE)
/* Allocate the periodic framelist */ /* Allocate the periodic framelist */
g_framelist = (uint32_t *) g_framelist = (uint32_t *)

19
configs/olimex-lpc-h3131/include/board.h
View File

@ -196,5 +196,24 @@ void lpc31_boardinitialize(void);
void lpc31_setled(int led, bool ledon); void lpc31_setled(int led, bool ledon);
void lpc31_setleds(uint8_t ledset); 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 /* __ASSEMBLY__ */
#endif /* __CONFIGS_OLIMEX_LPC_H3131_INCLUDE_BOARD_H */ #endif /* __CONFIGS_OLIMEX_LPC_H3131_INCLUDE_BOARD_H */