]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/serial-dmm/api.c
hantek-dso: Add missing SR_PRIV.
[libsigrok.git] / src / hardware / serial-dmm / api.c
index 687b35b9ccae873eae627f586cb8ae3b31393a57..eb453c78a7a8b040b7217c63b7b457c272456ac9 100644 (file)
@@ -140,8 +140,8 @@ scan_cleanup:
        return std_scan_complete(di, devices);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -152,8 +152,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
@@ -168,7 +168,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
-       /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
                      receive_data, (void *)sdi);
@@ -438,6 +437,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
+       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,
+               NULL
+       ),
        DMM(
                "metex-m4650cr", metex14,
                "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200,
@@ -466,6 +472,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
+       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,
+               NULL
+       ),
        DMM(
                "radioshack-22-168", metex14,
                "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200,