X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=64564ef4bcf4508cc2567c44f1db8a92865b1437;hp=0b2472fbb70401096073d0b24399fc07e0b633d7;hb=2cb63065f525655d3abccc1b26edd7275937b034;hpb=155b680da482cea2381becb73c51cfb838bff31e

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 0b2472fb..64564ef4 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -110,7 +110,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, int dmm, void *info)
 
 	/* Try to get as much data as the buffer can hold. */
 	len = DMM_BUFSIZE - devc->buflen;
-	len = serial_read(serial, devc->buf + devc->buflen, len);
+	len = serial_read_nonblocking(serial, devc->buf + devc->buflen, len);
 	if (len == 0)
 		return; /* No new bytes, nothing to do. */
 	if (len < 0) {
@@ -196,6 +196,7 @@ RECEIVE_DATA(TEKPOWER_TP4000ZC, fs9721)
 RECEIVE_DATA(METEX_ME31, metex14)
 RECEIVE_DATA(PEAKTECH_3410, metex14)
 RECEIVE_DATA(MASTECH_MAS345, metex14)
+RECEIVE_DATA(MASTECH_MS8250B, fs9721)
 RECEIVE_DATA(VA_VA18B, fs9721)
 RECEIVE_DATA(VA_VA40B, fs9721)
 RECEIVE_DATA(METEX_M3640D, metex14)
@@ -213,6 +214,9 @@ RECEIVE_DATA(VOLTCRAFT_ME42, metex14)
 RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
 RECEIVE_DATA(VOLTCRAFT_VC830_SER, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC920_SER, ut71x)
+RECEIVE_DATA(VOLTCRAFT_VC940_SER, ut71x)
+RECEIVE_DATA(VOLTCRAFT_VC960_SER, ut71x)
 RECEIVE_DATA(UNI_T_UT60A_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT60E_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT60G_SER, es519xx)
@@ -220,6 +224,12 @@ RECEIVE_DATA(UNI_T_UT61B_SER, fs9922)
 RECEIVE_DATA(UNI_T_UT61C_SER, fs9922)
 RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
 RECEIVE_DATA(UNI_T_UT61E_SER, es519xx)
+RECEIVE_DATA(UNI_T_UT71A_SER, ut71x)
+RECEIVE_DATA(UNI_T_UT71B_SER, ut71x)
+RECEIVE_DATA(UNI_T_UT71C_SER, ut71x)
+RECEIVE_DATA(UNI_T_UT71D_SER, ut71x)
+RECEIVE_DATA(UNI_T_UT71E_SER, ut71x)
 RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)
 RECEIVE_DATA(TENMA_72_7745_SER, fs9721)
 RECEIVE_DATA(TENMA_72_7750_SER, es519xx)
+RECEIVE_DATA(BRYMEN_BM25X, bm25x)