]> sigrok.org Git - libsigrok.git/blobdiff - hardware/norma-dmm/api.c
std: Standardize function name.
[libsigrok.git] / hardware / norma-dmm / api.c
index ed8378ca231b46faa2f982a3d6e61a9ee27fdef2..397694cabfa059eb7d8e299e961223b937ec256e 100644 (file)
@@ -183,14 +183,9 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       struct sr_serial_dev_inst *serial;
        struct dev_context *devc;
 
-       serial = sdi->conn;
-       if (serial && serial->fd != -1) {
-               serial_close(serial);
-               sdi->status = SR_ST_INACTIVE;
-       }
+       std_serial_dev_close(sdi);
 
        /* Free dynamically allocated resources. */
        if ((devc = sdi->priv) && devc->version) {
@@ -307,7 +302,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        if (sdi && (devc = sdi->priv) && devc->limit_msec)
                g_timer_stop(devc->elapsed_msec);
 
-       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+       return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
                        sdi->conn, LOG_PREFIX);
 }