rigol-ds: Add support for Agilent DSO1014A.

[libsigrok.git] / hardware / agilent-dmm / api.c

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 2c37fe3a5b164aaa219698cefee871df040283c7..cc2a4be84f58463084c35a252e15772ae4bb6d1e 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -169,19 +169,6 @@ static GSList *dev_list(void)
        return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-       struct sr_serial_dev_inst *serial;
-
-       serial = sdi->conn;
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
-               return SR_ERR;
-
-       sdi->status = SR_ST_ACTIVE;
-
-       return SR_OK;
-}
-
 static int cleanup(void)
 {
        return dev_clear();
@@ -274,7 +261,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
+       return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
                        sdi->conn, LOG_PREFIX);
 }
 
@@ -290,7 +277,7 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
        .config_get = NULL,
        .config_set = config_set,
        .config_list = config_list,
-       .dev_open = dev_open,
+       .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,