X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fserial_hid.c;h=ee073d1dbbb509d60d7d62cdc69975c9d90e3f4b;hb=bf6b9e7b16264d2a6ccb3ac2a6004cbc2cef0e43;hp=c5ea0fd2ee14c59b677c5e0cc943a993ce988a8b;hpb=edec0436db2a73b545f5d4db0c1635d6c67ff45c;p=libsigrok.git

diff --git a/src/serial_hid.c b/src/serial_hid.c
index c5ea0fd2..ee073d1d 100644
--- a/src/serial_hid.c
+++ b/src/serial_hid.c
@@ -550,6 +550,10 @@ SR_PRIV int ser_hid_hidapi_set_data(struct sr_serial_dev_inst *serial,
 
 static struct ser_hid_chip_functions **chips[SER_HID_CHIP_LAST] = {
 	[SER_HID_CHIP_UNKNOWN] = NULL,
+	[SER_HID_CHIP_BTC_BU86X] = &ser_hid_chip_funcs_bu86x,
+	[SER_HID_CHIP_SIL_CP2110] = &ser_hid_chip_funcs_cp2110,
+	[SER_HID_CHIP_VICTOR_DMM] = &ser_hid_chip_funcs_victor,
+	[SER_HID_CHIP_WCH_CH9325] = &ser_hid_chip_funcs_ch9325,
 };
 
 static struct ser_hid_chip_functions *get_hid_chip_funcs(enum ser_hid_chip_t chip)
@@ -631,9 +635,8 @@ SR_PRIV const char *ser_hid_chip_find_name_vid_pid(uint16_t vid, uint16_t pid)
 		if (!vid_pids)
 			continue;
 		while (vid_pids->vid) {
-			if (vid_pids->vid == vid && vid_pids->pid == pid) {
+			if (vid_pids->vid == vid && vid_pids->pid == pid)
 				return desc->chipname;
-			}
 			vid_pids++;
 		}
 	}
@@ -1294,10 +1297,8 @@ static int ser_hid_read(struct sr_serial_dev_inst *serial,
 	 * Immediately satisfy the caller's request from the RX buffer
 	 * if the requested amount of data is available already.
 	 */
-	if (sr_ser_has_queued_data(serial) >= count) {
-		rc = sr_ser_unqueue_rx_data(serial, buf, count);
-		return rc;
-	}
+	if (sr_ser_has_queued_data(serial) >= count)
+		return sr_ser_unqueue_rx_data(serial, buf, count);
 
 	/*
 	 * When a timeout was specified, then determine the deadline
@@ -1383,9 +1384,8 @@ static int ser_hid_read(struct sr_serial_dev_inst *serial,
 	if (got > count)
 		got = count;
 	sr_dbg("DBG: %s() passing %d bytes.", __func__, got);
-	rc = sr_ser_unqueue_rx_data(serial, buf, count);
 
-	return rc;
+	return sr_ser_unqueue_rx_data(serial, buf, count);
 }
 
 static struct ser_lib_functions serlib_hid = {