Paul Sheppard
1ee191a726
limit clear buffer iterations.
2012-07-04 23:31:42 -07:00
Paul Sheppard
2aa95ab812
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
2012-07-04 18:48:27 -07:00
Paul Sheppard
54f8554af4
Ad fd check to clear buffer.
2012-07-04 18:46:41 -07:00
Kano
8aeabf67c8
miner.php remove incorrect 'DATE' error message
2012-07-05 10:17:35 +10:00
Kano
3c1704d11a
miner.php allow summary header in custom pages
2012-07-05 10:13:57 +10:00
Con Kolivas
72777f1f38
Disable nonce range support in BFL when broken support is detected.
2012-07-05 09:34:20 +10:00
Con Kolivas
96183bbdf4
Minor bfl tidy.
2012-07-05 09:21:46 +10:00
Con Kolivas
75eca07823
Restart_wait is only called with a ms value so incorporate that into the function.
2012-07-05 09:15:21 +10:00
Con Kolivas
8bc7d1c9a0
Only try to adjust dev width when curses is built in.
2012-07-05 08:59:09 +10:00
Kano
1a983e670f
miner.php define custom sum fields as a simple array
2012-07-05 08:58:22 +10:00
Con Kolivas
e5aba76042
Fix off-by-one error in nonce increment in bfl.
2012-07-05 00:40:01 +10:00
Con Kolivas
ba5c1fc07d
Use BE when setting nonce in bitforce nonce range work.
2012-07-05 00:22:42 +10:00
Con Kolivas
d6a6d70f4b
Set work blk nonce after work is queued to prevent duplicates.
2012-07-05 00:18:58 +10:00
Con Kolivas
870ba0c70e
Revert "Loop in bitforce scanhash till end nonce reaches full nonce range."
...
This reverts commit e10aa2092b
.
2012-07-05 00:17:35 +10:00
Con Kolivas
e10aa2092b
Loop in bitforce scanhash till end nonce reaches full nonce range.
2012-07-05 00:14:04 +10:00
Con Kolivas
1f2e9a49f4
Enable nonce range in the normal init sequence for bfl.
2012-07-05 00:08:33 +10:00
Con Kolivas
8766bca4d4
Queue extra work at 2/3 differently depending on whether we're using nonce range or not.
2012-07-04 23:57:54 +10:00
Con Kolivas
6314a12b31
Initially enable support for nonce range support on bfl, splitting nonces up into 3/4 size and only disable it if it fails on work submit.
2012-07-04 23:53:55 +10:00
Con Kolivas
96fba30b6b
Attempt to detect nonce range support in BFL by sending work requring its support.
2012-07-04 17:31:02 +10:00
Con Kolivas
a9746b9f5e
Limit retrying on busy for up to BITFORCE_TIMEOUT_MS
2012-07-04 16:58:08 +10:00
Con Kolivas
7046c976bc
Attempt to initialise while bitforce device returns BUSY.
2012-07-04 16:51:55 +10:00
Con Kolivas
ac8db06e46
Extend length of string that can be passed to BFL devices.
2012-07-04 16:41:28 +10:00
Con Kolivas
8b3c20bc06
Abstract out ms to timeval as a function.
2012-07-04 16:28:51 +10:00
Con Kolivas
93a7967ecb
Fix signedness warning.
2012-07-04 15:22:05 +10:00
Con Kolivas
6b11d4e4cc
Merge pull request #252 from pshep/master
...
More timing changes
2012-07-03 22:19:41 -07:00
Con Kolivas
67e92de18c
Adjust device width column to be consistent.
2012-07-04 15:16:39 +10:00
Con Kolivas
ce93c2fc62
Use cgpu-> not gpus[] in watchdog thread.
2012-07-04 14:40:02 +10:00
Paul Sheppard
c4870676c4
Add api stats (sleep time)
2012-07-03 10:40:02 -07:00
Paul Sheppard
6e6029de99
Timing tweaks
...
Added long and short timeouts, short for detecting throttling, long to give up totally.
Reset sleep time when device re-initialised
Still check results after timeout
Back up a larger time if result on first poll.
2012-07-03 10:22:11 -07:00
Con Kolivas
454607c30c
Merge pull request #251 from kanoi/notifycomms
...
Add API Notify counter 'Comms Error'
2012-07-02 21:52:58 -07:00
Kano
ff0afb94ec
Add API Notify counter 'Comms Error'
2012-07-03 13:14:30 +10:00
Con Kolivas
732783faa6
Merge branch 'bfl'
...
Conflicts:
miner.h
2012-07-03 11:35:58 +10:00
Con Kolivas
8b050083a0
Style police on api.c
2012-07-03 11:32:42 +10:00
Con Kolivas
2ec0fb9793
Merge pull request #247 from kanoi/master
...
api.c data structure + updated get_api_stats/driver-icarus.c
2012-07-02 18:26:18 -07:00
Con Kolivas
44726324c2
More style police on bitforce.
2012-07-03 11:09:33 +10:00
Con Kolivas
7ada258bbf
Merge branch 'master' into bfl
2012-07-03 11:04:44 +10:00
Con Kolivas
8783db0dc3
Do all logging outside of the bitforce mutex locking to avoid deadlocks.
2012-07-03 11:01:57 +10:00
Con Kolivas
0f405c7c18
Remove applog call from bfwrite to prevent grabbing nested mutexes.
2012-07-03 10:59:37 +10:00
Con Kolivas
978ec0d805
Bitforce style changes.
2012-07-03 10:58:30 +10:00
Con Kolivas
610cf0f0a5
Minor style changes.
2012-07-03 10:48:42 +10:00
Con Kolivas
336dbd5c98
Remove needless roundl define.
2012-07-03 10:44:59 +10:00
Con Kolivas
9d37d33df1
Merge branch 'master' of https://github.com/pshep/cgminer into bfl
2012-07-03 10:32:33 +10:00
Con Kolivas
6bbd753c06
Merge pull request #249 from iHateInventNames/master
...
Made JSON error message verbose.
2012-07-02 16:53:54 -07:00
Sergei Krivonos
aaa9f62b3e
Made JSON error message verbose.
2012-07-03 01:01:37 +03:00
Paul Sheppard
ad5b470b04
Fine-tune timing adjustment.
...
Also remove old work_restart timing.
2012-07-02 14:27:19 -07:00
Paul Sheppard
75519cb04b
Merge branch 'master' of git@github.com:pshep/cgminer.git
2012-07-02 14:26:11 -07:00
ckolivas
66e7dc700d
Check for gpu return times of >= 0, not just 0, to fix intensity dropping to -10.
2012-07-02 16:51:52 +10:00
Paul Sheppard
ce850883e7
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-07-01 23:39:09 -07:00
Paul Sheppard
cc0ad5eaa7
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
...
Conflicts:
driver-bitforce.c
2012-07-01 23:35:06 -07:00
ckolivas
391e1f7eb1
Restart is zeroed in the mining thread so no need to do it inside the bitforce code.
2012-07-02 16:13:53 +10:00