Demote commonish errors to debug loglevel

driver-hashbuster.c

@@ -156,11 +156,11 @@ bool hashbuster_lowl_probe(const struct lowlevel_device_info * const info)
 	uint8_t buf[0x40] = {'\xfe'};
 	
 	if (info->lowl != &lowl_hid)
-		applogr(false, LOG_WARNING, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not hid!",
+		applogr(false, LOG_DEBUG, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not hid!",
 		       __func__, product, serial);
 	
 	if (info->vid != 0xFA04 || info->pid != 0x0011)
-		applogr(false, LOG_WARNING, "%s: Wrong VID/PID", __func__);
+		applogr(false, LOG_DEBUG, "%s: Wrong VID/PID", __func__);
 	
 	h = hid_open_path(path);
 	if (!h)

driver-hashbuster2.c

@@ -148,11 +148,11 @@ bool hashbuster2_lowl_probe(const struct lowlevel_device_info * const info)
 	libusb_device_handle *h;
 	
 	if (info->lowl != &lowl_usb)
-		applogr(false, LOG_WARNING, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not usb_generic!",
+		applogr(false, LOG_DEBUG, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not usb_generic!",
 		       __func__, product, serial);
 	
 	if (info->vid != 0xFA04 || info->pid != 0x000D)
-		applogr(false, LOG_WARNING, "%s: Wrong VID/PID", __func__);
+		applogr(false, LOG_DEBUG, "%s: Wrong VID/PID", __func__);
 	
 	libusb_device *dev = info->lowl_data;
 	libusb_open(dev, &h);

driver-klondike.c

@@ -855,7 +855,7 @@ bool klondike_lowl_probe(const struct lowlevel_device_info * const info)
 {
 	if (unlikely(info->lowl != &lowl_usb))
 	{
-		applog(LOG_WARNING, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not usb!",
+		applog(LOG_DEBUG, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not usb!",
 		       __func__, info->product, info->serial);
 		return false;
 	}

driver-littlefury.c

@@ -90,7 +90,7 @@ uint16_t crc16(void *p, size_t sz)
 }
 
 static
-ssize_t keep_reading(int fd, void *buf, size_t count)
+ssize_t keep_reading(int prio, int fd, void *buf, size_t count)
 {
 	ssize_t r, rv = 0;
 	
@@ -99,7 +99,7 @@ ssize_t keep_reading(int fd, void *buf, size_t count)
 		r = read(fd, buf, count);
 		if (unlikely(r <= 0))
 		{
-			applog(LOG_ERR, "Read of fd %d returned %d", fd, (int)r);
+			applog(prio, "Read of fd %d returned %d", fd, (int)r);
 			return rv ?: r;
 		}
 		rv += r;
@@ -146,7 +146,7 @@ bool bitfury_do_packet(int prio, const char *repr, const int fd, void * const bu
 	}
 	
 	{
-		r = keep_reading(fd, pkt, 5);
+		r = keep_reading(prio, fd, pkt, 5);
 		if (5 != r || pkt[0] != 0xab || pkt[1] != 0xcd || pkt[2] != op)
 		{
 			char hex[(r * 2) + 1];
@@ -156,7 +156,7 @@ bool bitfury_do_packet(int prio, const char *repr, const int fd, void * const bu
 			return false;
 		}
 		sz = (((unsigned)pkt[3] << 8) | pkt[4]) + 2;
-		r = keep_reading(fd, &pkt[5], sz);
+		r = keep_reading(prio, fd, &pkt[5], sz);
 		if (sz != r)
 		{
 			r += 5;

driver-nanofury.c

@@ -187,7 +187,7 @@ bool nanofury_lowl_probe(const struct lowlevel_device_info * const info)
 	if (info->lowl != &lowl_mcp2210)
 	{
 		if (info->lowl != &lowl_hid && info->lowl != &lowl_usb)
-			applog(LOG_WARNING, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not mcp2210!",
+			applog(LOG_DEBUG, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not mcp2210!",
 			       __func__, product, serial);
 		return false;
 	}

driver-twinfury.c

@@ -92,7 +92,7 @@ static bool twinfury_detect_custom(const char *devpath, struct device_drv *api,
 	serial_read(fd, buf, sizeof(buf));
 	if (!twinfury_send_command(fd, "I", 1))
 	{
-		applog(LOG_ERR, "%s: Failed writing id request to %s",
+		applog(LOG_DEBUG, "%s: Failed writing id request to %s",
 		       twinfury_drv.dname, devpath);
 		serial_close(fd);
 		return false;
@@ -100,7 +100,7 @@ static bool twinfury_detect_custom(const char *devpath, struct device_drv *api,
 	len = twinfury_wait_response(fd, buf, sizeof(buf));
 	if(len != 29)
 	{
-		applog(LOG_ERR, "%s: Not a valid response from device (%d)", twinfury_drv.dname, len);
+		applog(LOG_DEBUG, "%s: Not a valid response from device (%d)", twinfury_drv.dname, len);
 		serial_close(fd);
 		return false;
 	}
@@ -117,7 +117,7 @@ static bool twinfury_detect_custom(const char *devpath, struct device_drv *api,
 	char buf_state[sizeof(struct twinfury_state)+1];
 	if (!twinfury_send_command(fd, "R", 1))
 	{
-		applog(LOG_ERR, "%s: Failed writing reset request to %s",
+		applog(LOG_DEBUG, "%s: Failed writing reset request to %s",
 		       twinfury_drv.dname, devpath);
 		serial_close(fd);
 		return false;
@@ -132,7 +132,7 @@ static bool twinfury_detect_custom(const char *devpath, struct device_drv *api,
 
 	if(len != 8)
 	{
-		applog(LOG_ERR, "%s: %s not responding to reset: %d",
+		applog(LOG_DEBUG, "%s: %s not responding to reset: %d",
 		       twinfury_drv.dname,
 		       devpath, len);
 		return false;

driver-x6500.c

@@ -138,7 +138,7 @@ bool x6500_lowl_probe(const struct lowlevel_device_info * const info)
 	if (info->lowl != &lowl_ft232r)
 	{
 		if (info->lowl != &lowl_usb)
-			applog(LOG_WARNING, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not ft232r!",
+			applog(LOG_DEBUG, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not ft232r!",
 			       __func__, product, serial);
 		return false;
 	}

driver-ztex.c

@@ -89,7 +89,7 @@ bool ztex_lowl_probe(const struct lowlevel_device_info * const info)
 	const char * const serial = info->serial;
 	if (info->lowl != &lowl_usb)
 	{
-		applog(LOG_WARNING, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not usb!",
+		applog(LOG_DEBUG, "%s: Matched \"%s\" serial \"%s\", but lowlevel driver is not usb!",
 		       __func__, product, serial);
 		return false;
 	}

lowl-usb.c

@@ -91,8 +91,8 @@ struct lowlevel_device_info *usb_devinfo_scan()
 		
 		err = libusb_open(list[i], &handle);
 		if (unlikely(err))
-			applog(LOG_ERR, "%s: Error opening device: %s",
-			       __func__, bfg_strerror(err, BST_LIBUSB));
+			applog(LOG_DEBUG, "%s: Error opening device %s: %s",
+			       __func__, info->devid, bfg_strerror(err, BST_LIBUSB));
 		else
 		{
 			info->manufacturer = lowl_libusb_dup_string(handle, desc.iManufacturer, "iManufacturer", __func__);

lowl-vcom.c

@@ -440,7 +440,7 @@ out:
 	DWORD type, sz = sizeof(devpath) - 4;
 	if (ERROR_SUCCESS != (e = RegQueryValueExA(hkey, "PortName", NULL, &type, (LPBYTE)&devpath[4], &sz)))
 	{
-		applogfailinfo(LOG_ERR, "get PortName registry key value", "%s", bfg_strerror(e, BST_SYSTEM));
+		applogfailinfo(LOG_DEBUG, "get PortName registry key value", "%s", bfg_strerror(e, BST_SYSTEM));
 		RegCloseKey(hkey);
 		goto out;
 	}
@@ -493,8 +493,10 @@ char *windows_usb_get_root_hub_path(HANDLE hcntlrh)
 	
 	{
 		USB_ROOT_HUB_NAME pathinfo;
-		if (!(DeviceIoControl(hcntlrh, IOCTL_USB_GET_ROOT_HUB_NAME, 0, 0, &pathinfo, sizeof(pathinfo), &rsz, NULL) && rsz >= sizeof(pathinfo)))
+		if (!DeviceIoControl(hcntlrh, IOCTL_USB_GET_ROOT_HUB_NAME, 0, 0, &pathinfo, sizeof(pathinfo), &rsz, NULL))
 			applogfailinfor(NULL, LOG_ERR, "ioctl (1)", "%s", bfg_strerror(GetLastError(), BST_SYSTEM));
+		if (rsz < sizeof(pathinfo))
+			applogfailinfor(NULL, LOG_ERR, "ioctl (1)", "Size too small (%d < %d)", (int)rsz, (int)sizeof(pathinfo));
 		namesz = pathinfo.ActualLength;
 	}