fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed cn/4 name

Browse source
This commit is contained in:
MoneroOcean 2019-02-21 19:24:35 -08:00
parent 43f09e915e
commit 3f8024c19e
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/common/crypto/Algorithm.cpp
View file

@ -67,7 +67,6 @@ static AlgoData const algorithms[] = {
{ "cryptonight/xtlv9", "cn/xtlv9", xmrig::CRYPTONIGHT, xmrig::VARIANT_HALF }, { "cryptonight/xtlv9", "cn/xtlv9", xmrig::CRYPTONIGHT, xmrig::VARIANT_HALF },
{ "cryptonight/wow", "cn/wow", xmrig::CRYPTONIGHT, xmrig::VARIANT_WOW }, { "cryptonight/wow", "cn/wow", xmrig::CRYPTONIGHT, xmrig::VARIANT_WOW },
{ "cryptonight/r", "cn/r", xmrig::CRYPTONIGHT, xmrig::VARIANT_4 }, { "cryptonight/r", "cn/r", xmrig::CRYPTONIGHT, xmrig::VARIANT_4 },
{ "cryptonight/4", "cn/4", xmrig::CRYPTONIGHT, xmrig::VARIANT_4 },
# ifndef XMRIG_NO_AEON # ifndef XMRIG_NO_AEON
{ "cryptonight-lite", "cn-lite", xmrig::CRYPTONIGHT_LITE, xmrig::VARIANT_AUTO }, { "cryptonight-lite", "cn-lite", xmrig::CRYPTONIGHT_LITE, xmrig::VARIANT_AUTO },
@ -133,7 +132,7 @@ static const char *variants[] = {
"trtl", "trtl",
"gpu", "gpu",
"wow", "wow",
"4", "r",
}; };
@ -299,7 +298,7 @@ const char *xmrig::Algorithm::perfAlgoName(const xmrig::PerfAlgo pa) {
"cn/2", "cn/2",
"cn/half", "cn/half",
"cn/gpu", "cn/gpu",
"cn/4", "cn/r",
"cn-lite", "cn-lite",
"cn-heavy", "cn-heavy",
"cn-pico", "cn-pico",
@ -326,7 +325,7 @@ xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) {
m_algo = xmrig::CRYPTONIGHT; m_algo = xmrig::CRYPTONIGHT;
m_variant = xmrig::VARIANT_GPU; m_variant = xmrig::VARIANT_GPU;
break; break;
case PA_CN4: case PA_CN_R:
m_algo = xmrig::CRYPTONIGHT; m_algo = xmrig::CRYPTONIGHT;
m_variant = xmrig::VARIANT_4; m_variant = xmrig::VARIANT_4;
break; break;
@ -356,7 +355,7 @@ xmrig::PerfAlgo xmrig::Algorithm::perf_algo() const {
case VARIANT_2: return PA_CN2; case VARIANT_2: return PA_CN2;
case VARIANT_HALF: return PA_CN_HALF; case VARIANT_HALF: return PA_CN_HALF;
case VARIANT_GPU: return PA_CN_GPU; case VARIANT_GPU: return PA_CN_GPU;
case VARIANT_4: return PA_CN4; case VARIANT_4: return PA_CN_R;
default: return PA_CN; default: return PA_CN;
} }
case CRYPTONIGHT_LITE: return PA_CN_LITE; case CRYPTONIGHT_LITE: return PA_CN_LITE;

2
src/common/xmrig.h
View file

@ -47,7 +47,7 @@ enum PerfAlgo {
PA_CN2, /* cn/2 (Monero) */ PA_CN2, /* cn/2 (Monero) */
PA_CN_HALF, /* cn/half (MSR) */ PA_CN_HALF, /* cn/half (MSR) */
PA_CN_GPU, /* cn/gpu (RYO) */ PA_CN_GPU, /* cn/gpu (RYO) */
PA_CN4, /* cn/4 (Monero) */ PA_CN_R, /* cn/4 (Monero) */
PA_CN_LITE, /* cn-lite/1 (AEON) */ PA_CN_LITE, /* cn-lite/1 (AEON) */
PA_CN_HEAVY, /* cn-heavy/0 (LOKI) */ PA_CN_HEAVY, /* cn-heavy/0 (LOKI) */
PA_CN_PICO, /* cn-pico/trtl (TRTL) */ PA_CN_PICO, /* cn-pico/trtl (TRTL) */