From d97c89ad218cd65f92b12df6c70b5de3a505bf06 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sun, 17 Sep 2017 07:29:05 +0300 Subject: [PATCH] add 6.0 and 6.1 api support --- ccminer.cpp | 20 +++++++++++--------- ccminer.vcxproj | 6 +++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ccminer.cpp b/ccminer.cpp index 0380485..21047b6 100644 --- a/ccminer.cpp +++ b/ccminer.cpp @@ -1500,9 +1500,9 @@ static bool stratum_gen_work(struct stratum_ctx *sctx, struct work *work) case ALGO_WHIRLCOIN: SHA256((uchar*)sctx->job.coinbase, sctx->job.coinbase_size, (uchar*)merkle_root); break; - case ALGO_GOSTD: - gostd(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); - break; + case ALGO_GOSTD: + gostd(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); + break; case ALGO_WHIRLPOOL: default: sha256d(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size); @@ -1512,11 +1512,11 @@ static bool stratum_gen_work(struct stratum_ctx *sctx, struct work *work) memcpy(merkle_root + 32, sctx->job.merkle[i], 32); if (opt_algo == ALGO_HEAVY || opt_algo == ALGO_MJOLLNIR) heavycoin_hash(merkle_root, merkle_root, 64); - if (opt_algo == ALGO_GOSTD) - { - memcpy(merkle_root + 32, merkle_root, 32); - gostd(merkle_root, merkle_root, 64); - } + else if (opt_algo == ALGO_GOSTD) + { + memcpy(merkle_root + 32, merkle_root, 32); + gostd(merkle_root, merkle_root, 64); + } else sha256d(merkle_root, merkle_root, 64); } @@ -3708,7 +3708,9 @@ int main(int argc, char *argv[]) CUDART_VERSION/1000, (CUDART_VERSION % 1000)/10, arch); printf(" Originally based on Christian Buchner and Christian H. project\n"); printf(" Include some algos from alexis78, djm34, sp, tsiv and klausT.\n\n"); - printf("BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo (tpruvot)\n\n"); + printf(" GOSTd algo by PurpleI2P team, ©2017. Donations are welcome to\n"); + printf(" address GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG. Thanks!\n\n"); + printf("BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo (tpruvot)\n"); } rpc_user = strdup(""); diff --git a/ccminer.vcxproj b/ccminer.vcxproj index af929c6..5ff1b67 100644 --- a/ccminer.vcxproj +++ b/ccminer.vcxproj @@ -112,7 +112,7 @@ 80 true true - compute_52,sm_52 + compute_50,sm_50 $(NVTOOLSEXT_PATH)\include;..\..\..\Common\C99 64 @@ -155,7 +155,7 @@ 80 true true - compute_50,sm_50;compute_52,sm_52;compute_30,sm_30;compute_20,sm_21 + compute_61,sm_61;compute_60,sm_60;compute_52,sm_52;compute_50,sm_50;compute_30,sm_30;compute_20,sm_21 --ptxas-options="-O2" %(AdditionalOptions) O2 @@ -198,7 +198,7 @@ 80 true true - compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_30,sm_30;compute_20,sm_21 + compute_61,sm_61;compute_60,sm_60;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_30,sm_30;compute_20,sm_21 $(NVTOOLSEXT_PATH)\include;..\..\..\Common\C99 O3 64