Noel Maersk
b97a641ed9
Merge branch 'master' into build-msvs2010-upd
...
Conflicts (resolved):
sgminer.c
11 years ago
Noel Maersk
2e16fb50fa
doc: Update BUGS.md to ask whether using precompiled binary.
11 years ago
Noel Maersk
464913aa31
misc: Update AUTHORS (add Perry Huang, reorder).
11 years ago
Noel Maersk
c23522036d
ui: Don't display pool list N times if N pools are set hidden in config.
...
Also, add some comments do #endif's.
11 years ago
Noel Maersk
37f60c3d2a
Merge pull request #59 from perryh/add_api_khs
...
Add API_KHS endpoint.
11 years ago
Perry Huang
8bd980dbbd
Add API_KHS endpoint.
...
Fix multiplying before double cast.
Add endpoint to response.
Fix API response function.
Fix var name.
Add KHS to API summary.
11 years ago
Noel Maersk
9f99474e69
pools: Revert back to "Pool N" default pool name, and use json_array_index to set it.
...
Closes https://github.com/veox/sgminer/issues/51
Using j_a_i allows us to get rid of accounting vars like total_poolnames,
and pool names don't get mixed up if they're not specified for some pools.
It would still be desirable to show the URL as a pool name if poolname is not
set.
11 years ago
Noel Maersk
ed61c38ec8
build/mingw: style fixup after tonobitc merge.
...
Use `#defined(...)` instead of `#defined ...`.
Remove comments about issues - anyone removing those lines can check blame
to see why they were added.
Add tonobitc to AUTHORS.md.
11 years ago
Noel Maersk
241c94cbdd
Merge remote-tracking branch 'tonokip/master'
11 years ago
tonobitc
32b13ccb46
fix for mingw-w64
11 years ago
tonobitc
d56d4ced64
include winsock2.h to resolve ws2tcpip.h conflict
11 years ago
tonobitc
af01573a4f
sleep function still needed for MingW not MW-W64
11 years ago
Noel Maersk
e123cc20c3
kernel: search in `pwd`/kernel/ for kernels.
...
Closes https://github.com/veox/sgminer/issues/49 .
11 years ago
Noel Maersk
d203dddabb
ui: remove mention of cgminer in "Settings" menu.
11 years ago
Noel Maersk
83d984a469
doc: add releases, issues and irc channel to README.
11 years ago
troky
6c343ae28c
VS2010 build: Added libs download link.
11 years ago
Noel Maersk
14aac4b4dd
VS2010 build: move windows config.h gitignore rule to winbuild/.gitignore
11 years ago
troky
e053f49957
VS2010 build: Missing config.h and .gitignore rule to keep windows config.h
11 years ago
Noel Maersk
d9eb547c5a
VS2010 build: revert le256todouble() cast/ref/deref change.
...
Introduced by commit 87e5f35745
The cast/ref/deref is performed wrong and breaks share/best share display.
It is not the value of target that should be increased, but its address.
If all else fails, add an `#ifdef _MSVC_VER`; we should avoid it if possible.
In either case, constructs like `&(*(((uint64_t *)target) + 24))` must be
explained (in a comment).
11 years ago
Sanjin Trošelj
8d25b38e9b
VS2010 build: winbuild/* dist and project files.
...
Cherry-picked by veox.
11 years ago
Noel Maersk
761f100ab9
VS2010 build: fix a segfault from a removed realloc.
11 years ago
Noel Maersk
108ac24e2a
core: check for GPU_* environment variables unconditionally.
11 years ago
Sanjin Trošelj
87e5f35745
VS2010 build: commit elist.h and relevant changes in sgminer.c and util.c
...
Cherry-picked by veox.
Introduces a segfault. Expect a HEAD reset.
11 years ago
Sanjin Trošelj
5078db8b01
VS2010 build: Prepare util.c
...
Cherry-picked by veox.
11 years ago
Sanjin Trošelj
e35d7b1105
VS2010 build: Prepare scrypt.c
...
Cherry-picked by veox.
11 years ago
Noel Maersk
17ef58b3d1
doc: typo in doc/KERNEL.md
11 years ago
Sanjin Trošelj
5d5769156f
VS2010 build: Prepare ocl.c
...
Cherry-picked by veox.
11 years ago
Sanjin Trošelj
7ac101f365
VS2010 build: Prepare miner.h
...
Cherry-picked by veox.
11 years ago
Sanjin Trošelj
b5a3dbeac0
VS2010 build: Prepare hexdump.c
...
Cherry-picked by veox.
11 years ago
Sanjin Trošelj
db352941b2
VS2010 build: Prepare findnonce.c
...
Cherry-picked by veox.
11 years ago
Sanjin Trošelj
8c0e250db2
VS2010 build: Prepare driver-opencl.c.
...
Cherry-picked by veox.
Changes from troky: struct device_drv opencl_drv tab alignment.
11 years ago
Sanjin Trošelj
cf70796196
VS2010 build: Prepare compat/jansson-2.5.
...
Cherry-picked by veox.
Not a big fan of modifying compat libraries, makes it harder to maintain
later on. See if these changes are relevant upstream.
11 years ago
Sanjin Trošelj
5ce16a44db
VS2010 build: ccan/opt
...
Cherry-picked by veox.
11 years ago
Sanjin Trošelj
84eefc74cd
VS2010 build: prepare API.
...
Cherry-picked by veox.
Previous variable 'new' was badly named, but troky's 'n' was too cryptic.
Therefore renamed to 'newsize'.
11 years ago
Sanjin Trošelj
da42e6ac98
VS2010 build: prepare ADL.
...
Cherry-picked by veox.
11 years ago
Noel Maersk
cd5fa8d3cb
Merge branch 'windows-cross-compile'
11 years ago
Noel Maersk
e081a669f6
doc: add note about --disable-adl-checks.
...
Should close https://github.com/veox/sgminer/issues/26
11 years ago
Noel Maersk
2879994408
adl: only ask for iDrvIndex on Linux.
...
Should close https://github.com/veox/sgminer/issues/45
11 years ago
Noel Maersk
b56e65aa77
misc: line wrap.
11 years ago
Noel Maersk
a65ff54b08
doc: update README.md with "state" option.
...
Closes https://github.com/veox/sgminer/issues/44
11 years ago
Noel Maersk
d3a3ee6b31
misc: update AUTHORS.md with recent testers.
11 years ago
Noel Maersk
d7c8d1d300
core: change scantime/expiry to 10/30 from 30/120.
11 years ago
Noel Maersk
64fc8324b8
pools: initial implementation of pool state machines.
...
moved enable_pool(), disable_pool() and other functions related to
state. These could probably be factored out altogether.
Pool state default is now "enabled" - it was previosly "disabled",
but there was an unconditional function call to enable all pools
in main() previously. It was factored out by joe's earlier commits,
so not visible in this one.
11 years ago
Noel Maersk
1ebcb07302
Merge branch 'master' into pools
11 years ago
Noel Maersk
cae071b837
Merge branch 'kernels'
11 years ago
Noel Maersk
67d15f2843
Merge branch 'adl-extra-logging'
11 years ago
Noel Maersk
e269656959
Merge branch 'pools-joe'
11 years ago
Noel Maersk
048c82b9b2
pools: rename 'pool->enabled' to 'pool->state'.
11 years ago
Noel Maersk
22b78e91f6
tui: Refactor status line printing.
...
Default pool name is now URL and port instead of "Pool N" (which
is confusing).
Status line displays user-defined name.
11 years ago
Noel Maersk
6417bcce61
Merge remote-tracking branch 'joe/pool_options' into pools
11 years ago