Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bd226f9 authored by Ruslan Bilovol's avatar Ruslan Bilovol Committed by Felipe Balbi
Browse files

include: usb: audio: specify exact endiannes of descriptors 



USB spec says that multiple byte fields are stored in
little-endian order (see chapter 8.1 of USB2.0 spec and
chapter 7.1 of USB3.0 spec), thus mark such fields as LE
for UAC1 and UAC2 headers

Signed-off-by: default avatarRuslan Bilovol <ruslan.bilovol@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent ab1d53d5

include/linux/usb/audio-v2.h

+7 −7
Original line number Diff line number Diff line
@@ -115,13 +115,13 @@ struct uac2_input_terminal_descriptor { 
	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bTerminalID;

	__u16 wTerminalType;

	__le16 wTerminalType;

	__u8 bAssocTerminal;

	__u8 bCSourceID;

	__u8 bNrChannels;

	__u32 bmChannelConfig;

	__le32 bmChannelConfig;

	__u8 iChannelNames;

	__u16 bmControls;

	__le16 bmControls;

	__u8 iTerminal;

} __attribute__((packed));
@@ -132,11 +132,11 @@ struct uac2_output_terminal_descriptor { 
	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bTerminalID;

	__u16 wTerminalType;

	__le16 wTerminalType;

	__u8 bAssocTerminal;

	__u8 bSourceID;

	__u8 bCSourceID;

	__u16 bmControls;

	__le16 bmControls;

	__u8 iTerminal;

} __attribute__((packed));
@@ -164,9 +164,9 @@ struct uac2_as_header_descriptor { 
	__u8 bTerminalLink;

	__u8 bmControls;

	__u8 bFormatType;

	__u32 bmFormats;

	__le32 bmFormats;

	__u8 bNrChannels;

	__u32 bmChannelConfig;

	__le32 bmChannelConfig;

	__u8 iChannelNames;

} __attribute__((packed));

include/uapi/linux/usb/audio.h

+3 −3
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct uac_processing_unit_descriptor { 
	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bUnitID;

	__u16 wProcessType;

	__le16 wProcessType;

	__u8 bNrInPins;

	__u8 baSourceID[];

} __attribute__ ((packed));
@@ -491,8 +491,8 @@ struct uac_format_type_ii_ext_descriptor { 
	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bFormatType;

	__u16 wMaxBitRate;

	__u16 wSamplesPerFrame;

	__le16 wMaxBitRate;

	__le16 wSamplesPerFrame;

	__u8 bHeaderLength;

	__u8 bSideBandProtocol;

} __attribute__((packed));