diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-08-13 15:03:46 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-08-13 15:03:46 -0600 |
| commit | c5b10e879ed80495b250e2d9ca7a55ae7d27e57b (patch) | |
| tree | 7defee4e62136636ba1a10744e1c50c210572aed /nuttx/configs/cloudctrl | |
| parent | 61c04ffffaf6cf9024d740c04443e66c6fff500e (diff) | |
| download | nuttx-c5b10e879ed80495b250e2d9ca7a55ae7d27e57b.tar.gz nuttx-c5b10e879ed80495b250e2d9ca7a55ae7d27e57b.tar.bz2 nuttx-c5b10e879ed80495b250e2d9ca7a55ae7d27e57b.zip | |
Separate wait() and enumerate() methods from struct usbhost_driver_s and move to new interface, struct usbhost_connection_s. This is part of the necessary restructuring of the USB host interface to support multiple root hub ports.
Diffstat (limited to 'nuttx/configs/cloudctrl')
| -rw-r--r-- | nuttx/configs/cloudctrl/src/up_usb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/configs/cloudctrl/src/up_usb.c b/nuttx/configs/cloudctrl/src/up_usb.c index 2407285c5..2ef928c14 100644 --- a/nuttx/configs/cloudctrl/src/up_usb.c +++ b/nuttx/configs/cloudctrl/src/up_usb.c @@ -83,7 +83,7 @@ ************************************************************************************/ #ifdef CONFIG_USBHOST -static struct usbhost_driver_s *g_drvr; +static struct usbhost_connection_s *g_usbconn; #endif /************************************************************************************ @@ -109,7 +109,7 @@ static int usbhost_waiter(int argc, char *argv[]) { /* Wait for the device to change state */ - ret = DRVR_WAIT(g_drvr, &connected); + ret = CONN_WAIT(g_usbconn, &connected); DEBUGASSERT(ret == OK); connected = !connected; @@ -121,7 +121,7 @@ static int usbhost_waiter(int argc, char *argv[]) { /* Yes.. enumerate the newly connected device */ - (void)DRVR_ENUMERATE(g_drvr, 0); + (void)CONN_ENUMERATE(g_usbconn, 0); } } @@ -187,8 +187,8 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ uvdbg("Initialize USB host\n"); - g_drvr = stm32_otgfshost_initialize(0); - if (g_drvr) + g_usbconn = stm32_otgfshost_initialize(0); + if (g_usbconn) { /* Start a thread to handle device connection. */ |