1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-09 14:28:12 +00:00
Commit Graph

286 Commits

Author SHA1 Message Date
Noel Maersk
ae23d25086 api: proper type casting for MSVS support.
Closes https://github.com/veox/sgminer/issues/113
2014-02-24 13:54:06 +02:00
Noel Maersk
44aed3570e Merge branch 'build-msvs2010-upd' into build-msvs2010-merge
Test in separate branch before merging into master.

Conflicts (resolved):
	api.c
	util.c
2014-02-22 17:05:07 +02:00
Jim Jagielski
88c7720caf These may not be longs (eg: OSX)... fo a safe cast to ensure. 2014-02-16 15:05:44 +02:00
Kano
ae837a762f API allow multiple commands/replies in one request 2014-02-16 15:00:32 +02:00
Con Kolivas
90cc93c6cc Add the ability to display a hexadecimal 32 bit unsigned integer to the API. 2014-02-16 14:42:30 +02:00
Con Kolivas
c31de2601b Store when the last getwork was retrieved and display it in the API summary. 2014-02-16 14:14:40 +02:00
ckolivas
a58ef1b8c7 Provide a helper function for determining dev runtime and use it in the hashmeters used. 2014-02-16 14:09:51 +02:00
Kano
faf63ec036 Modify thread naming to make them easier to identify 2014-02-16 13:56:14 +02:00
Kano
301daae6f4 api.c 2014 2014-02-16 13:51:58 +02:00
Kano
b6c6ec5c83 api add data type AVG float 3 decimal 2014-02-16 13:49:26 +02:00
Kano
83ea44af5d api.c set the actual version number to 3.0
Conflicts resolved:
	api.c
2014-02-16 13:48:31 +02:00
Kano
83176cb52a API V3.0 unlimited socket reply size 2014-02-16 13:47:47 +02:00
Noel Maersk
4e08eb41ef api: bump API version number to indicate changes that happened after 4.0.0. 2014-02-11 23:39:03 +02:00
Markus Peloquin
bf8e37ce19 Support building in cygwin.
Revised the compiler platform macros. Building goes like
$ AMDAPPSDKROOT= CPPFLAGS=-I/usr/include/ncurses ./configure
2014-02-07 22:31:40 -08:00
Noel Maersk
dff7876b7a Merge branch 'master' into build-msvs2010-upd 2014-02-07 21:45:26 +02:00
Noel Maersk
0e8ec8d060 pools: Allow disabling pool even if it's the last one enabled.
Pool state machine is incomplete, and enabled_pools is not increased if
pool state is not explicitly set to "enabled" in config. However,
there is no reason why the user should not be allowed to disable
all pools.

enabled_pools is a bookkeeping variable, and bookkeeping is cumbersome.
Rather than trying to fix this regression, get rid of another place
where enabled_pools is used.

Closes https://github.com/veox/sgminer/issues/75
2014-02-05 16:28:27 +02:00
Noel Maersk
b97a641ed9 Merge branch 'master' into build-msvs2010-upd
Conflicts (resolved):
	sgminer.c
2014-02-01 00:25:56 +02:00
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.
2014-01-31 02:57:23 -06:00
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'.
2014-01-27 22:26:37 +02:00
Noel Maersk
048c82b9b2 pools: rename 'pool->enabled' to 'pool->state'. 2014-01-26 20:02:00 +02:00
Wolf
39b9945c11 Changed API reporting of MH/s for added precision. 2014-01-17 11:55:13 +02:00
Noel Maersk
50066cf3c7 misc: Replace all remaining instances of 'cgminer' with 'sgminer'.
sed again.
2014-01-15 16:36:48 +02:00
Noel Maersk
5b977125fa misc: Replace many (but not all) instances of 'cgminer' with 'sgminer'.
Just ran a `sed -i 's/cgminer/sgminer/'` on several files.
2014-01-15 15:36:19 +02:00
Kano
65518d3712 api.c no decref if not json 2014-01-15 14:32:31 +02:00
Tim Bateman
0a187bdd41 Fixed one byte stack overflow in mcast recvfrom.
The actual overflow happens when enforcing the NULL termination shortly
after the recvfrom.
2014-01-15 13:43:10 +02:00
Con Kolivas
65d9136dd5 Fix json parsing in api.c 2014-01-15 13:39:51 +02:00
Con Kolivas
39b7bc26cb Silence irrelevant warning. 2014-01-15 13:34:31 +02:00
Con Kolivas
ebeb710375 Decrement json references in api.c to not leak memory.
The json_val in api.c is a borrowed reference, not a new one so don't decref it.
2014-01-15 13:22:28 +02:00
Kano
89000ffb1a api.c trylock() add missing locklock 2014-01-15 12:48:11 +02:00
Maksym Borodin
d976abe12d api.c: Release apisock on error in api() 2014-01-15 12:45:51 +02:00
Maksym Borodin
7383e19a9d api.c: Release io_data->ptr when releasing io_data in io_free() 2014-01-15 12:45:29 +02:00
Noel Maersk
83e52dfe78 api: remove references to FPGAs and ASICs. 2014-01-11 23:01:02 +02:00
Noel Maersk
199cb10e18 HAVE_OPENCL is mandatory, remove checks form code an build system. 2013-12-05 20:49:18 +02:00
Noel Maersk
323af83fdb Remove define-clauses for USE_SCRYPT. 2013-11-24 19:52:14 +02:00
Noel Maersk
95586f72f0 Squash-merge branch dead-end with unnecessary check removals. 2013-11-24 16:18:10 +02:00
Con Kolivas
c3854378e1 Display works completed in summary and API data. 2013-11-03 01:01:24 +11:00
Con Kolivas
448b1fae64 Rationalise use of current_hash to a single hex string the length of the previous block and display only the first non zero hex chars of the block in the status window. 2013-11-02 22:25:45 +11:00
Con Kolivas
25d4f16727 Add the ability to add uint8 and uint16 entities to api data. 2013-10-31 16:37:43 +11:00
Con Kolivas
c4542f2b96 Merge branch 'master' into hfa
Conflicts:
	Makefile.am
	api.c
	configure.ac
	miner.h
2013-10-31 12:29:59 +11:00
Con Kolivas
6bcd60a931 Add KNC to api 2013-10-28 11:50:42 +11:00
Con Kolivas
669bcac36c Merge branch 'master' into hashfast 2013-10-23 12:06:20 +11:00
Kano
d9449b2578 api ... the code related to device elapsed 2013-10-22 19:27:44 +11:00
Con Kolivas
f5baf9f57a Merge branch 'master' into hashfast
Conflicts:
	usbutils.h
2013-10-18 19:12:13 +11:00
Kano
514b3c424f API add 'MHS %ds' to 'summary' 2013-10-17 20:24:09 +11:00
Kano
d3d3fc1316 Optional lock tracking and stats via the API 2013-10-17 20:24:02 +11:00
Con Kolivas
e06e495ab8 Merge branch 'master' into hashfast 2013-10-14 15:07:32 +11:00
Con Kolivas
9b5c534911 Merge branch 'master' into hashfast
Conflicts:
	api.c
	configure.ac
	miner.h
	usbutils.c
	usbutils.h
2013-10-13 16:41:53 +11:00
Kano
da7223f1b4 api incorrect message name 2013-10-12 11:30:57 +11:00
Con Kolivas
b537976036 Make pthread conditional timeouts handle all bulk usb transfer timeouts performing libusb_cancel_transfer, disabling timeouts within libusb itself. 2013-10-11 23:06:40 +11:00
Con Kolivas
d34279b226 Remove unused variables. 2013-10-08 20:48:26 +11:00