serial-hid: add support for (scrambling) Victor DMM cables

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

diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index b0eb384ad24d306f0b917bab8ae17799e25feb64..23dfe7ab4e711c02756144bfa36411fa07233a92 100644 (file)
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -185,7 +185,7 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
                if (is_diode) {
                        meaning.mq = SR_MQ_VOLTAGE;
                        meaning.unit = SR_UNIT_VOLT;
-                       meaning.mqflags |= SR_MQFLAG_DIODE;
+                       meaning.mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
                        if (ivalue < 0)
                                fvalue = NAN;
                } else {
@@ -262,20 +262,20 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
 
        packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
-       sr_session_send(devc->cb_data, &packet);
+       sr_session_send(sdi, &packet);
 
-       devc->num_samples++;
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
 }
 
 SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf)
 {
+       static const unsigned char obfuscation[DMM_DATA_SIZE] = "jodenxunickxia";
+       static const unsigned char shuffle[DMM_DATA_SIZE] = {
+               6, 13, 5, 11, 2, 7, 9, 8, 3, 10, 12, 0, 4, 1
+       };
        GString *dbg;
        int i;
        unsigned char data[DMM_DATA_SIZE];
-       unsigned char obfuscation[DMM_DATA_SIZE] = "jodenxunickxia";
-       unsigned char shuffle[DMM_DATA_SIZE] = {
-               6, 13, 5, 11, 2, 7, 9, 8, 3, 10, 12, 0, 4, 1
-       };
 
        for (i = 0; i < DMM_DATA_SIZE && buf[i] == 0; i++);
        if (i == DMM_DATA_SIZE) {