summaryrefslogtreecommitdiffstats
path: root/xmrstak
diff options
context:
space:
mode:
authorpsychocrypt <psychocryptHPC@gmail.com>2018-03-29 21:02:58 +0200
committerTimothy Pearson <tpearson@raptorengineering.com>2018-06-04 21:07:11 +0000
commit9401f3c4eca59ef59d2108877fb339757fbd8d10 (patch)
tree8d15cae2b388afe704eb71cf01e43d6bedb0f60f /xmrstak
parent38085dc72773c08f3db176c339c3a989b3b28821 (diff)
downloadxmr-stak-9401f3c4eca59ef59d2108877fb339757fbd8d10.zip
xmr-stak-9401f3c4eca59ef59d2108877fb339757fbd8d10.tar.gz
github annotations
- documentation: change `aeon` to `aeon7` - change `case` order in `switch` statements - update README.txt
Diffstat (limited to 'xmrstak')
-rw-r--r--xmrstak/backend/cryptonight.hpp20
-rw-r--r--xmrstak/misc/executor.cpp1
-rw-r--r--xmrstak/pools.tpl2
3 files changed, 9 insertions, 14 deletions
diff --git a/xmrstak/backend/cryptonight.hpp b/xmrstak/backend/cryptonight.hpp
index 538f1d8..8a8e259 100644
--- a/xmrstak/backend/cryptonight.hpp
+++ b/xmrstak/backend/cryptonight.hpp
@@ -49,16 +49,14 @@ inline size_t cn_select_memory(xmrstak_algo algo)
{
switch(algo)
{
+ case cryptonight_monero:
case cryptonight:
- return CRYPTONIGHT_MEMORY;
+ return CRYPTONIGHT_MEMORY;
+ case cryptonight_aeon:
case cryptonight_lite:
return CRYPTONIGHT_LITE_MEMORY;
- case cryptonight_monero:
- return CRYPTONIGHT_MEMORY;
case cryptonight_heavy:
return CRYPTONIGHT_HEAVY_MEMORY;
- case cryptonight_aeon:
- return CRYPTONIGHT_LITE_MEMORY;
default:
return 0;
}
@@ -86,16 +84,14 @@ inline size_t cn_select_mask(xmrstak_algo algo)
{
switch(algo)
{
+ case cryptonight_monero:
case cryptonight:
return CRYPTONIGHT_MASK;
+ case cryptonight_aeon:
case cryptonight_lite:
return CRYPTONIGHT_LITE_MASK;
- case cryptonight_monero:
- return CRYPTONIGHT_MASK;
case cryptonight_heavy:
return CRYPTONIGHT_HEAVY_MASK;
- case cryptonight_aeon:
- return CRYPTONIGHT_LITE_MASK;
default:
return 0;
}
@@ -123,16 +119,14 @@ inline size_t cn_select_iter(xmrstak_algo algo)
{
switch(algo)
{
+ case cryptonight_monero:
case cryptonight:
return CRYPTONIGHT_ITER;
+ case cryptonight_aeon:
case cryptonight_lite:
return CRYPTONIGHT_LITE_ITER;
- case cryptonight_monero:
- return CRYPTONIGHT_ITER;
case cryptonight_heavy:
return CRYPTONIGHT_HEAVY_ITER;
- case cryptonight_aeon:
- return CRYPTONIGHT_LITE_ITER;
default:
return 0;
}
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index d7ff521..96f359b 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -572,6 +572,7 @@ void executor::ex_main()
break;
case cryptonight_aeon:
+ case cryptonight_lite:
if(dev_tls)
pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
else
diff --git a/xmrstak/pools.tpl b/xmrstak/pools.tpl
index d3a8a5a..f5afff6 100644
--- a/xmrstak/pools.tpl
+++ b/xmrstak/pools.tpl
@@ -20,7 +20,7 @@ POOLCONF],
/*
* Currency to mine. Supported values:
*
- * aeon
+ * aeon7 (use this for Aeon's new PoW)
* cryptonight (try this if your coin is not listed)
* cryptonight_lite
* edollar
OpenPOWER on IntegriCloud