Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-10 07:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up some LP17xx and STM32 USB host configuration compilation errors due to the massive changes to the USB host interfaces needed to support the SAMA5

Browse source
This commit is contained in:
Gregory Nutt 2013-08-13 17:43:19 -06:00
parent 8f429fd54d
commit bdbe4a4f25
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/src/lpc17xx/lpc17_usbhost.c
View file

@ -241,7 +241,9 @@ static void lpc17_takesem(sem_t *sem);
/* Byte stream access helper functions *****************************************/
static inline uint16_t lpc17_getle16(const uint8_t *val);
#if 0 /* Not used */
static void lpc17_putle16(uint8_t *dest, uint16_t val);
#endif
/* OHCI memory pool helper functions *******************************************/
@ -294,7 +296,8 @@ static int lpc17_usbinterrupt(int irq, FAR void *context);
/* USB host controller operations **********************************************/
static int lpc17_wait(FAR struct usbhost_connection_s *conn, FAR bool *connected);
static int lpc17_wait(FAR struct usbhost_connection_s *conn,
FAR const bool *connected);
static int lpc17_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx);
static int lpc17_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,
@ -541,11 +544,13 @@ static inline uint16_t lpc17_getle16(const uint8_t *val)
*
*******************************************************************************/
#if 0 /* Not used */
static void lpc17_putle16(uint8_t *dest, uint16_t val)
{
dest[0] = val & 0xff; /* Little endian means LS byte first in byte stream */
dest[1] = val >> 8;
}
#endif
/*******************************************************************************
* Name: lpc17_edfree
@ -1540,7 +1545,8 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
*
*******************************************************************************/
static int lpc17_wait(FAR struct usbhost_connection_s *conn, FAR bool *connected)
static int lpc17_wait(FAR struct usbhost_connection_s *conn,
FAR const bool *connected)
{
struct lpc17_usbhost_s *priv = (struct lpc17_usbhost_s *)&g_usbhost;
irqstate_t flags;
@ -1630,7 +1636,7 @@ static int lpc17_enumerate(FAR struct usbhost_connection_s *conn, int rphndx)
*/
uvdbg("Enumerate the device\n");
return usbhost_enumerate(drvr, 1, &priv->class);
return usbhost_enumerate(&g_usbhost.drvr, 1, &priv->class);
}
/************************************************************************************

3
arch/arm/src/sama5/sam_ohci.c
View file

@ -338,7 +338,8 @@ static int sam_ohci_interrupt(int irq, FAR void *context);
/* USB host controller operations **********************************************/
static int sam_wait(FAR struct usbhost_connection_s *conn, FAR const bool *connected);
static int sam_wait(FAR struct usbhost_connection_s *conn,
FAR const bool *connected);
static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx);
static int sam_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,

8
arch/arm/src/stm32/stm32_otgfshost.c
View file

@ -358,7 +358,8 @@ static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx);
/* USB host controller operations **********************************************/
static int stm32_wait(FAR struct usbhost_connection_s *conn, FAR bool *connected);
static int stm32_wait(FAR struct usbhost_connection_s *conn,
FAR const bool *connected);
static int stm32_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx);
static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,
@ -3035,7 +3036,8 @@ static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
*
*******************************************************************************/
static int stm32_wait(FAR struct usbhost_connection_s *conn, FAR bool *connected)
static int stm32_wait(FAR struct usbhost_connection_s *conn,
FAR const bool *connected)
{
FAR struct stm32_usbhost_s *priv = &g_usbhost;
irqstate_t flags;
@ -3159,7 +3161,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
uvdbg("Enumerate the device\n");
priv->smstate = SMSTATE_ENUM;
ret = usbhost_enumerate(drvr, 1, &priv->class);
ret = usbhost_enumerate(&g_usbhost.drvr, 1, &priv->class);
/* The enumeration may fail either because of some HCD interfaces failure
* or because the device class is not supported. In either case, we just