serial-dmm, metex14: add support for multiple channels per DMM

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

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index eb453c78a7a8b040b7217c63b7b457c272456ac9..2611aa6fe905d8edad4a9511e9ba2a4b9b068182 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -56,6 +56,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        int dropped, ret;
        size_t len;
        uint8_t buf[128];
+       size_t ch_idx;
+       char ch_name[12];
 
        dmm = (struct dmm_info *)di;
 
@@ -131,7 +133,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;
-       sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
+       dmm->channel_count = 1;
+       if (dmm->packet_parse == sr_metex14_4packets_parse)
+               dmm->channel_count = 4;
+       for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) {
+               snprintf(ch_name, sizeof(ch_name), "P%zu", ch_idx);
+               sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, ch_name);
+       }
        devices = g_slist_append(devices, sdi);
 
 scan_cleanup:
@@ -197,7 +205,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                        .context = NULL, \
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \
-               REQUEST, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
+               REQUEST, 1, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
        }).di
 
 SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
@@ -440,8 +448,8 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
        DMM(
                "metex-m3860m", metex14,
                "Metex", "M-3860M", "9600/7n2/rts=0/dtr=1", 9600,
-               METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
-               sr_metex14_packet_valid, sr_metex14_parse,
+               4 * METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
+               sr_metex14_4packets_valid, sr_metex14_4packets_parse,
                NULL
        ),
        DMM(
@@ -475,8 +483,8 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
        DMM(
                "peaktech-4390a", metex14,
                "PeakTech", "4390A", "9600/7n2/rts=0/dtr=1", 9600,
-               METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
-               sr_metex14_packet_valid, sr_metex14_parse,
+               4 * METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
+               sr_metex14_4packets_valid, sr_metex14_4packets_parse,
                NULL
        ),
        DMM(