Browse Source

fix windows log warnings

nfactor-troky
Kano 12 years ago
parent
commit
6ca0eaa987
  1. 8
      driver-modminer.c
  2. 2
      fpgautils.c
  3. 4
      libztex.c
  4. 24
      usbutils.c

8
driver-modminer.c

@ -511,9 +511,9 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
ptr += amount; ptr += amount;
if (opt_debug) if (opt_debug)
applog(LOG_DEBUG, "%s%u: Program timeout (%d:%d) sent %zu tries %d", applog(LOG_DEBUG, "%s%u: Program timeout (%d:%d) sent %d tries %d",
modminer->drv->name, modminer->device_id, modminer->drv->name, modminer->device_id,
amount, err, remaining, tries); amount, err, (int)remaining, tries);
if (!get_status(modminer, "write status", C_PROGRAMSTATUS2)) if (!get_status(modminer, "write status", C_PROGRAMSTATUS2))
goto dame; goto dame;
@ -521,8 +521,8 @@ static bool modminer_fpga_upload_bitstream(struct cgpu_info *modminer)
} else { } else {
mutex_unlock(modminer->modminer_mutex); mutex_unlock(modminer->modminer_mutex);
applog(LOG_ERR, "%s%u: Program failed (%d:%d) sent %zu", applog(LOG_ERR, "%s%u: Program failed (%d:%d) sent %d",
modminer->drv->name, modminer->device_id, amount, err, remaining); modminer->drv->name, modminer->device_id, amount, err, (int)remaining);
goto dame; goto dame;
} }

2
fpgautils.c

@ -330,7 +330,7 @@ int serial_open(const char *devpath, unsigned long baud, signed short timeout, b
applog(LOG_ERR, "%s is already in use by another process", devpath); applog(LOG_ERR, "%s is already in use by another process", devpath);
break; break;
default: default:
applog(LOG_DEBUG, "Open %s failed, GetLastError:%u", devpath, e); applog(LOG_DEBUG, "Open %s failed, GetLastError:%d", devpath, (int)e);
break; break;
} }
return -1; return -1;

4
libztex.c

@ -238,7 +238,7 @@ static enum check_result libztex_checkDevice(struct libusb_device *dev)
fp = NULL; fp = NULL;
if (got_bytes < length) { if (got_bytes < length) {
applog(LOG_ERR, "%s: Incomplete firmware read: %zu/%zu", __func__, got_bytes, length); applog(LOG_ERR, "%s: Incomplete firmware read: %d/%d", __func__, (int)got_bytes, (int)length);
goto done; goto done;
} }
@ -735,7 +735,7 @@ int libztex_scanDevices(struct libztex_dev_list*** devs_p)
do { do {
cnt = libusb_get_device_list(NULL, &list); cnt = libusb_get_device_list(NULL, &list);
if (unlikely(cnt < 0)) { if (unlikely(cnt < 0)) {
applog(LOG_ERR, "Ztex scan devices: Failed to list usb devices with err %zd", cnt); applog(LOG_ERR, "Ztex scan devices: Failed to list usb devices with err %d", (int)cnt);
goto done; goto done;
} }

24
usbutils.c

@ -1537,7 +1537,7 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
case LIBUSB_ERROR_NOT_SUPPORTED: case LIBUSB_ERROR_NOT_SUPPORTED:
applog(LOG_ERR, applog(LOG_ERR,
"USB init, open device failed, err %d, " "USB init, open device failed, err %d, "
"you need to install a Windows USB driver for %s", "you need to install a WinUSB driver for %s",
err, devstr); err, devstr);
break; break;
#endif #endif
@ -1890,7 +1890,7 @@ void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_devi
count = libusb_get_device_list(NULL, &list); count = libusb_get_device_list(NULL, &list);
if (count < 0) { if (count < 0) {
applog(LOG_DEBUG, "USB scan devices: failed, err %zd", count); applog(LOG_DEBUG, "USB scan devices: failed, err %d", (int)count);
return; return;
} }
@ -2247,7 +2247,7 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro
USBDEBUG("USB debug: _usb_read(%s (nodev=%s),ep=%d,buf=%p,bufsiz=%zu,proc=%p,timeout=%u,end=%s,cmd=%s,ftdi=%s,readonce=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), ep, buf, bufsiz, processed, timeout, end ? (char *)str_text((char *)end) : "NULL", usb_cmdname(cmd), bool_str(ftdi), bool_str(readonce)); USBDEBUG("USB debug: _usb_read(%s (nodev=%s),ep=%d,buf=%p,bufsiz=%zu,proc=%p,timeout=%u,end=%s,cmd=%s,ftdi=%s,readonce=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), ep, buf, bufsiz, processed, timeout, end ? (char *)str_text((char *)end) : "NULL", usb_cmdname(cmd), bool_str(ftdi), bool_str(readonce));
if (bufsiz > USB_MAX_READ) if (bufsiz > USB_MAX_READ)
quit(1, "%s USB read request %zu too large (max=%d)", cgpu->drv->name, bufsiz, USB_MAX_READ); quit(1, "%s USB read request %d too large (max=%d)", cgpu->drv->name, (int)bufsiz, USB_MAX_READ);
if (timeout == DEVTIMEOUT) if (timeout == DEVTIMEOUT)
timeout = usbdev->found->timeout; timeout = usbdev->found->timeout;
@ -2988,7 +2988,7 @@ static LPSECURITY_ATTRIBUTES mksec(const char *dname, uint8_t bus_number, uint8_
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s (%d:%d) USB failed to init secdes err (%d)", "MTX: %s (%d:%d) USB failed to init secdes err (%d)",
dname, (int)bus_number, (int)device_address, dname, (int)bus_number, (int)device_address,
GetLastError()); (int)GetLastError());
free(sec_des); free(sec_des);
return NULL; return NULL;
} }
@ -2997,7 +2997,7 @@ static LPSECURITY_ATTRIBUTES mksec(const char *dname, uint8_t bus_number, uint8_
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s (%d:%d) USB failed to secdes dacl err (%d)", "MTX: %s (%d:%d) USB failed to secdes dacl err (%d)",
dname, (int)bus_number, (int)device_address, dname, (int)bus_number, (int)device_address,
GetLastError()); (int)GetLastError());
free(sec_des); free(sec_des);
return NULL; return NULL;
} }
@ -3006,7 +3006,7 @@ static LPSECURITY_ATTRIBUTES mksec(const char *dname, uint8_t bus_number, uint8_
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s (%d:%d) USB failed to create gsid err (%d)", "MTX: %s (%d:%d) USB failed to create gsid err (%d)",
dname, (int)bus_number, (int)device_address, dname, (int)bus_number, (int)device_address,
GetLastError()); (int)GetLastError());
free(sec_des); free(sec_des);
return NULL; return NULL;
} }
@ -3015,7 +3015,7 @@ static LPSECURITY_ATTRIBUTES mksec(const char *dname, uint8_t bus_number, uint8_
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s (%d:%d) USB failed to secdes grp err (%d)", "MTX: %s (%d:%d) USB failed to secdes grp err (%d)",
dname, (int)bus_number, (int)device_address, dname, (int)bus_number, (int)device_address,
GetLastError()); (int)GetLastError());
FreeSid(gsid); FreeSid(gsid);
free(sec_des); free(sec_des);
return NULL; return NULL;
@ -3060,7 +3060,7 @@ static bool resource_lock(const char *dname, uint8_t bus_number, uint8_t device_
if (usbMutex == NULL) { if (usbMutex == NULL) {
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s USB failed to get '%s' err (%d)", "MTX: %s USB failed to get '%s' err (%d)",
dname, name, GetLastError()); dname, name, (int)GetLastError());
sec = unsec(sec); sec = unsec(sec);
return false; return false;
} }
@ -3084,7 +3084,7 @@ static bool resource_lock(const char *dname, uint8_t bus_number, uint8_t device_
} }
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s USB can't get '%s' - device in use - failure (%d)", "MTX: %s USB can't get '%s' - device in use - failure (%d)",
dname, name, GetLastError()); dname, name, (int)GetLastError());
goto fail; goto fail;
} }
} }
@ -3098,12 +3098,12 @@ static bool resource_lock(const char *dname, uint8_t bus_number, uint8_t device_
case WAIT_FAILED: case WAIT_FAILED:
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s USB failed to get '%s' err (%d)", "MTX: %s USB failed to get '%s' err (%d)",
dname, name, GetLastError()); dname, name, (int)GetLastError());
goto fail; goto fail;
default: default:
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s USB failed to get '%s' unknown reply (%d)", "MTX: %s USB failed to get '%s' unknown reply (%d)",
dname, name, res); dname, name, (int)res);
goto fail; goto fail;
} }
@ -3219,7 +3219,7 @@ static void resource_unlock(const char *dname, uint8_t bus_number, uint8_t devic
if (!ReleaseMutex(usbMutex)) if (!ReleaseMutex(usbMutex))
applog(LOG_ERR, applog(LOG_ERR,
"MTX: %s USB failed to release '%s' err (%d)", "MTX: %s USB failed to release '%s' err (%d)",
dname, name, GetLastError()); dname, name, (int)GetLastError());
fila: fila:

Loading…
Cancel
Save