Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Ruslan Bilovol 8 years ago
parent
ab1d53d598
commit
8bd226f9a7
2 changed files with 10 additions and 10 deletions
Split View Show Diff Stats
  1. 7 7
      include/linux/usb/audio-v2.h
  2. 3 3
      include/uapi/linux/usb/audio.h

+ 7 - 7
include/linux/usb/audio-v2.h
View File 

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

+ 3 - 3
include/uapi/linux/usb/audio.h
View File 

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