X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;fp=hardware%2Flink-mso19%2Fapi.c;h=e283a2cb7fb9cacf94ef2409c18da3c6124eba04;hb=bf2c987fdef6787a5ce826ed9d98a70f52a1ff96;hp=56d7700adb84ab740e9f799e8e8c3aa5c2226d00;hpb=043e899a5155dcdc353abc20006424973d8e2ed0;p=libsigrok.git diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c index 56d7700a..e283a2cb 100644 --- a/hardware/link-mso19/api.c +++ b/hardware/link-mso19/api.c @@ -51,8 +51,6 @@ static const uint64_t samplerates[] = { SR_PRIV struct sr_dev_driver link_mso19_driver_info; static struct sr_dev_driver *di = &link_mso19_driver_info; -static int dev_close(struct sr_dev_inst *sdi); - /* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */ static int dev_clear(void) { @@ -79,7 +77,7 @@ static int dev_clear(void) ret = SR_ERR_BUG; continue; } - dev_close(sdi); + std_serial_dev_close(sdi); sr_serial_dev_inst_free(devc->serial); sr_dev_inst_free(sdi); } @@ -272,20 +270,6 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int dev_close(struct sr_dev_inst *sdi) -{ - struct dev_context *devc; - - devc = sdi->priv; - - if (devc->serial && devc->serial->fd != -1) { - serial_close(devc->serial); - sdi->status = SR_ST_INACTIVE; - } - - return SR_OK; -} - static int cleanup(void) { return dev_clear(); @@ -501,7 +485,7 @@ SR_PRIV struct sr_dev_driver link_mso19_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,