Commit 52bb99c3eab9f27d7afcfe62bd07c94f37070776
2012-02-11T21:42:02
Fix double definition of A0 B0 to zeroA zeroB.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/device-gpu.c b/device-gpu.c
index ba230bc..44697e0 100644
--- a/device-gpu.c
+++ b/device-gpu.c
@@ -764,8 +764,8 @@ static cl_int queue_diakgcn_kernel(_clState *clState, dev_blk_ctx *blk)
CL_SET_BLKARG(ctx_g);
CL_SET_BLKARG(ctx_h);
- CL_SET_BLKARG(A0);
- CL_SET_BLKARG(B0);
+ CL_SET_BLKARG(zeroA);
+ CL_SET_BLKARG(zeroB);
CL_SET_ARG(clState->outputBuffer);
diff --git a/findnonce.c b/findnonce.c
index 8ea4e1c..2781dd6 100644
--- a/findnonce.c
+++ b/findnonce.c
@@ -120,8 +120,8 @@ void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data) {
blk->W16addK16 = blk->W16 + SHA256_K[16];
blk->W17addK17 = blk->W17 + SHA256_K[17];
- blk->A0 = blk->ctx_a + 0x98c7e2a2;
- blk->B0 = blk->ctx_a + 0xfc08884d;
+ blk->zeroA = blk->ctx_a + 0x98c7e2a2;
+ blk->zeroB = blk->ctx_a + 0xfc08884d;
}
#define P(t) (W[(t)&0xF] = W[(t-16)&0xF] + (rotate(W[(t-15)&0xF], 25) ^ rotate(W[(t-15)&0xF], 14) ^ (W[(t-15)&0xF] >> 3)) + W[(t-7)&0xF] + (rotate(W[(t-2)&0xF], 15) ^ rotate(W[(t-2)&0xF], 13) ^ (W[(t-2)&0xF] >> 10)))
diff --git a/miner.h b/miner.h
index f1160e0..6905088 100644
--- a/miner.h
+++ b/miner.h
@@ -618,7 +618,7 @@ typedef struct {
/* For diakgcn */
cl_uint B1addK6, PreVal0addK7, W16addK16, W17addK17;
- cl_uint A0, B0;
+ cl_uint zeroA, zeroB;
} dev_blk_ctx;
#else
typedef struct {