michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: remove USB_SCD_ATTRIBUTES macro

Browse source 
USB_SCD_ATTRIBUTES is a configuration dependent macro
that does not map any part of the spec and does not
belong to usb_ch9 header.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-11-03 14:39:01 +01:00 • committed by Carles Cufí
commit 14c28c45f1
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/usb/usb_ch9.h
View file

@ -220,11 +220,6 @@ struct usb_association_descriptor {
#define USB_SCD_RESERVED BIT(7) #define USB_SCD_RESERVED BIT(7)
#define USB_SCD_SELF_POWERED BIT(6) #define USB_SCD_SELF_POWERED BIT(6)
#define USB_SCD_REMOTE_WAKEUP BIT(5) #define USB_SCD_REMOTE_WAKEUP BIT(5)
#define USB_SCD_ATTRIBUTES (USB_SCD_RESERVED | \
COND_CODE_1(CONFIG_USB_SELF_POWERED, \
(USB_SCD_SELF_POWERED), (0)) | \
COND_CODE_1(CONFIG_USB_DEVICE_REMOTE_WAKEUP, \
(USB_SCD_REMOTE_WAKEUP), (0)))
/** USB Defined Base Class Codes from https://www.usb.org/defined-class-codes */ /** USB Defined Base Class Codes from https://www.usb.org/defined-class-codes */
#define USB_BCC_AUDIO 0x01 #define USB_BCC_AUDIO 0x01

6
subsys/usb/class/dfu/usb_dfu.c
View file

@ -155,7 +155,11 @@ struct dev_dfu_mode_descriptor dfu_mode_desc = {
.bNumInterfaces = 1, .bNumInterfaces = 1,
.bConfigurationValue = 1, .bConfigurationValue = 1,
.iConfiguration = 0, .iConfiguration = 0,
.bmAttributes = USB_SCD_ATTRIBUTES, .bmAttributes = USB_SCD_RESERVED |
COND_CODE_1(CONFIG_USB_SELF_POWERED,
(USB_SCD_SELF_POWERED), (0)) |
COND_CODE_1(CONFIG_USB_DEVICE_REMOTE_WAKEUP,
(USB_SCD_REMOTE_WAKEUP), (0)),
.bMaxPower = CONFIG_USB_MAX_POWER, .bMaxPower = CONFIG_USB_MAX_POWER,
}, },
.sec_dfu_cfg = { .sec_dfu_cfg = {

6
subsys/usb/usb_descriptor.c
View file

@ -90,7 +90,11 @@ USBD_DEVICE_DESCR_DEFINE(primary) struct common_descriptor common_desc = {
.bNumInterfaces = 0, .bNumInterfaces = 0,
.bConfigurationValue = 1, .bConfigurationValue = 1,
.iConfiguration = 0, .iConfiguration = 0,
.bmAttributes = USB_SCD_ATTRIBUTES, .bmAttributes = USB_SCD_RESERVED |
COND_CODE_1(CONFIG_USB_SELF_POWERED,
(USB_SCD_SELF_POWERED), (0)) |
COND_CODE_1(CONFIG_USB_DEVICE_REMOTE_WAKEUP,
(USB_SCD_REMOTE_WAKEUP), (0)),
.bMaxPower = CONFIG_USB_MAX_POWER, .bMaxPower = CONFIG_USB_MAX_POWER,
}, },
}; };