Con Kolivas
f70577b097
Merge pull request #229 from luke-jr/modminer_primary
...
modminer: Don't delay 2nd+ FPGAs during work restart
2012-06-19 04:38:49 -07:00
Luke Dashjr
1215da39ee
modminer: Don't delay 2nd+ FPGAs during work restart
...
Add primary_thread boolean to threads to identify a single one as the "primary" thread for shared-resource multithreading.
This is needed since ModMiners use multiple threads to interface with independent hashing components.
2012-06-18 05:51:09 +00:00
Paul Sheppard
af27b40e34
Merge branch 'master' of https://github.com/pshep/cgminer.git
2012-06-17 09:47:02 -07:00
Paul Sheppard
fe4c0869bf
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
...
Conflicts:
cgminer.c
2012-06-17 09:44:42 -07:00
Con Kolivas
0c8eb166bc
Merge pull request #228 from pshep/disable_ocl
...
Disable OpenCL code when not available.
2012-06-17 04:06:38 -07:00
Paul Sheppard
7ae22e21e3
Disable OpenCL code when not available.
2012-06-16 20:24:40 -07:00
Paul Sheppard
68f2aaf930
fix bitforce_init return value
...
Also add filename as kernel name
2012-06-15 16:43:05 -07:00
Con Kolivas
8faf3c90b8
Fix openwrt crashing on regeneratehash() by making check_solve a noop.
2012-06-16 09:22:11 +10:00
Paul Sheppard
6ed75c96cb
Remove nDev limit in watchdog_thread
...
Can't work out why it was even there... so there could still be a reason
for it!
2012-06-15 12:11:28 -07:00
Paul Sheppard
fa3f357fc1
Sick/dead handling for non-gpus
2012-06-14 17:36:59 -07:00
Paul Sheppard
bc4a259af7
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-06-14 08:13:07 -07:00
Kano
4dee0d049c
FPGA - allow device detect override without an open failure
2012-06-14 15:10:02 +00:00
Con Kolivas
3c0544ad55
Wordwrap NEWS.
2012-06-14 21:43:26 +10:00
Con Kolivas
bf3e15838f
Fix sign warning.
2012-06-14 21:36:23 +10:00
Con Kolivas
f462c082f8
Merge branch 'master' of github.com:ckolivas/cgminer
2012-06-14 21:28:33 +10:00
Con Kolivas
f72ed3b660
Bump version to 2.4.3
2012-06-14 21:25:59 +10:00
Con Kolivas
a668f74e64
Fix fpgautils.h distfail.
2012-06-14 21:25:59 +10:00
Con Kolivas
edb9780a19
Update NEWS.
2012-06-14 21:04:43 +10:00
Con Kolivas
83bf9f4334
can_roll and should_roll should have no bearing on the cycle period within the miner_thread so remove it.
2012-06-14 20:53:07 +10:00
Con Kolivas
2c2e36534c
Merge pull request #226 from kanoi/master
...
miner.php allow a separate user settings file
2012-06-14 03:40:18 -07:00
Kano
4e8779053d
miner.php allow a separate user settings file
2012-06-14 20:36:54 +10:00
Con Kolivas
ceec3f83c3
Check for strategy being changed to load balance when enabling LPs.
2012-06-14 20:36:17 +10:00
Con Kolivas
30bb3c62a6
Merge pull request #224 from kanoi/master
...
API add ModMinerQuad support
2012-06-14 02:38:24 -07:00
Con Kolivas
b0de3edeb8
Check that all threads on the device that called get_work are waiting on getwork before considering the pool lagging.
2012-06-14 17:28:24 +10:00
Con Kolivas
44f5d55d51
Iterate over each thread belonging to each device in the hashmeter instead of searching for them now that they're a list.
2012-06-14 17:16:37 +10:00
Paul Sheppard
2d1f961046
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-06-14 00:05:31 -07:00
Paul Sheppard
4fd53c9eb1
thread init fix
2012-06-14 00:04:37 -07:00
Paul Sheppard
a278ca04ce
Merge branch 'master' of https://github.com/pshep/cgminer.git
2012-06-14 00:03:08 -07:00
Con Kolivas
6e2c12eeb0
When using rotate pool strategy, ensure we only select from alive enabled pools.
2012-06-14 16:11:29 +10:00
Con Kolivas
79f4b570f7
Start longpoll from every pool when load balance strategy is in use.
2012-06-14 15:58:18 +10:00
Con Kolivas
dbe9056df4
Add mandatory and block fields to the work struct. Flag any shares that are detected as blocks as mandatory to submit, along with longpoll work from a previously rejecting pool.
2012-06-14 15:42:43 +10:00
Con Kolivas
1e3888336b
Consider the fan optimal if fanspeed is dropping but within the optimal speed window.
2012-06-14 11:24:32 +10:00
Paul Sheppard
b94e199649
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
2012-06-13 17:31:20 -07:00
Paul Sheppard
2ec612e0b4
Added startup delay to worker threads.
...
Prevents devices from making calls at the same time.
2012-06-13 17:26:37 -07:00
Con Kolivas
55e3217237
Merge pull request #225 from drizztbsd/patch-1
...
Fix typo in some API messages (succeess/success)
2012-06-13 17:20:53 -07:00
Con Kolivas
8f76d15fae
Merge pull request #223 from luke-jr/bugfix_warnings
...
Fix a bunch of warnings
2012-06-13 17:16:27 -07:00
Paul Sheppard
eff2d04df0
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
...
Conflicts:
cgminer.c
2012-06-13 12:31:33 -07:00
Paul Sheppard
1b63a75d2c
Simple auto sleep-time calibration.
...
Optimises the sleep time while waiting for the BFL work to finish.
Takes ~5 mins to settle to the correct time for each unit, then will continue to make adjustments.
2012-06-13 12:26:03 -07:00
drizztbsd
7dcd9f3ed2
Fix typo in some API messages (succeess/success)
2012-06-13 20:31:03 +03:00
Kano
836b76a0d6
api.c MMQ stat bugs
2012-06-14 03:14:02 +10:00
Luke Dashjr
c629cc5d79
Bugfix: Fix warnings when built without libudev support
2012-06-13 17:03:29 +00:00
Luke Dashjr
4eb23c7ea3
Bugfix: slay a variety of warnings
2012-06-13 17:03:26 +00:00
Luke Dashjr
b76053efea
Bugfix: modminer: Fix unsigned/signed comparison and similar warnings
2012-06-13 17:03:21 +00:00
Kano
913221c373
API add ModMinerQuad support
2012-06-14 02:57:37 +10:00
Luke Dashjr
6d092e9262
Bugfix: Honour forceauto parameter in serial_detect functions
2012-06-13 16:47:47 +00:00
Con Kolivas
67611949dc
Merge pull request #221 from luke-jr/cg_modminer
...
ModMiner cleanups and improvements
2012-06-12 19:55:37 -07:00
Paul Sheppard
2384d0fbc6
Removed idle mode... again!?
...
Changed work_reset rate to every 100ms & use defines rather than numerics.
Change total sleep time to 4300ms after performance testing/measurement (now good to 916MH/s).
Changed timeout to 15s - Throttle time is 15s.
Added support for 'Busy' when submitting work.
Improved logging text to include device identifier.
Added a thread_enable api function, called when a thread is re-enabled.
... and removed useless re-init inside scanhash.
Use modminer introduced mutex.
2012-06-12 18:20:18 -07:00
Luke Dashjr
a78d616bc5
modminer: Temperature sensor improvements
...
Display the temperature of each of the (up to) 4 FPGAs
2012-06-12 17:04:03 +00:00
Luke Dashjr
9f872d1de6
modminer: Make log messages more consistent in format
2012-06-12 17:03:47 +00:00
Paul Sheppard
861388f960
Merge branch 'master' of https://github.com/ckolivas/cgminer.git
2012-06-12 09:04:42 -07:00
