diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-09-20 10:00:30 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-09-20 10:00:30 -0600 |
| commit | c794150a59dd58c83ad5e80b20ce17d9b3713740 (patch) | |
| tree | e6e3b2bbcdd8ed25877c26c78c4b577401467bbf /nuttx/drivers/usbdev/pl2303.c | |
| parent | bfcf82862ab67196f91f5f6138c20111503b55d1 (diff) | |
| download | px4-nuttx-c794150a59dd58c83ad5e80b20ce17d9b3713740.tar.gz px4-nuttx-c794150a59dd58c83ad5e80b20ce17d9b3713740.tar.bz2 px4-nuttx-c794150a59dd58c83ad5e80b20ce17d9b3713740.zip | |
Names of some USB device definitions changed to avoid collisions
Diffstat (limited to 'nuttx/drivers/usbdev/pl2303.c')
| -rw-r--r-- | nuttx/drivers/usbdev/pl2303.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nuttx/drivers/usbdev/pl2303.c b/nuttx/drivers/usbdev/pl2303.c index 4f75275e2..8c36ade4c 100644 --- a/nuttx/drivers/usbdev/pl2303.c +++ b/nuttx/drivers/usbdev/pl2303.c @@ -139,16 +139,16 @@ /* USB Controller */ -#ifndef CONFIG_USBDEV_SELFPOWERED -# define SELFPOWERED USB_CONFIG_ATTR_SELFPOWER +#ifdef CONFIG_USBDEV_SELFPOWERED +# define PL2303_SELFPOWERED USB_CONFIG_ATTR_SELFPOWER #else -# define SELFPOWERED (0) +# define PL2303_SELFPOWERED (0) #endif -#ifndef CONFIG_USBDEV_REMOTEWAKEUP -# define REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP +#ifdef CONFIG_USBDEV_REMOTEWAKEUP +# define PL2303_REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP #else -# define REMOTEWAKEUP (0) +# define PL2303_REMOTEWAKEUP (0) #endif #ifndef CONFIG_USBDEV_MAXPOWER @@ -438,7 +438,9 @@ static const struct usb_cfgdesc_s g_cfgdesc = PL2303_NINTERFACES, /* ninterfaces */ PL2303_CONFIGID, /* cfgvalue */ PL2303_CONFIGSTRID, /* icfg */ - USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */ + USB_CONFIG_ATTR_ONE | /* attr */ + PL2303_SELFPOWERED | + PL2303_REMOTEWAKEUP, (CONFIG_USBDEV_MAXPOWER + 1) / 2 /* mxpower */ }; |