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

Fix trivial warnings in knc driver.

nfactor-troky
Con Kolivas 11 years ago
parent
6bcd60a931
commit
5467dfe7a9
1 changed files with 8 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. 15
      driver-knc-spi-fpga.c

15
driver-knc-spi-fpga.c
Unescape View File

@ -4,6 +4,7 @@
#include <assert.h> #include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/spi/spidev.h> #include <linux/spi/spidev.h>
@ -168,7 +169,7 @@ static inline bool knc_active_fifo_full(struct knc_state *knc)
static inline void knc_queued_fifo_inc_idx(int *idx) static inline void knc_queued_fifo_inc_idx(int *idx)
{ {
if (unlikely(*idx >= (KNC_QUEUED_BUFFER_SIZE - 1))) if (unlikely(*idx >= ((int)KNC_QUEUED_BUFFER_SIZE - 1)))
*idx = 0; *idx = 0;
else else
++(*idx); ++(*idx);
@ -248,7 +249,7 @@ static struct spidev_context * spi_new(int idx)
l_ioctl_error: l_ioctl_error:
applog(LOG_ERR, "KnC spi: ioctl error on SPI device %s: %m", dev_fname); applog(LOG_ERR, "KnC spi: ioctl error on SPI device %s: %m", dev_fname);
l_close_free_exit_error: // l_close_free_exit_error:
close(ctx->fd); close(ctx->fd);
l_free_exit_error: l_free_exit_error:
free(ctx); free(ctx);
@ -362,12 +363,12 @@ static void knc_work_from_queue_to_spi(struct knc_state *knc,
} }
static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu, static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu,
struct spi_rx_t *rxbuf, int num) struct spi_rx_t *rxbuf, int __maybe_unused num)
{ {
struct knc_state *knc = cgpu->knc_state; struct knc_state *knc = cgpu->knc_state;
struct work *work; struct work *work;
int64_t us; int64_t us;
int works, submitted, completed, i, num_sent; int submitted, completed, i, num_sent;
int next_read_q, next_read_a; int next_read_q, next_read_a;
struct timeval now; struct timeval now;
@ -411,7 +412,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
/* check for completed works and calculated nonces */ /* check for completed works and calculated nonces */
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
completed = 0; completed = 0;
for (i = 0; i < MAX_RESPONSES_IN_BATCH; ++i) for (i = 0; i < (int)MAX_RESPONSES_IN_BATCH; ++i)
{ {
if ( (rxbuf->responses[i].type != RESPONSE_TYPE_NONCE_FOUND) && if ( (rxbuf->responses[i].type != RESPONSE_TYPE_NONCE_FOUND) &&
(rxbuf->responses[i].type != RESPONSE_TYPE_WORK_DONE) (rxbuf->responses[i].type != RESPONSE_TYPE_WORK_DONE)
@ -464,13 +465,13 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
rxbuf->responses[i].core; rxbuf->responses[i].core;
if (submit_nonce(thr, work, if (submit_nonce(thr, work,
rxbuf->responses[i].nonce)) { rxbuf->responses[i].nonce)) {
if (cidx < sizeof(knc->hwerrs)) { if (cidx < (int)sizeof(knc->hwerrs)) {
knc->hwerrs[cidx] = 0; knc->hwerrs[cidx] = 0;
knc->disa_cnt[cidx] = 0; knc->disa_cnt[cidx] = 0;
knc->hwerr_work_id[cidx] = 0xFFFFFFFF; knc->hwerr_work_id[cidx] = 0xFFFFFFFF;
} }
} else { } else {
if ((cidx < sizeof(knc->hwerrs)) && if ((cidx < (int)sizeof(knc->hwerrs)) &&
(knc->hwerr_work_id[cidx] != rxbuf->responses[i].work_id)) { (knc->hwerr_work_id[cidx] != rxbuf->responses[i].work_id)) {
knc->hwerr_work_id[cidx] = rxbuf->responses[i].work_id; knc->hwerr_work_id[cidx] = rxbuf->responses[i].work_id;
if (++(knc->hwerrs[cidx]) >= HW_ERR_LIMIT) { if (++(knc->hwerrs[cidx]) >= HW_ERR_LIMIT) {

Write Preview
Loading…
Cancel
Save