diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-12 08:38:52 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-12 08:38:52 -0600 |
| commit | ea97a69e276396fa725ee2767d0da2d9d5cae861 (patch) | |
| tree | c822d583891a89d197f5a5ee3a9122ac61f4a28f /nuttx/drivers/usbdev | |
| parent | 9475123c044f172a4beed41e3ddab6e755f5584e (diff) | |
| download | px4-nuttx-ea97a69e276396fa725ee2767d0da2d9d5cae861.tar.gz px4-nuttx-ea97a69e276396fa725ee2767d0da2d9d5cae861.tar.bz2 px4-nuttx-ea97a69e276396fa725ee2767d0da2d9d5cae861.zip | |
Convert olimex-lpc17stk configuration to use the kconfig-frontends tools; Fix some compile errors in the pl2303 USB device driver
Diffstat (limited to 'nuttx/drivers/usbdev')
| -rw-r--r-- | nuttx/drivers/usbdev/Kconfig | 6 | ||||
| -rw-r--r-- | nuttx/drivers/usbdev/pl2303.c | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig index 4c8e888bb..94834805e 100644 --- a/nuttx/drivers/usbdev/Kconfig +++ b/nuttx/drivers/usbdev/Kconfig @@ -36,9 +36,11 @@ endchoice config USBDEV_MAXPOWER int "Maximum power consumption in mA" default 100 - depends on USBDEV_BUSPOWERED +# depends on USBDEV_BUSPOWERED ---help--- - Maximum power consumption in mA + Maximum power consumption in mA. This selection should only apply if + the device is bus powered (USBDEV_BUSPOWERED). It is, however, used + unconditionally in several USB device drivers. config USBDEV_DMA bool "Enable DMA methods" diff --git a/nuttx/drivers/usbdev/pl2303.c b/nuttx/drivers/usbdev/pl2303.c index 7b07a9cba..9aa65a56c 100644 --- a/nuttx/drivers/usbdev/pl2303.c +++ b/nuttx/drivers/usbdev/pl2303.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/usbdev/pl2303.c * - * Copyright (C) 2008-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic emulates the Prolific PL2303 serial/USB converter @@ -1911,7 +1911,7 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver, static void usbclass_suspend(FAR struct usbdevclass_driver_s *driver, FAR struct usbdev_s *dev) { - FAR struct cdcacm_dev_s *priv; + FAR struct pl2303_dev_s *priv; usbtrace(TRACE_CLASSSUSPEND, 0); @@ -1925,7 +1925,7 @@ static void usbclass_suspend(FAR struct usbdevclass_driver_s *driver, /* Extract reference to private data */ - priv = ((FAR struct cdcacm_driver_s*)driver)->dev; + priv = ((FAR struct pl2303_driver_s*)driver)->dev; /* And let the "upper half" driver now that we are suspended */ @@ -1945,7 +1945,7 @@ static void usbclass_suspend(FAR struct usbdevclass_driver_s *driver, static void usbclass_resume(FAR struct usbdevclass_driver_s *driver, FAR struct usbdev_s *dev) { - FAR struct cdcacm_dev_s *priv; + FAR struct pl2303_dev_s *priv; usbtrace(TRACE_CLASSRESUME, 0); @@ -1959,7 +1959,7 @@ static void usbclass_resume(FAR struct usbdevclass_driver_s *driver, /* Extract reference to private data */ - priv = ((FAR struct cdcacm_driver_s*)driver)->dev; + priv = ((FAR struct pl2303_driver_s*)driver)->dev; /* Are we still configured? */ |