agilent-dmm: add support for Keysight branded meters

[libsigrok.git] / src / hardware / gmc-mh-1x-2x / api.c

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 0ca9029fe355b8eadbff8cb379641bbe779e5727..048a0afc6e3d2909853e4b49ca7c91accd92c249 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -434,7 +434,7 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
        devc->buflen = 0;
 
        sr_sw_limits_acquisition_start(&devc->limits);
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Poll every 40ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -457,7 +457,7 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
        devc->buflen = 0;
 
        sr_sw_limits_acquisition_start(&devc->limits);
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Poll every 40ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -468,12 +468,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
        return req_meas14(sdi);
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi, dev_close,
-                       sdi->conn, LOG_PREFIX);
-}
-
 static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
        .name = "gmc-mh-1x-2x-rs232",
        .longname = "Gossen Metrawatt Metrahit 1x/2x, RS232 interface",
@@ -489,7 +483,7 @@ static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start_1x_2x_rs232,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(gmc_mh_1x_2x_rs232_driver_info);
@@ -509,7 +503,7 @@ static struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start_2x_bd232,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(gmc_mh_2x_bd232_driver_info);