diff options
Diffstat (limited to 'xmrstak/backend/nvidia')
| -rw-r--r-- | xmrstak/backend/nvidia/minethd.cpp | 17 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu | 10 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index 237dcaf..0bc6214 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -32,7 +32,8 @@ #include "xmrstak/jconf.hpp" #include "xmrstak/misc/environment.hpp" #include "xmrstak/backend/cpu/hwlocMemory.hpp" -#include "../cryptonight.hpp" +#include "xmrstak/backend/cryptonight.hpp" +#include "xmrstak/misc/utility.hpp" #include <assert.h> #include <cmath> @@ -209,7 +210,7 @@ void minethd::work_main() uint64_t iCount = 0; cryptonight_ctx* cpu_ctx; cpu_ctx = cpu::minethd::minethd_alloc_ctx(); - cn_hash_fun hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, ::jconf::inst()->IsCurrencyXMR()); + cn_hash_fun hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, ::jconf::inst()->IsCurrencyMonero()); uint32_t iNonce; globalStates::inst().iConsumeCnt++; @@ -220,8 +221,8 @@ void minethd::work_main() std::exit(0); } - bool useXMR = ::jconf::inst()->GetCurrency().compare("xmr") == 0; - bool useAEON = ::jconf::inst()->GetCurrency().compare("aeon") == 0; + bool mineMonero = strcmp_i(::jconf::inst()->GetCurrency(), "monero"); + bool useAEON = strcmp_i(::jconf::inst()->GetCurrency(), "aeon"); while (bQuit == 0) { @@ -260,16 +261,16 @@ void minethd::work_main() uint32_t foundCount; cryptonight_extra_cpu_prepare(&ctx, iNonce); -#ifndef CONF_NO_XMR - if(useXMR) +#ifndef CONF_NO_MONERO + if(mineMonero) { - cryptonight_core_cpu_hash<XMR_ITER, XMR_MASK, 19>(&ctx); + cryptonight_core_cpu_hash<MONERO_ITER, MONERO_MASK, 19>(&ctx); } #endif #ifndef CONF_NO_AEON if(useAEON) { - cryptonight_core_cpu_hash<XMR_ITER, XMR_MASK, 18>(&ctx); + cryptonight_core_cpu_hash<MONERO_ITER, MONERO_MASK, 18>(&ctx); } #endif cryptonight_extra_cpu_final(&ctx, iNonce, oWork.iTarget, &foundCount, foundNonce); diff --git a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu index 40dcc7e..abca489 100644 --- a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu +++ b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu @@ -5,7 +5,7 @@ #include <cuda_runtime.h> #include <device_functions.hpp> #include <algorithm> -#include "../../../jconf.hpp" +#include "xmrstak/jconf.hpp" #ifdef __CUDACC__ __constant__ @@ -190,9 +190,9 @@ extern "C" int cryptonight_extra_cpu_init(nvid_ctx* ctx) cudaDeviceSetCacheConfig(cudaFuncCachePreferL1); size_t hashMemSize; - if(::jconf::inst()->IsCurrencyXMR()) + if(::jconf::inst()->IsCurrencyMonero()) { - hashMemSize = XMR_MEMORY; + hashMemSize = MONERO_MEMORY; } else { @@ -355,9 +355,9 @@ extern "C" int cuda_get_deviceinfo(nvid_ctx* ctx) ctx->free_device_memory = freeMemory; size_t hashMemSize; - if(::jconf::inst()->IsCurrencyXMR()) + if(::jconf::inst()->IsCurrencyMonero()) { - hashMemSize = XMR_MEMORY; + hashMemSize = MONERO_MEMORY; } else { diff --git a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp index c622110..055a8bd 100644 --- a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp +++ b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../cryptonight.hpp" +#include "xmrstak/backend/cryptonight.hpp" #ifdef __INTELLISENSE__ #define __CUDA_ARCH__ 520 |
