Merge pull request #346 from denis2342/ztex libztex: silenced another warning
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
diff --git a/libztex.c b/libztex.c
index d48dec9..21c8c04 100644
--- a/libztex.c
+++ b/libztex.c
@@ -519,13 +519,13 @@ int libztex_numberOfFpgas(struct libztex_device *ztex) {
int libztex_selectFpga(struct libztex_device *ztex) {
int cnt, fpgacnt = libztex_numberOfFpgas(ztex->root);
- uint16_t number = ztex->fpgaNum;
+ int16_t number = ztex->fpgaNum;
if (number < 0 || number >= fpgacnt) {
applog(LOG_WARNING, "%s: Trying to select wrong fpga (%d in %d)", ztex->repr, number, fpgacnt);
return 1;
}
if (ztex->root->selectedFpga != number && libztex_checkCapability(ztex->root, CAPABILITY_MULTI_FPGA)) {
- cnt = libusb_control_transfer(ztex->root->hndl, 0x40, 0x51, number, 0, NULL, 0, 500);
+ cnt = libusb_control_transfer(ztex->root->hndl, 0x40, 0x51, (uint16_t)number, 0, NULL, 0, 500);
if (unlikely(cnt < 0)) {
applog(LOG_ERR, "Ztex check device: Failed to set fpga with err %d", cnt);
return cnt;
diff --git a/libztex.h b/libztex.h
index 4b5dab3..51fe30a 100644
--- a/libztex.h
+++ b/libztex.h
@@ -46,7 +46,7 @@ struct libztex_fpgastate {
struct libztex_device {
pthread_mutex_t mutex;
struct libztex_device *root;
- int fpgaNum;
+ int16_t fpgaNum;
bool valid;
struct libusb_device_descriptor descriptor;
libusb_device_handle *hndl;
@@ -74,7 +74,7 @@ struct libztex_device {
double errorRate[256];
double maxErrorRate[256];
- int numberOfFpgas;
+ int16_t numberOfFpgas;
int selectedFpga;
bool parallelConfigSupport;