 Luke Dashjr
|
78321f3487
Merge branch 'non-scrypt' into bfgminer
|
13 years ago |
 Con Kolivas
|
6289c7c60f
Keep a counter of enabled pools and use that instead of iterating over the pool list. Use that value to ensure we don't set the last remaining active pool to the rejecting state.
|
13 years ago |
|
Luke Dashjr
|
a3582ab411
Merge branch 'refactor_stale' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
678a51f786
Merge branch 'bugfix_blkfndpool' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
0e0fc35e9e
Merge branch 'cfg_json_types' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
4ae2442831
Merge branch 'bugfix_mm_nonce' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cfa3e28b2d
Merge branch 'life_wait' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
07e01ac7e5
Merge branch 'bugfix_discardfail' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cc15919b16
Move "Q" (requested getworks) to second status line as "GW" to balance out better
|
13 years ago |
|
Luke Dashjr
|
d571a42ab5
Merge branch 'cg_logfixes' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
6a9e79f50a
Merge branch 'bugfix_procname' into bfgminer
|
13 years ago |
|
Con Kolivas
|
0a0da86c6a
Detach pthread from within the api thread in case it is terminated due to not being instantiated before pthread_cancel is called from main, leading to a segfault.
|
13 years ago |
|
Con Kolivas
|
cdc2b2c6d1
Debug output per thread hashrate is out by a factor of 1000.
|
13 years ago |
|
Con Kolivas
|
7ebda09f7e
Don't check if CPUs are sick since they can't be.
|
13 years ago |
|
Con Kolivas
|
a031b3bb83
Calculate midstate in separate function and remove likely/unlikely macros since they're dependent on pools, not code design.
|
13 years ago |
|
Con Kolivas
|
bae053f6cf
Display in debug mode when we're making the midstate locally.
|
13 years ago |
|
Luke Dashjr
|
c43b4fdde1
Merge branch 'select_input' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
e7cf6f2584
Merge branch 'devscroll' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
637294a98d
Merge branch 'bugfix_statusy' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
b78f69a4a8
Merge branch 'cl_wo_curses' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
51c582c09b
Merge branch 'runtime' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
13596ee6ea
Merge branch 'uhashrate' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
80154fd190
Merge commit 'cbef2a6' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ec6e6defb8
Bugfix: Use const struct device_api* for mt_disable
|
13 years ago |
|
Luke Dashjr
|
b92588f8c3
Merge branch 'life_init' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
5acedd22f0
Merge branch 'cgminer' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3543f598c7
Merge commit '2ce7f28' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1b01409fa0
Merge commit 'ad02627' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
0dddf9b1ef
Merge commit 'fd55fab' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
5819cf5fb5
Merge commit '75eca07' into bfgminer
|
13 years ago |
