X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fnorma-dmm%2Fapi.c;h=397694cabfa059eb7d8e299e961223b937ec256e;hb=d43b090816f61e77d8054084e85202de1a1ebeb7;hp=ed8378ca231b46faa2f982a3d6e61a9ee27fdef2;hpb=abc4b3356d184401cb62aaa521d1c80ebd7d6f0f;p=libsigrok.git diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c index ed8378ca..397694ca 100644 --- a/hardware/norma-dmm/api.c +++ b/hardware/norma-dmm/api.c @@ -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); }