std: Standardize function name.

[libsigrok.git] / hardware / cem-dt-885x / api.c

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 6628d93d421d62c8a0e17cbf3a76ece6feb8fa2c..e1e4b2e4895abb295fdabebc6d787ca857220f2f 100644 (file)
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -165,19 +165,6 @@ static int dev_open(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       struct sr_serial_dev_inst *serial;
-
-       serial = sdi->conn;
-       if (serial && serial->fd != -1) {
-               serial_close(serial);
-               sdi->status = SR_ST_INACTIVE;
-       }
-
-       return SR_OK;
-}
-
 static int cleanup(void)
 {
        return dev_clear();
@@ -415,7 +402,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 150, cem_dt_885x_receive_data,
+       serial_source_add(serial, G_IO_IN, 150, cem_dt_885x_receive_data,
                        (void *)sdi);
 
        return SR_OK;
@@ -428,10 +415,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+       return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
                        sdi->conn, LOG_PREFIX);
-
-       return SR_OK;
 }
 
 SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
@@ -447,7 +432,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = dev_open,
-       .dev_close = dev_close,
+       .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
        .priv = NULL,