mirror of
https://github.com/xmrig/xmrig.git
synced 2025-03-12 09:37:35 +00:00
Merge pull request #1946 from SChernykh/dev
Fixed MSR mod names in JSON API
This commit is contained in:
commit
8737af0f6f
3 changed files with 4 additions and 2 deletions
|
@ -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,
|
||||
|
|
|
@ -53,7 +53,7 @@ namespace xmrig {
|
|||
|
||||
|
||||
static const std::array<const char *, ICpuInfo::FLAG_MAX> flagNames = { "aes", "avx2", "avx512f", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "xop", "popcnt", "cat_l3" };
|
||||
static const std::array<const char *, ICpuInfo::MSR_MOD_MAX> msrNames = { "none", "ryzen", "intel", "custom" };
|
||||
static const std::array<const char *, ICpuInfo::MSR_MOD_MAX> msrNames = { MSR_NAMES_LIST };
|
||||
|
||||
|
||||
static inline void cpuid(uint32_t level, int32_t output[4])
|
||||
|
|
|
@ -74,7 +74,7 @@ static const std::array<MsrItems, kMsrArraySize> msrPresets = {
|
|||
MsrItems()
|
||||
};
|
||||
|
||||
static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen_17h", "ryzen_19h", "intel", "custom" };
|
||||
static const std::array<const char *, kMsrArraySize> modNames = { MSR_NAMES_LIST };
|
||||
|
||||
static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue