X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fteleinfo%2Fapi.c;h=7728a314e94f016f6da16923392e503c464b8d3c;hb=76b4d4f422060718673da16fee6ab054d505ab7d;hp=bf70660fc2a4daf6582d04d59222f5189bac1f83;hpb=bf2c987fdef6787a5ce826ed9d98a70f52a1ff96;p=libsigrok.git diff --git a/hardware/teleinfo/api.c b/hardware/teleinfo/api.c index bf70660f..7728a314 100644 --- a/hardware/teleinfo/api.c +++ b/hardware/teleinfo/api.c @@ -174,18 +174,6 @@ static int dev_clear(void) return std_dev_clear(di, NULL); } -static int dev_open(struct sr_dev_inst *sdi) -{ - struct sr_serial_dev_inst *serial = sdi->conn; - - if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; - - return SR_OK; -} - static int cleanup(void) { return dev_clear(); @@ -278,8 +266,8 @@ 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, std_serial_dev_close, - sdi->conn, LOG_PREFIX); + return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, + sdi->conn, LOG_PREFIX); } SR_PRIV struct sr_dev_driver teleinfo_driver_info = { @@ -293,7 +281,7 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info = { .dev_clear = dev_clear, .config_set = config_set, .config_list = config_list, - .dev_open = dev_open, + .dev_open = std_serial_dev_open, .dev_close = std_serial_dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop,