From 970e74c07d194d2eeba55874ed9ba9b7492b64cf Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 26 Dec 2010 23:37:58 -0500 Subject: [PATCH] Move 32-bit swap code into miner.h, for sharing. --- miner.h | 11 +++++++++++ sha256_via.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/miner.h b/miner.h index fc0fe5a7..7979dc01 100644 --- a/miner.h +++ b/miner.h @@ -22,6 +22,17 @@ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #endif +#define ___constant_swab32(x) ((uint32_t)( \ + (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) | \ + (((uint32_t)(x) & (uint32_t)0x0000ff00UL) << 8) | \ + (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >> 8) | \ + (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24))) + +static inline uint32_t swab32(uint32_t v) +{ + return ___constant_swab32(v); +} + extern bool opt_debug; extern bool opt_protocol; extern const uint32_t sha256_init_state[]; diff --git a/sha256_via.c b/sha256_via.c index b4e2b917..6b85e2a5 100644 --- a/sha256_via.c +++ b/sha256_via.c @@ -8,17 +8,6 @@ #ifdef WANT_VIA_PADLOCK -#define ___constant_swab32(x) ((uint32_t)( \ - (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) | \ - (((uint32_t)(x) & (uint32_t)0x0000ff00UL) << 8) | \ - (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >> 8) | \ - (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24))) - -static inline uint32_t swab32(uint32_t v) -{ - return ___constant_swab32(v); -} - static void via_sha256(void *hash, void *buf, unsigned len) { unsigned stat = 0;