1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-12 07:48:22 +00:00
Commit Graph

2783 Commits

Author SHA1 Message Date
Con Kolivas
54f1b80824 Free the scratchbuf memory allocated in scrypt and don't check if CPUs are sick since they can't be. Prepare for khash hash rates in display. 2012-07-14 22:19:55 +10:00
Con Kolivas
a5ebb71216 Add cpumining capability for scrypt. 2012-07-14 22:01:20 +10:00
Con Kolivas
243d005b1b Set scrypt settings and buffer size in ocl.c code to be future modifiable. 2012-07-14 16:21:27 +10:00
Con Kolivas
bd10764e76 Cope with when we cannot set intensity low enough to meet dynamic interval by inducing a forced sleep. 2012-07-14 11:07:15 +10:00
Con Kolivas
238db52aa6 Make dynamic and scrypt opencl calls blocking. 2012-07-14 11:02:22 +10:00
Con Kolivas
41daf99537 Calculate midstate in separate function and remove likely/unlikely macros since they're dependent on pools, not code design. 2012-07-14 09:45:55 +10:00
Luke Dashjr
b347a178f6 bitforce: Use "full work" vs "nonce range" for kernel name
Also move these string constants to #defines
2012-07-13 16:26:55 +00:00
Con Kolivas
8230ab0549 Display in debug mode when we're making the midstate locally. 2012-07-14 01:10:50 +10:00
Con Kolivas
ea444d0239 Fix nonce submission code for scrypt. 2012-07-14 00:59:38 +10:00
Con Kolivas
aabc723326 Make sure goffset is set for scrypt and drop padbuffer8 to something manageable for now. 2012-07-14 00:30:25 +10:00
Con Kolivas
e0296c411b Set up buffer8 for scrypt. 2012-07-13 21:35:25 +10:00
Con Kolivas
8fd3bf74df Build fix for opt scrypt. 2012-07-13 20:40:37 +10:00
Con Kolivas
1aacfe5279 Don't check postcalc nonce with sha256 in scrypt. 2012-07-13 20:38:26 +10:00
Con Kolivas
0f43eb5eb7 Don't test nonce with sha and various fixes for scrypt. 2012-07-13 20:35:44 +10:00
Con Kolivas
b085c338f6 Make scrypt buffers and midstate compatible with cgminer. 2012-07-13 20:28:36 +10:00
Con Kolivas
2ed4072b5e Use cgminer specific output array entries in scrypt kernel. 2012-07-13 19:18:11 +10:00
Con Kolivas
dd740caa98 Provide initial support for the scrypt kernel to compile with and mine scrypt with the --scrypt option. 2012-07-13 19:02:43 +10:00
Con Kolivas
5a65415b1e Enable completely compiling scrypt out. 2012-07-13 14:47:02 +10:00
Con Kolivas
176cdf8bbc Begin import of scrypt opencl kernel from reaper. 2012-07-13 14:44:52 +10:00
Con Kolivas
b6a23d0027 bitforce_get_result returns -1 on error now. 2012-07-13 11:39:34 +10:00
Con Kolivas
761bd77288 Merge pull request #267 from luke-jr/bugfix_winsleep
Fix Windows build
2012-07-12 18:12:00 -07:00
Con Kolivas
d3b8b4d905 Merge pull request #266 from luke-jr/api_select_life
rpc: Use a single switch statement for both stringifications of cgpu->status
2012-07-12 18:11:39 -07:00
Con Kolivas
aa723e7102 Check return value of read in BFgets 2012-07-13 10:54:06 +10:00
Luke Dashjr
68111323b3 Bugfix: Make our Windows nanosleep/sleep replacements standards-compliant (which fixes nmsleep) and include compat.h for bitforce (for sleep) 2012-07-12 18:24:42 +00:00
Luke Dashjr
a854779077 rpc: Use a single switch statement for both stringifications of cgpu->status 2012-07-12 17:05:25 +00:00
Con Kolivas
cdf325d751 Merge branch 'master' of github.com:ckolivas/cgminer 2012-07-12 23:15:05 +10:00
Con Kolivas
ac55cec60b Fix whitespace mangling. 2012-07-12 23:13:35 +10:00
Con Kolivas
c1c99f1dd2 Merge https://github.com/pshep/cgminer into pshep 2012-07-12 23:09:05 +10:00
Con Kolivas
89e613b943 Revert "Change BFL driver thread initialising to a constant 100ms delay between devices instead of a random arrangement."
This reverts commit 0785886b53.
2012-07-12 21:29:30 +10:00
Con Kolivas
94628b1d1c Merge pull request #265 from kanoi/minerphp
miner.php fix rig # when miners fail
2012-07-12 04:17:17 -07:00
Kano
09bdf81644 miner.php fix rig # when miners fail 2012-07-12 17:41:30 +10:00
Con Kolivas
cbef2a6a65 Only try to shut down work cleanly if we've successfully connected and started mining. 2012-07-12 16:40:15 +10:00
Con Kolivas
0ed757a020 Use switch statement for cgpu->status and fix spelling. 2012-07-12 16:05:17 +10:00
Con Kolivas
31ddad67b6 Merge pull request #263 from luke-jr/bugfix_nmsleep
Bugfix: Calculate nsec in nmsleep correctly
2012-07-11 23:00:52 -07:00
Con Kolivas
96f3a98838 Merge pull request #264 from luke-jr/life_init
Bugfix: Don't declare devices SICK if they're just busy initializing
2012-07-11 23:00:35 -07:00
Con Kolivas
f168d9696e Merge pull request #262 from luke-jr/bugfix_ocl_err
Bugfix: Adapt OpenCL scanhash errors to driver API change
2012-07-11 20:32:34 -07:00
Con Kolivas
c16ff2e988 Merge pull request #258 from zefir-k/master
fix API support for big endian machines
2012-07-11 20:30:08 -07:00
Con Kolivas
b3d8575cbe Merge pull request #260 from kanoi/minerphp
miner.php allow rig names in number buttons
2012-07-11 20:29:02 -07:00
Paul Sheppard
d4d5b28e5f Abbrv. correction 2012-07-11 14:46:09 -07:00
Luke Dashjr
c57c308d1f Bugfix: Don't declare devices SICK if they're just busy initializing
This mainly applies to ModMiner since it takes 4-5 minutes to upload the bitstream
2012-07-11 20:29:06 +00:00
Luke Dashjr
9c648c1749 Bugfix: Calculate nsec in nmsleep correctly
The old algorithm (msecs * 1000000) - (sec / 1000000000) gets total nsec,
including seconds, since the sec/1e9 should be multiplying. It's also
vulnerable to easy overflows. Using ldiv gets the quotient and remainder
in a single operation (at least on x86) and avoids overflow.
2012-07-11 20:10:52 +00:00
Luke Dashjr
a3998e26e8 Bugfix: Adapt OpenCL scanhash errors to driver API change (errors are now -1, not 0) 2012-07-11 19:43:55 +00:00
Paul Sheppard
5f0a22d230 Remove superfluous ave_wait 2012-07-11 08:32:41 -07:00
Paul Sheppard
c37a3f3007 Put kname change for broken nonce-range back in 2012-07-11 08:30:56 -07:00
Paul Sheppard
2c54522d7d Add average wait time to api stats 2012-07-11 08:11:53 -07:00
Paul Sheppard
01a69ee45e Revert "Merge branch 'ave_time' of https://github.com/pshep/cgminer.git"
This reverts commit 242e52cdf9, reversing
changes made to 4dc1bf2319.
2012-07-11 08:07:39 -07:00
ckolivas
0785886b53 Change BFL driver thread initialising to a constant 100ms delay between devices instead of a random arrangement. 2012-07-11 23:17:23 +10:00
ckolivas
9eaac43982 Spelling typo. 2012-07-11 23:12:00 +10:00
ckolivas
bf427de3ac Time opencl work from start of queueing a kernel till it's flushed when calculating dynamic intensity. 2012-07-11 23:05:10 +10:00
ckolivas
5c7e03084a Modify te scanhash API to use an int64_t and return -1 on error, allowing zero to be a valid return value. 2012-07-11 22:59:58 +10:00