From 8b68c2bf7843465537312bdc35d30b21437ad5a0 Mon Sep 17 00:00:00 2001 From: ArturX Kloniecki Date: Tue, 23 Oct 2018 11:45:01 +0200 Subject: [PATCH] abi: Update abi.h header to accommodate for changes done in krenel repository Signed-off-by: ArturX Kloniecki --- src/include/uapi/abi.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/include/uapi/abi.h b/src/include/uapi/abi.h index 118ea64d4..4f0fd03c5 100644 --- a/src/include/uapi/abi.h +++ b/src/include/uapi/abi.h @@ -39,14 +39,20 @@ /** \brief SOF ABI version number. */ #define SOF_ABI_VER(major, minor, micro) \ - (((major)<<8)|((minor)<<4)|(micro)) -#define SOF_ABI_VERSION_MAJOR(version) (((version)>>8) & 0xff) -#define SOF_ABI_VERSION_MINOR(version) (((version)>>4) & 0xf) + (((major) << 8) | ((minor) << 4) | (micro)) +#define SOF_ABI_VERSION_MAJOR(version) (((version) >> 8) & 0xff) +#define SOF_ABI_VERSION_MINOR(version) (((version) >> 4) & 0xf) #define SOF_ABI_VERSION_MICRO(version) ((version) & 0xf) -#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) &&\ - SOF_ABI_VERSION_MINOR(sof_ver) != SOF_ABI_VERSION_MINOR(client_ver))) +#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)) && \ + SOF_ABI_VERSION_MINOR((sof_ver)) != \ + SOF_ABI_VERSION_MINOR((client_ver)) \ + ) \ + ) #define SOF_ABI_MAJOR 1 #define SOF_ABI_MINOR 0