Brymen BM25x: Drop unneeded _ser/_SER suffix.

[libsigrok.git] / src / hardware / serial-dmm / protocol.c

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index c812793929aab89a4d31063cb9453ddea2eb20a9..03509fd29daa6aa08ed71fbfa069b8065f8753c7 100644 (file)
--- 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) {
@@ -213,6 +213,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,7 +223,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_SER, bm25x)
+RECEIVE_DATA(BRYMEN_BM25X, bm25x)