NiceHash support

1 files changed, 9 insertions, 2 deletions

diff --git a/minethd.h b/minethd.h
index 6d6104f..d4470b1 100644
--- a/minethd.h
+++ b/minethd.h
@@ -27,14 +27,15 @@ public:
 		uint32_t    iWorkSize;
 		uint32_t    iResumeCnt;
 		uint64_t    iTarget;
+		bool        bNiceHash;
 		bool        bStall;
 		size_t      iPoolId;
 
 		miner_work() : iWorkSize(0), bStall(true), iPoolId(0) { }
 
 		miner_work(const char* sJobID, const uint8_t* bWork, uint32_t iWorkSize, uint32_t iResumeCnt,
-			uint64_t iTarget, size_t iPoolId) : iWorkSize(iWorkSize), iResumeCnt(iResumeCnt),
-			iTarget(iTarget), bStall(false), iPoolId(iPoolId)
+			uint64_t iTarget, bool bNiceHash, size_t iPoolId) : iWorkSize(iWorkSize), iResumeCnt(iResumeCnt),
+			iTarget(iTarget), bNiceHash(bNiceHash), bStall(false), iPoolId(iPoolId)
 		{
 			assert(iWorkSize <= sizeof(bWorkBlob));
 			memcpy(this->sJobID, sJobID, sizeof(miner_work::sJobID));
@@ -50,6 +51,7 @@ public:
 			iWorkSize = from.iWorkSize;
 			iResumeCnt = from.iResumeCnt;
 			iTarget = from.iTarget;
+			bNiceHash = from.bNiceHash;
 			bStall = from.bStall;
 			iPoolId = from.iPoolId;
 
@@ -75,6 +77,7 @@ public:
 			iWorkSize = from.iWorkSize;
 			iResumeCnt = from.iResumeCnt;
 			iTarget = from.iTarget;
+			bNiceHash = from.bNiceHash;
 			bStall = from.bStall;
 			iPoolId = from.iPoolId;
 
@@ -103,6 +106,10 @@ private:
 	inline uint32_t calc_start_nonce(uint32_t resume)
 		{ return (resume * iThreadCount + iThreadNo) << 22; }
 
+	// Limited version of the nonce calc above
+	inline uint32_t calc_nicehash_nonce(uint32_t start, uint32_t resume)
+		{ return start | (resume * iThreadCount + iThreadNo) << 18; }
+
 	void work_main();
 	void double_work_main();
 	void consume_work();