Luke Dashjr
|
3ac7f71f39
Merge branch 'bugfix_format' into bfgminer
|
13 years ago |
Luke Dashjr
|
2b3d385d6b
ztex: Fix formatting in a debug message
|
13 years ago |
Luke Dashjr
|
f77dad650e
Correct formatting in FPGA drivers
|
13 years ago |
Luke Dashjr
|
fcbaa629aa
Merge remote-tracking branch 'denis2342/claim' into bfgminer
|
13 years ago |
Denis Ahrens
|
01d7b261eb
libztex: fixed a typo
|
13 years ago |
Denis Ahrens
|
29ff10743f
libztex: check returnvalue of libusb_claim_interface() and release the
|
13 years ago |
Luke Dashjr
|
d5878cfb20
Merge branch 'cg_merges_20121210' into bfgminer
|
13 years ago |
Luke Dashjr
|
71ddb82a3e
Merge commit '7f81e34' into bfgminer
|
13 years ago |
Luke Dashjr
|
7f81e34030
libztex: Include compat.h for substitute libusb_error_name (on older libusb versions missing it)
|
13 years ago |
Luke Dashjr
|
3dbf3b0c9a
Merge commit '2b5467c' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
971e7a27ee
Merge commit '031ba75' into cg_merges_20121210
|
13 years ago |
Denis Ahrens
|
e2c8a1d0f6
libztex: avoid the use of libusb_error_name()
|
13 years ago |
Denis Ahrens
|
0559d0bb6a
libztex: in case the selectFpga() failed set the selected fpga to unknown
|
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 |
Luke Dashjr
|
2fcc8b4aea
Semi-Merge commit 'b53fa54' into cg_merges_20121208 (noop, warnings were already fixed)
|
13 years ago |
Luke Dashjr
|
0a22c21ddc
Merge commit '77ef4c2' into cg_merges_20121208
|
13 years ago |
Con Kolivas
|
b53fa540b4
Merge pull request #347 from denis2342/ztex
|
13 years ago |
Denis Ahrens
|
dba007287c
ztex: more style and whitespace fixes
|
13 years ago |
Con Kolivas
|
c1b0143dac
Merge pull request #346 from denis2342/ztex
|
13 years ago |
Denis Ahrens
|
44c0f72a53
libztex: silenced another warning
|
13 years ago |
Con Kolivas
|
77ef4c210f
Include the correct config header in libztex and include it before other includes.
|
13 years ago |
Luke Dashjr
|
d843542ae5
Merge commit '6ddc0d4' into cg_merges_20121207
|
13 years ago |
Luke Dashjr
|
6ddc0d4d02
Bugfix: ztex: Eliminate more warnings
|
13 years ago |
Luke Dashjr
|
9f2c6b602d
Merge branch 'cgminer' into cg_merges_20121207
|
13 years ago |
Luke Dashjr
|
ac1b6f9625
Merge commit 'a24483e' into cg_merges_20121207
|
13 years ago |
Luke Dashjr
|
d4b683bc26
Merge commit 'e59f668' into cg_merges_20121207
|
13 years ago |
Luke Dashjr
|
99d1c682a7
Merge remote-tracking branch 'denis2342/ztex' into cg_merges_20121207
|
13 years ago |
Luke Dashjr
|
6c8d4fbd49
Merge commit '584dc5a' into cg_merges_20121207
|
13 years ago |
Denis Ahrens
|
b7753e3317
libztex: fixed some warnings and removed some whitespaces
|
13 years ago |