GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-09-07 11:42:10 +00:00
Code Issues Releases Wiki Activity

small changes for the 2.2 release

Browse Source
This commit is contained in:
Tanguy Pruvot 2017-08-13 19:30:16 +02:00
parent 9a7d74eac4
commit 2e56177a2d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
equi/equi-stratum.cpp
View File

@ -197,7 +197,9 @@ bool equi_stratum_show_message(struct stratum_ctx *sctx, json_t *id, json_t *par
const char* data = json_string_value(val); const char* data = json_string_value(val);
if (data && strlen(data)) { if (data && strlen(data)) {
char symbol[32] = { 0 }; char symbol[32] = { 0 };
int ss = sscanf(data, "equihash %s block %u", symbol, &sctx->job.height); uint32_t height = 0;
int ss = sscanf(data, "equihash %s block %u", symbol, &height);
if (height && ss > 1) sctx->job.height = height;
if (opt_debug && ss > 1) applog(LOG_DEBUG, "%s", data); if (opt_debug && ss > 1) applog(LOG_DEBUG, "%s", data);
} }
} }

8
res/ccminer.rc
View File

@ -60,8 +60,8 @@ IDI_ICON1 ICON "ccminer.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,0 FILEVERSION 2,2,0,0
PRODUCTVERSION 2,0,0,0 PRODUCTVERSION 2,2,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x21L FILEFLAGS 0x21L
@ -76,10 +76,10 @@ BEGIN
BEGIN BEGIN
BLOCK "040904e4" BLOCK "040904e4"
BEGIN BEGIN
VALUE "FileVersion", "2.0" VALUE "FileVersion", "2.2"
VALUE "LegalCopyright", "Copyright (C) 2017" VALUE "LegalCopyright", "Copyright (C) 2017"
VALUE "ProductName", "ccminer" VALUE "ProductName", "ccminer"
VALUE "ProductVersion", "2.0" VALUE "ProductVersion", "2.2"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

5
skunk/skunk.cu
View File

@ -101,7 +101,7 @@ extern "C" int scanhash_skunk(int thr_id, struct work* work, uint32_t max_nonce,
skunk_cpu_init(thr_id, throughput); skunk_cpu_init(thr_id, throughput);
use_compat_kernels[thr_id] = (cuda_arch[dev_id] < 500 || CUDART_VERSION < 7500 || CUDART_VERSION > 8000); use_compat_kernels[thr_id] = (cuda_arch[dev_id] < 500 || CUDART_VERSION < 7500 || CUDART_VERSION > 8000);
x13_fugue512_cpu_init(thr_id, throughput); if (use_compat_kernels[thr_id]) x13_fugue512_cpu_init(thr_id, throughput);
CUDA_CALL_OR_RET_X(cudaMalloc(&d_hash[thr_id], (size_t) 64 * throughput), 0); CUDA_CALL_OR_RET_X(cudaMalloc(&d_hash[thr_id], (size_t) 64 * throughput), 0);
CUDA_CALL_OR_RET_X(cudaMalloc(&d_resNonce[thr_id], NBN * sizeof(uint32_t)), -1); CUDA_CALL_OR_RET_X(cudaMalloc(&d_resNonce[thr_id], NBN * sizeof(uint32_t)), -1);
@ -200,7 +200,8 @@ extern "C" void free_skunk(int thr_id)
cudaThreadSynchronize(); cudaThreadSynchronize();
x13_fugue512_cpu_free(thr_id); if (use_compat_kernels[thr_id])
x13_fugue512_cpu_free(thr_id);
cudaFree(d_hash[thr_id]); cudaFree(d_hash[thr_id]);
cudaFree(d_resNonce[thr_id]); cudaFree(d_resNonce[thr_id]);