X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=99455917e31695e54706b017d0ced55877c8b091;hb=d43b090816f61e77d8054084e85202de1a1ebeb7;hp=9848cc59c1aff42db0cb2f99d3359a5be1be30b9;hpb=abc4b3356d184401cb62aaa521d1c80ebd7d6f0f;p=libsigrok.git diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c index 9848cc59..99455917 100644 --- a/hardware/colead-slm/api.c +++ b/hardware/colead-slm/api.c @@ -129,19 +129,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(); @@ -235,7 +222,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, dev_close, + return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, sdi->conn, LOG_PREFIX); } @@ -252,7 +239,7 @@ SR_PRIV struct sr_dev_driver colead_slm_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,