diff --git a/src/backend/cpu/interfaces/ICpuInfo.h b/src/backend/cpu/interfaces/ICpuInfo.h index 57f6185a..9270ca09 100644 --- a/src/backend/cpu/interfaces/ICpuInfo.h +++ b/src/backend/cpu/interfaces/ICpuInfo.h @@ -55,6 +55,8 @@ public: MSR_MOD_MAX }; +# define MSR_NAMES_LIST "none", "ryzen_17h", "ryzen_19h", "intel", "custom" + enum Flag : uint32_t { FLAG_AES, FLAG_AVX2, diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp index 43dbe1d2..7177554f 100644 --- a/src/backend/cpu/platform/BasicCpuInfo.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo.cpp @@ -53,7 +53,7 @@ namespace xmrig { static const std::array flagNames = { "aes", "avx2", "avx512f", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "xop", "popcnt", "cat_l3" }; -static const std::array msrNames = { "none", "ryzen", "intel", "custom" }; +static const std::array msrNames = { MSR_NAMES_LIST }; static inline void cpuid(uint32_t level, int32_t output[4]) diff --git a/src/crypto/rx/RxConfig.cpp b/src/crypto/rx/RxConfig.cpp index 43e21a89..c501e712 100644 --- a/src/crypto/rx/RxConfig.cpp +++ b/src/crypto/rx/RxConfig.cpp @@ -74,7 +74,7 @@ static const std::array msrPresets = { MsrItems() }; -static const std::array modNames = { "none", "ryzen_17h", "ryzen_19h", "intel", "custom" }; +static const std::array modNames = { MSR_NAMES_LIST }; static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch"); #endif