 Con Kolivas
|
6d848e27b2
Merge pull request #351 from denis2342/ztex
|
13 years ago |
 Denis Ahrens
|
0559d0bb6a
libztex: in case the selectFpga() failed set the selected fpga to unknown
|
13 years ago |
 Luke Dashjr
|
d6b71382f9
Merge commit 'ab0e800' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ab0e800a1c
Bugfix: Restore work->pool after prepare_rpc_req since clean_work now clears it
|
13 years ago |
|
Con Kolivas
|
43be78cca5
Merge pull request #350 from sharky112065/master
|
13 years ago |
 sharky112065
|
ccbe0e6672
Modified windows-build.txt to update git instructions.
|
13 years ago |
|
Con Kolivas
|
40f5362aff
Merge pull request #349 from denis2342/broken_fpga
|
13 years ago |
|
Con Kolivas
|
031ba75cad
Merge pull request #348 from denis2342/ztex
|
13 years ago |
|
Denis Ahrens
|
f5a575966c
libztex: use a function for the twice called firmware reset code
|
13 years ago |
|
Denis Ahrens
|
9b1d0c9d95
libztex: removed an unused struct member (ztex->valid)
|
13 years ago |
|
Denis Ahrens
|
26ef730c28
driver-ztex: support for broken fpga on a multifpga board
|
13 years ago |
|
Con Kolivas
|
383b42f23e
Set the pool lagging flag on startup to avoid it being shown initially, and only unset it once the maximum number of staged work items has been reached.
|
13 years ago |
|
Luke Dashjr
|
60e060c89c
Merge branch 'cg_merges_20121208' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
6276c31f4e
Bugfix: Now that stage_work is trying to manipulate staged_work in the same thread, clone_available needs to stage it outside of its own lock
|
13 years ago |
|
Con Kolivas
|
8feb302945
Avoid recursive locking of the stgd lock.
|
13 years ago |
|
Con Kolivas
|
c59aeb56ff
Revert "Wake the getwork scheduler after every restart threads."
|
13 years ago |
|
Con Kolivas
|
31f75098b5
Selectively discard all work items if a longpoll or stratum restart is received without a new block to work on.
|
13 years ago |
|
Con Kolivas
|
5b03e7497d
Wake the getwork scheduler after every restart threads.
|
13 years ago |
|
Con Kolivas
|
15e5e36bcd
Return value of keep_sockalive is no longer used.
|
13 years ago |
|
Con Kolivas
|
8fcc67f308
Remove dependency on mstcpip.h for windows build by making curl version >= 7.25.0 mandatory on windows builds, and use curl functions for keepalive whenever possible instead.
|
13 years ago |
|
Luke Dashjr
|
c408f6b55c
Merge branch 'cgminer' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
2fcc8b4aea
Semi-Merge commit 'b53fa54' into cg_merges_20121208 (noop, warnings were already fixed)
|
13 years ago |
|
Luke Dashjr
|
3a5f130677
Merge commit '68f1b2c' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
3d94278203
Semi-Merge commit '30f6840' into cg_merges_20121208 (noop, already checked)
|
13 years ago |
|
Luke Dashjr
|
4b2d9224b8
Null-Merge commit 'c63916d' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
2d8d9592c8
Merge commit '67a9af6' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
fb9aca57c9
Merge commit '5c4c2d6' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
2f82adc82f
Merge commit 'fcb2653' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
7eea71e5b1
Merge commit '3d1e9f5' into cg_merges_20121208
|
13 years ago |
|
Luke Dashjr
|
58b659e176
Merge commit '927730a' into cg_merges_20121208 (uncaught conflict)
|
13 years ago |
