sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CDC/ACM: Backward condtional compilation fixed. Provided by Lorenz Meier

Browse Source
This commit is contained in:
Gregory Nutt 2013-09-13 11:27:03 -06:00
parent b5254cc5af
commit 03413cb676
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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)

4
include/nuttx/usb/cdcacm.h
View File

@ -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)