diff options
Diffstat (limited to 'include/arch/x86_64/sound/sof')
| -rw-r--r-- | include/arch/x86_64/sound/sof/abi.h | 17 | ||||
| -rw-r--r-- | include/arch/x86_64/sound/sof/fw.h | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/include/arch/x86_64/sound/sof/abi.h b/include/arch/x86_64/sound/sof/abi.h index b3b33960..09411a1a 100644 --- a/include/arch/x86_64/sound/sof/abi.h +++ b/include/arch/x86_64/sound/sof/abi.h @@ -40,20 +40,15 @@ #define SOF_ABI_PATCH_SHIFT 0 #define SOF_ABI_PATCH_MASK 0xfff -#define SOF_ABI_VER(major, minor, patch) \ - (((major) << SOF_ABI_MAJOR_SHIFT) | ((minor) << SOF_ABI_MINOR_SHIFT) | \ - ((patch) << SOF_ABI_PATCH_SHIFT)) +#define SOF_ABI_VER(major, minor, patch) \ + (((major) << SOF_ABI_MAJOR_SHIFT) | ((minor) << SOF_ABI_MINOR_SHIFT) | ((patch) << SOF_ABI_PATCH_SHIFT)) -#define SOF_ABI_VERSION_MAJOR(version) \ - (((version) >> SOF_ABI_MAJOR_SHIFT) & SOF_ABI_MAJOR_MASK) -#define SOF_ABI_VERSION_MINOR(version) \ - (((version) >> SOF_ABI_MINOR_SHIFT) & SOF_ABI_MINOR_MASK) -#define SOF_ABI_VERSION_PATCH(version) \ - (((version) >> SOF_ABI_PATCH_SHIFT) & SOF_ABI_PATCH_MASK) +#define SOF_ABI_VERSION_MAJOR(version) (((version) >> SOF_ABI_MAJOR_SHIFT) & SOF_ABI_MAJOR_MASK) +#define SOF_ABI_VERSION_MINOR(version) (((version) >> SOF_ABI_MINOR_SHIFT) & SOF_ABI_MINOR_MASK) +#define SOF_ABI_VERSION_PATCH(version) (((version) >> SOF_ABI_PATCH_SHIFT) & SOF_ABI_PATCH_MASK) #define SOF_ABI_VERSION_INCOMPATIBLE(sof_ver, client_ver) \ - (SOF_ABI_VERSION_MAJOR((sof_ver)) != \ - SOF_ABI_VERSION_MAJOR((client_ver))) + (SOF_ABI_VERSION_MAJOR((sof_ver)) != SOF_ABI_VERSION_MAJOR((client_ver))) #define SOF_ABI_VERSION SOF_ABI_VER(SOF_ABI_MAJOR, SOF_ABI_MINOR, SOF_ABI_PATCH) diff --git a/include/arch/x86_64/sound/sof/fw.h b/include/arch/x86_64/sound/sof/fw.h index 98608953..af9292f5 100644 --- a/include/arch/x86_64/sound/sof/fw.h +++ b/include/arch/x86_64/sound/sof/fw.h @@ -73,9 +73,9 @@ struct snd_sof_mod_hdr { */ struct snd_sof_fw_header { unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */ - __u32 file_size; /* size of file minus this header */ - __u32 num_modules; /* number of modules */ - __u32 abi; /* version of header format */ + __u32 file_size; /* size of file minus this header */ + __u32 num_modules; /* number of modules */ + __u32 abi; /* version of header format */ } __attribute__((packed)); #endif |