diff options
| author | psychocrypt <psychocryptHPC@gmail.com> | 2018-04-02 20:59:58 +0200 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2018-06-04 21:07:11 +0000 |
| commit | 84a00ae570170c0f2599f4c5da536b4002628cea (patch) | |
| tree | bfc3951001653220fe64922bb9a47c0770a3d05e | |
| parent | b3ceaf4682abbaec409e2a41e2d1ab3ed9621dc3 (diff) | |
| download | xmr-stak-84a00ae570170c0f2599f4c5da536b4002628cea.zip xmr-stak-84a00ae570170c0f2599f4c5da536b4002628cea.tar.gz | |
change `height` to `version`
-rename `mining_fork_height` to `*_version`
| -rw-r--r-- | xmrstak/backend/amd/minethd.cpp | 2 | ||||
| -rw-r--r-- | xmrstak/backend/cpu/minethd.cpp | 4 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/minethd.cpp | 2 | ||||
| -rw-r--r-- | xmrstak/jconf.cpp | 4 | ||||
| -rw-r--r-- | xmrstak/jconf.hpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/xmrstak/backend/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp index 9357f9a..2d6d2ba 100644 --- a/xmrstak/backend/amd/minethd.cpp +++ b/xmrstak/backend/amd/minethd.cpp @@ -219,7 +219,7 @@ void minethd::work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo); diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp index dd303b5..dec4124 100644 --- a/xmrstak/backend/cpu/minethd.cpp +++ b/xmrstak/backend/cpu/minethd.cpp @@ -459,7 +459,7 @@ void minethd::work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = func_selector(::jconf::inst()->HaveHardwareAes(), bNoPrefetch, miner_algo); @@ -716,7 +716,7 @@ void minethd::multiway_work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun_multi = func_multi_selector(N, ::jconf::inst()->HaveHardwareAes(), bNoPrefetch, miner_algo); diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index 2e29d64..514d0f6 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -266,7 +266,7 @@ void minethd::work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo); diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index 97e8a11..bd49b2e 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -84,7 +84,7 @@ struct xmrstak_coin_algo const char* coin_name; xmrstak_algo algo; xmrstak_algo algo_root; - uint8_t fork_height; + uint8_t fork_version; const char* default_pool; }; @@ -610,7 +610,7 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools) { mining_algo = coin_algos[i].algo; mining_algo_root = coin_algos[i].algo_root; - mining_fork_height = coin_algos[i].fork_height; + mining_fork_version = coin_algos[i].fork_version; break; } } diff --git a/xmrstak/jconf.hpp b/xmrstak/jconf.hpp index 336e4be..76b93dd 100644 --- a/xmrstak/jconf.hpp +++ b/xmrstak/jconf.hpp @@ -52,7 +52,7 @@ public: inline xmrstak_algo GetMiningAlgoRoot() const { return mining_algo_root; } - inline uint8_t GetMiningForkHeight() const { return mining_fork_height; } + inline uint8_t GetMiningForkVersion() const { return mining_fork_version; } std::string GetMiningCoin(); @@ -96,5 +96,5 @@ private: bool bHaveAes; xmrstak_algo mining_algo; xmrstak_algo mining_algo_root; - uint8_t mining_fork_height; + uint8_t mining_fork_version; }; |
