GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Revert two different hash_sequence(_head)'s to one variable, use HF_SEQUENCE_DISTANCE in both places

nfactor-troky
Adrian Port 11 years ago committed by Con Kolivas
parent
fdcac44218
commit
178c9a0cc8
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      driver-hashfast.c

14
driver-hashfast.c
Unescape View File

@ -242,7 +242,7 @@ static bool hfa_reset(struct cgpu_info *hashfast, struct hashfast_info *info)
info->core_count = h->core_address; info->core_count = h->core_address;
info->device_type = (uint8_t)h->hdata; info->device_type = (uint8_t)h->hdata;
info->ref_frequency = (uint8_t)(h->hdata>>8); info->ref_frequency = (uint8_t)(h->hdata>>8);
info->hash_sequence = 0; info->hash_sequence_head = 0;
info->hash_sequence_tail = 0; info->hash_sequence_tail = 0;
info->device_sequence_tail = 0; info->device_sequence_tail = 0;
@ -435,7 +435,7 @@ static void hfa_parse_gwq_status(struct cgpu_info *hashfast, struct hashfast_inf
applog(LOG_DEBUG, "HFA %d: OP_GWQ_STATUS, device_head %4d tail %4d my tail %4d shed %3d inflight %4d", applog(LOG_DEBUG, "HFA %d: OP_GWQ_STATUS, device_head %4d tail %4d my tail %4d shed %3d inflight %4d",
hashfast->device_id, g->sequence_head, g->sequence_tail, info->hash_sequence_tail, hashfast->device_id, g->sequence_head, g->sequence_tail, info->hash_sequence_tail,
g->shed_count, SEQUENCE_DISTANCE(info->hash_sequence_head,g->sequence_tail)); g->shed_count, HF_SEQUENCE_DISTANCE(info->hash_sequence_head,g->sequence_tail));
mutex_lock(&info->lock); mutex_lock(&info->lock);
info->hash_count += g->hash_count; info->hash_count += g->hash_count;
@ -697,7 +697,7 @@ static int hfa_jobs(struct hashfast_info *info)
int ret; int ret;
mutex_lock(&info->lock); mutex_lock(&info->lock);
ret = info->usb_init_base.inflight_target - HF_SEQUENCE_DISTANCE(info->hash_sequence, info->device_sequence_tail); ret = info->usb_init_base.inflight_target - HF_SEQUENCE_DISTANCE(info->hash_sequence_head, info->device_sequence_tail);
/* Place an upper limit on how many jobs to queue to prevent sending /* Place an upper limit on how many jobs to queue to prevent sending
* more work than the device can use after a period of outage. */ * more work than the device can use after a period of outage. */
if (ret > info->usb_init_base.inflight_target) if (ret > info->usb_init_base.inflight_target)
@ -765,7 +765,7 @@ restart:
intdiff = (uint64_t)work->device_diff; intdiff = (uint64_t)work->device_diff;
for (i = 31; intdiff; i++, intdiff >>= 1); for (i = 31; intdiff; i++, intdiff >>= 1);
op_hash_data.search_difficulty = i; op_hash_data.search_difficulty = i;
if ((sequence = info->hash_sequence + 1) >= info->num_sequence) if ((sequence = info->hash_sequence_head + 1) >= info->num_sequence)
sequence = 0; sequence = 0;
ret = hfa_send_frame(hashfast, OP_HASH, sequence, (uint8_t *)&op_hash_data, sizeof(op_hash_data)); ret = hfa_send_frame(hashfast, OP_HASH, sequence, (uint8_t *)&op_hash_data, sizeof(op_hash_data));
if (unlikely(!ret)) { if (unlikely(!ret)) {
@ -778,12 +778,12 @@ restart:
} }
mutex_lock(&info->lock); mutex_lock(&info->lock);
info->hash_sequence = sequence; info->hash_sequence_head = sequence;
info->works[info->hash_sequence] = work; info->works[info->hash_sequence_head] = work;
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
applog(LOG_DEBUG, "HFA %d: OP_HASH sequence %d search_difficulty %d work_difficulty %g", applog(LOG_DEBUG, "HFA %d: OP_HASH sequence %d search_difficulty %d work_difficulty %g",
hashfast->device_id, info->hash_sequence, op_hash_data.search_difficulty, work->work_difficulty); hashfast->device_id, info->hash_sequence_head, op_hash_data.search_difficulty, work->work_difficulty);
} }
mutex_lock(&info->lock); mutex_lock(&info->lock);

Write Preview
Loading…
Cancel
Save