Demote commonish errors to debug loglevel

Conflicts:
	driver-hashbuster2.c
	driver-klondike.c
	driver-twinfury.c

driver-littlefury.c

@@ -89,7 +89,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;
 	
@@ -98,7 +98,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;
@@ -145,7 +145,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];
@@ -155,7 +155,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;

fpgautils.c

@@ -448,7 +448,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;
 	}
@@ -501,8 +501,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;
 	}
 	

lowl-usb.c

@@ -90,8 +90,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__);