From 8353a00ba8d7a64f7877a658c7acf640bc8dd071 Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Tue, 1 Aug 2023 17:56:28 +0900 Subject: [PATCH] resource-manager: Fix BIT() to SYSCOMMON_BIT() The BIT() is too general so that it is possible to collide with other header when it is imported. Therefore, added prefix for the macro. Change-Id: Idc999d6c09364bfc9fbc0dc93fb63c1d5eeea995 Signed-off-by: Youngjae Cho --- include/libsyscommon/resource-type.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/libsyscommon/resource-type.h b/include/libsyscommon/resource-type.h index 5d2f64d..5aa3608 100644 --- a/include/libsyscommon/resource-type.h +++ b/include/libsyscommon/resource-type.h @@ -38,7 +38,7 @@ enum syscommon_resman_data_type { SYSCOMMON_RESMAN_DATA_TYPE_NUM }; -#define BIT(x) (1ULL << x) +#define SYSCOMMON_BIT(x) (1ULL << x) /* * Resource driver flags @@ -47,15 +47,15 @@ enum syscommon_resman_data_type { * - RESOURCE_DRIVER_FLAG_UNCOUNTABLE incidates that resource which is not * bound physical h/w. */ -#define SYSCOMMON_RESMAN_RESOURCE_DRIVER_FLAG_COUNT_ONLY_ONE BIT(0) -#define SYSCOMMON_RESMAN_RESOURCE_DRIVER_FLAG_UNCOUNTABLE BIT(1) +#define SYSCOMMON_RESMAN_RESOURCE_DRIVER_FLAG_COUNT_ONLY_ONE SYSCOMMON_BIT(0) +#define SYSCOMMON_RESMAN_RESOURCE_DRIVER_FLAG_UNCOUNTABLE SYSCOMMON_BIT(1) /* Resource flags */ -#define SYSCOMMON_RESMAN_RESOURCE_FLAG_PRIVATE BIT(0) -#define SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC BIT(1) +#define SYSCOMMON_RESMAN_RESOURCE_FLAG_PRIVATE SYSCOMMON_BIT(0) +#define SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC SYSCOMMON_BIT(1) /* Flags for resource_attribute */ -#define SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE BIT(0) -#define SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC BIT(1) +#define SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PRIVATE SYSCOMMON_BIT(0) +#define SYSCOMMON_RESMAN_RESOURCE_ATTR_FLAG_PUBLIC SYSCOMMON_BIT(1) #endif -- 2.34.1