 Luke Dashjr
|
6e2acaa7c9
Merge branch 'cgminer' into bfgminer
|
13 years ago |
 Con Kolivas
|
aa723e7102
Check return value of read in BFgets
|
13 years ago |
|
Luke Dashjr
|
46a2643b4d
Merge branch 'bugfix_mm_lphashes' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
8e74af05c4
Merge branch 'bugfix_mm_err-1' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
86095d78e7
Bugfix: modminer: Adapt "get nonce" error condition to new scanhash=>-1 error API
|
13 years ago |
|
Luke Dashjr
|
d571a60b1a
Bugfix: modminer: Count hashes done before work restart
|
13 years ago |
|
Luke Dashjr
|
7991e25f15
Merge branch 'bugfix_winsleep' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
68111323b3
Bugfix: Make our Windows nanosleep/sleep replacements standards-compliant (which fixes nmsleep) and include compat.h for bitforce (for sleep)
|
13 years ago |
|
Luke Dashjr
|
6d186b9c68
Merge branch 'cgminer' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d608d833d8
bitforce: Use "full work" vs "nonce range" for kernel name
|
13 years ago |
|
Luke Dashjr
|
de7ef5a257
Merge commit 'c1c99f1' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
80154fd190
Merge commit 'cbef2a6' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
571f0208df
Merge commit '0ed757a' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
da76164f63
Merge commit '31ddad6' into bfgminer
|
13 years ago |
|
Con Kolivas
|
cdf325d751
Merge branch 'master' of github.com:ckolivas/cgminer
|
13 years ago |
|
Con Kolivas
|
ac55cec60b
Fix whitespace mangling.
|
13 years ago |
|
Con Kolivas
|
c1c99f1dd2
Merge https://github.com/pshep/cgminer into pshep
|
13 years ago |
|
Con Kolivas
|
89e613b943
Revert "Change BFL driver thread initialising to a constant 100ms delay between devices instead of a random arrangement."
|
13 years ago |
|
Con Kolivas
|
94628b1d1c
Merge pull request #265 from kanoi/minerphp
|
13 years ago |
 Kano
|
09bdf81644
miner.php fix rig # when miners fail
|
13 years ago |
|
Con Kolivas
|
cbef2a6a65
Only try to shut down work cleanly if we've successfully connected and started mining.
|
13 years ago |
|
Con Kolivas
|
0ed757a020
Use switch statement for cgpu->status and fix spelling.
|
13 years ago |
|
Con Kolivas
|
31ddad67b6
Merge pull request #263 from luke-jr/bugfix_nmsleep
|
13 years ago |
|
Con Kolivas
|
96f3a98838
Merge pull request #264 from luke-jr/life_init
|
13 years ago |
|
Con Kolivas
|
f168d9696e
Merge pull request #262 from luke-jr/bugfix_ocl_err
|
13 years ago |
|
Con Kolivas
|
c16ff2e988
Merge pull request #258 from zefir-k/master
|
13 years ago |
|
Con Kolivas
|
b3d8575cbe
Merge pull request #260 from kanoi/minerphp
|
13 years ago |
|
Luke Dashjr
|
96c8742cae
Merge branch 'mm_init_clock' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
bdd4de7a2a
modminer: Firmware returns 0xffffff00 immediately if we set clockspeed too high
|
13 years ago |
|
Luke Dashjr
|
69dd1511e1
Merge branch 'bugfix_mm_hweratio' into bfgminer
|
13 years ago |
