GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-25 14:04:25 +00:00
Code Issues Releases Wiki Activity

ztex: more style and whitespace fixes

Browse Source
This commit is contained in:
Denis Ahrens 2012-12-08 13:09:24 +01:00
parent 44c0f72a53
commit dba007287c
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
driver-ztex.c
View File

@ -170,7 +170,7 @@ static bool ztex_checkNonce(struct libztex_device *ztex,
for (i = 0; i < 80 / 4; i++) for (i = 0; i < 80 / 4; i++)
swap32[i] = swab32(data32[i]); swap32[i] = swab32(data32[i]);
sha2(swap, 80, hash1, false); sha2(swap, 80, hash1, false);
sha2(hash1, 32, hash2, false); sha2(hash1, 32, hash2, false);
#if defined(__BIGENDIAN__) || defined(MIPSEB) #if defined(__BIGENDIAN__) || defined(MIPSEB)
@ -202,7 +202,7 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
memcpy(sendbuf, work->data + 64, 12); memcpy(sendbuf, work->data + 64, 12);
memcpy(sendbuf + 12, work->midstate, 32); memcpy(sendbuf + 12, work->midstate, 32);
ztex_selectFpga(ztex); ztex_selectFpga(ztex);
i = libztex_sendHashData(ztex, sendbuf); i = libztex_sendHashData(ztex, sendbuf);
if (i < 0) { if (i < 0) {
@ -219,7 +219,7 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
} }
} }
ztex_releaseFpga(ztex); ztex_releaseFpga(ztex);
applog(LOG_DEBUG, "%s: sent hashdata", ztex->repr); applog(LOG_DEBUG, "%s: sent hashdata", ztex->repr);
lastnonce = calloc(1, sizeof(uint32_t)*ztex->numNonces); lastnonce = calloc(1, sizeof(uint32_t)*ztex->numNonces);
@ -235,7 +235,7 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
applog(LOG_ERR, "%s: failed to allocate backlog[%d]", ztex->repr, backlog_max); applog(LOG_ERR, "%s: failed to allocate backlog[%d]", ztex->repr, backlog_max);
return -1; return -1;
} }
overflow = false; overflow = false;
applog(LOG_DEBUG, "%s: entering poll loop", ztex->repr); applog(LOG_DEBUG, "%s: entering poll loop", ztex->repr);
@ -315,9 +315,7 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
} }
} }
} }
} }
} }
ztex->errorRate[ztex->freqM] = ztex->errorCount[ztex->freqM] / ztex->errorWeight[ztex->freqM] * (ztex->errorWeight[ztex->freqM] < 100? ztex->errorWeight[ztex->freqM] * 0.01: 1.0); ztex->errorRate[ztex->freqM] = ztex->errorCount[ztex->freqM] / ztex->errorWeight[ztex->freqM] * (ztex->errorWeight[ztex->freqM] < 100? ztex->errorWeight[ztex->freqM] * 0.01: 1.0);
@ -338,7 +336,7 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
free(lastnonce); free(lastnonce);
free(backlog); free(backlog);
return noncecnt; return noncecnt;
} }
@ -358,7 +356,7 @@ static bool ztex_prepare(struct thr_info *thr)
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
get_datestamp(cgpu->init, &now); get_datestamp(cgpu->init, &now);
ztex_selectFpga(ztex); ztex_selectFpga(ztex);
if (libztex_configureFpga(ztex) != 0) { if (libztex_configureFpga(ztex) != 0) {
libztex_resetFpga(ztex); libztex_resetFpga(ztex);

33
libztex.c
View File

@ -49,7 +49,8 @@
#define CAPABILITY_MULTI_FPGA 0,7 #define CAPABILITY_MULTI_FPGA 0,7
static int libztex_get_string_descriptor_ascii(libusb_device_handle *dev, uint8_t desc_index, static int libztex_get_string_descriptor_ascii(libusb_device_handle *dev, uint8_t desc_index,
unsigned char *data, int length) { unsigned char *data, int length)
{
int i, cnt; int i, cnt;
uint16_t langid; uint16_t langid;
unsigned char buf[260]; unsigned char buf[260];
@ -90,7 +91,8 @@ static int libztex_get_string_descriptor_ascii(libusb_device_handle *dev, uint8_
return LIBUSB_SUCCESS; return LIBUSB_SUCCESS;
} }
enum check_result { enum check_result
{
CHECK_ERROR, CHECK_ERROR,
CHECK_IS_NOT_ZTEX, CHECK_IS_NOT_ZTEX,
CHECK_OK, CHECK_OK,
@ -494,9 +496,11 @@ int libztex_configureFpga(struct libztex_device *ztex)
return rv; return rv;
} }
int libztex_numberOfFpgas(struct libztex_device *ztex) { int libztex_numberOfFpgas(struct libztex_device *ztex)
{
int cnt; int cnt;
unsigned char buf[3]; unsigned char buf[3];
if (ztex->numberOfFpgas < 0) { if (ztex->numberOfFpgas < 0) {
if (libztex_checkCapability(ztex, CAPABILITY_MULTI_FPGA)) { if (libztex_checkCapability(ztex, CAPABILITY_MULTI_FPGA)) {
cnt = libusb_control_transfer(ztex->hndl, 0xc0, 0x50, 0, 0, buf, 3, 1000); cnt = libusb_control_transfer(ztex->hndl, 0xc0, 0x50, 0, 0, buf, 3, 1000);
@ -516,9 +520,11 @@ int libztex_numberOfFpgas(struct libztex_device *ztex) {
return ztex->numberOfFpgas; return ztex->numberOfFpgas;
} }
int libztex_selectFpga(struct libztex_device *ztex) { int libztex_selectFpga(struct libztex_device *ztex)
{
int cnt, fpgacnt = libztex_numberOfFpgas(ztex->root); int cnt, fpgacnt = libztex_numberOfFpgas(ztex->root);
int16_t number = ztex->fpgaNum; int16_t number = ztex->fpgaNum;
if (number < 0 || number >= fpgacnt) { if (number < 0 || number >= fpgacnt) {
applog(LOG_WARNING, "%s: Trying to select wrong fpga (%d in %d)", ztex->repr, number, fpgacnt); applog(LOG_WARNING, "%s: Trying to select wrong fpga (%d in %d)", ztex->repr, number, fpgacnt);
return 1; return 1;
@ -534,7 +540,8 @@ int libztex_selectFpga(struct libztex_device *ztex) {
return 0; return 0;
} }
int libztex_setFreq(struct libztex_device *ztex, uint16_t freq) { int libztex_setFreq(struct libztex_device *ztex, uint16_t freq)
{
int cnt; int cnt;
uint16_t oldfreq = ztex->freqM; uint16_t oldfreq = ztex->freqM;
@ -562,7 +569,8 @@ int libztex_resetFpga(struct libztex_device *ztex)
return libusb_control_transfer(ztex->hndl, 0x40, 0x31, 0, 0, NULL, 0, 1000); return libusb_control_transfer(ztex->hndl, 0x40, 0x31, 0, 0, NULL, 0, 1000);
} }
int libztex_suspend(struct libztex_device *ztex) { int libztex_suspend(struct libztex_device *ztex)
{
if (ztex->suspendSupported) { if (ztex->suspendSupported) {
return libusb_control_transfer(ztex->hndl, 0x40, 0x84, 0, 0, NULL, 0, 1000); return libusb_control_transfer(ztex->hndl, 0x40, 0x84, 0, 0, NULL, 0, 1000);
} else { } else {
@ -570,7 +578,8 @@ int libztex_suspend(struct libztex_device *ztex) {
} }
} }
int libztex_prepare_device(struct libusb_device *dev, struct libztex_device** ztex) { int libztex_prepare_device(struct libusb_device *dev, struct libztex_device** ztex)
{
struct libztex_device *newdev = *ztex; struct libztex_device *newdev = *ztex;
int i, cnt, err; int i, cnt, err;
unsigned char buf[64]; unsigned char buf[64];
@ -598,7 +607,7 @@ int libztex_prepare_device(struct libusb_device *dev, struct libztex_device** zt
applog(LOG_ERR, "Ztex check device: Failed to read ztex descriptor with err %d", cnt); applog(LOG_ERR, "Ztex check device: Failed to read ztex descriptor with err %d", cnt);
return cnt; return cnt;
} }
if (buf[0] != 40 || buf[1] != 1 || buf[2] != 'Z' || buf[3] != 'T' || buf[4] != 'E' || buf[5] != 'X') { if (buf[0] != 40 || buf[1] != 1 || buf[2] != 'Z' || buf[3] != 'T' || buf[4] != 'E' || buf[5] != 'X') {
applog(LOG_ERR, "Ztex check device: Error reading ztex descriptor"); applog(LOG_ERR, "Ztex check device: Error reading ztex descriptor");
return 2; return 2;
@ -822,11 +831,12 @@ int libztex_sendHashData(struct libztex_device *ztex, unsigned char *sendbuf)
} }
if (unlikely(cnt < 0)) if (unlikely(cnt < 0))
applog(LOG_ERR, "%s: Failed sendHashData with err %d", ztex->repr, cnt); applog(LOG_ERR, "%s: Failed sendHashData with err %d", ztex->repr, cnt);
return cnt; return cnt;
} }
int libztex_readHashData(struct libztex_device *ztex, struct libztex_hash_data nonces[]) { int libztex_readHashData(struct libztex_device *ztex, struct libztex_hash_data nonces[])
{
int bufsize = 12 + ztex->extraSolutions * 4; int bufsize = 12 + ztex->extraSolutions * 4;
int cnt = 0, i, j, ret, len; int cnt = 0, i, j, ret, len;
unsigned char *rbuf; unsigned char *rbuf;
@ -859,7 +869,7 @@ int libztex_readHashData(struct libztex_device *ztex, struct libztex_hash_data n
memcpy((char*)&nonces[i].goldenNonce[0], &rbuf[i*bufsize], 4); memcpy((char*)&nonces[i].goldenNonce[0], &rbuf[i*bufsize], 4);
nonces[i].goldenNonce[0] -= ztex->offsNonces; nonces[i].goldenNonce[0] -= ztex->offsNonces;
//applog(LOG_DEBUG, "W %d:0 %0.8x", i, nonces[i].goldenNonce[0]); //applog(LOG_DEBUG, "W %d:0 %0.8x", i, nonces[i].goldenNonce[0]);
memcpy((char*)&nonces[i].nonce, &rbuf[(i*bufsize)+4], 4); memcpy((char*)&nonces[i].nonce, &rbuf[(i*bufsize)+4], 4);
nonces[i].nonce -= ztex->offsNonces; nonces[i].nonce -= ztex->offsNonces;
memcpy((char*)&nonces[i].hash7, &rbuf[(i*bufsize)+8], 4); memcpy((char*)&nonces[i].hash7, &rbuf[(i*bufsize)+8], 4);
@ -887,3 +897,4 @@ void libztex_freeDevList(struct libztex_dev_list **devs)
} }
free(devs); free(devs);
} }