diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-09-13 11:27:03 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-09-13 11:27:03 -0600 |
| commit | 307cc945b57ad34b631c6e8becc81d63729ecba0 (patch) | |
| tree | 0363cb2acf245e8b627e01b9b895fbec70c68b84 | |
| parent | c84875b8610b207c1f3b733c943288c7ec324941 (diff) | |
| download | px4-nuttx-307cc945b57ad34b631c6e8becc81d63729ecba0.tar.gz px4-nuttx-307cc945b57ad34b631c6e8becc81d63729ecba0.tar.bz2 px4-nuttx-307cc945b57ad34b631c6e8becc81d63729ecba0.zip | |
CDC/ACM: Backward condtional compilation fixed. Provided by Lorenz Meier
| -rw-r--r-- | nuttx/ChangeLog | 10 | ||||
| -rw-r--r-- | nuttx/include/nuttx/usb/cdcacm.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index fd906065d..e992e4f78 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5542,8 +5542,10 @@ * arch/arm/src/sama5/chip/sam_emac.h and sam_gmac.h: Register definition files for the SAMA5 EMAC and GMAC peripherals (incomplete on the initial commit) (2013-9-12). - * arch/arm/src/stm32/stm32_can.c: Patch provided by Lorenz - Meier (2013-9-13). - - + * arch/arm/src/stm32/stm32_can.c: Make filter register accessible + for CAN1 and CAN2. Patch provided by Lorenz Meier (2013-9-13). + * nuttx/include/nuttx/usb/cdcacm.h: Fix backward conditional + compilation in the CDC/ACM driver with regard to remote + wakeup and self-powered capabilites. Provided by Lorenz Meier + (2013-9-13) diff --git a/nuttx/include/nuttx/usb/cdcacm.h b/nuttx/include/nuttx/usb/cdcacm.h index 165d38fb3..398731165 100644 --- a/nuttx/include/nuttx/usb/cdcacm.h +++ b/nuttx/include/nuttx/usb/cdcacm.h @@ -219,13 +219,13 @@ /* USB Controller */ -#ifndef CONFIG_USBDEV_SELFPOWERED +#ifdef CONFIG_USBDEV_SELFPOWERED # define SELFPOWERED USB_CONFIG_ATTR_SELFPOWER #else # define SELFPOWERED (0) #endif -#ifndef CONFIG_USBDEV_REMOTEWAKEUP +#ifdef CONFIG_USBDEV_REMOTEWAKEUP # define REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP #else # define REMOTEWAKEUP (0) |