x16s warning fix + readme + vcxproj

diff --git a/NEWS b/NEWS
index ba1e18197ab1de0a54dc6c8e6d2effa3d4ee559e..de6e3a4445303ac768f19fbdffe1829012209993 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Version 1.3.3
 - Add tribus algo
 - Add x16r algo
+- Add x16s algo
 - Add keccakc variant
 
 Version 1.3.2

diff --git a/README.md b/README.md
index ed13cb3f7b30aec19bb81ca44f9ce02bca61d1ea..361a70358f34600d90ee831794f7fe1b6e010dde 100644 (file)
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ Algorithms
  * ✓ __x14__ (X14, Webcoin [WEB])
  * ✓ __x15__ (RadianceCoin [RCE])
  * ✓ __x16r__ (Ravencoin [RVN])
+ * ✓ __x16s__ (Pigeoncoin [PGN])
  * ✓ __x17__ (Verge [XVG])
  * ✓ __yescrypt__ (GlobalBoostY [BSTY], Unitus [UIS], MyriadCoin [MYR])
  * ✓ __zr5__ (Ziftrcoin [ZRC])

diff --git a/algo/x16s.c b/algo/x16s.c
index e20dea26b3751ebf6978e22d0f1b7d4ecd8dd4e6..b934a1fb21c73274acfee3d15eceda16f34871e5 100644 (file)
--- a/algo/x16s.c
+++ b/algo/x16s.c
@@ -50,7 +50,7 @@ static __thread uint32_t s_ntime = UINT32_MAX;
 static __thread char hashOrder[HASH_FUNC_COUNT + 1] = { 0 };
 
 
-static void getAlgoString(const uint32_t* prevblock, char *output)
+static void getAlgoString(const uint8_t* prevblock, char *output)
 {
        uint8_t* data = (uint8_t*)prevblock;
 
@@ -207,7 +207,7 @@ int scanhash_x16s(int thr_id, struct work *work, uint32_t max_nonce, uint64_t *h
 
        if (s_ntime != pdata[17]) {
                uint32_t ntime = swab32(pdata[17]);
-               getAlgoString((const char*) (&endiandata[1]), hashOrder);
+               getAlgoString((const uint8_t*) (&endiandata[1]), hashOrder);
                s_ntime = ntime;
                if (opt_debug && !thr_id) applog(LOG_DEBUG, "hash order %s (%08x)", hashOrder, ntime);
        }

diff --git a/cpuminer.vcxproj b/cpuminer.vcxproj
index aace24d93ae346dc3561ee5b10f354213e752d75..25ddfaacfd9f5ea0c5b1080c79095a19f35da003 100644 (file)
--- a/cpuminer.vcxproj
+++ b/cpuminer.vcxproj
@@ -250,6 +250,7 @@
     <ClCompile Include="algo\x14.c" />
     <ClCompile Include="algo\x15.c" />
     <ClCompile Include="algo\x16r.c" />
+    <ClCompile Include="algo\x16s.c" />
     <ClCompile Include="algo\x17.c" />
     <ClCompile Include="algo\xevan.c" />
     <ClCompile Include="algo\yescrypt.c" />

diff --git a/cpuminer.vcxproj.filters b/cpuminer.vcxproj.filters
index 72321286882f754f6d8a8771be0461d330f059ee..f91afdc7d4c28de69a8882421b336706ac99517f 100644 (file)
--- a/cpuminer.vcxproj.filters
+++ b/cpuminer.vcxproj.filters
@@ -288,6 +288,9 @@
     <ClCompile Include="algo\x16r.c">
       <Filter>algo</Filter>
     </ClCompile>
+    <ClCompile Include="algo\x16s.c">
+      <Filter>algo</Filter>
+    </ClCompile>
     <ClCompile Include="algo\x17.c">
       <Filter>algo</Filter>
     </ClCompile>