X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fmic-985xx%2Fapi.c;h=641ca33016bd3904cede5da09fdeaa6031faa0b6;hb=4104ef810e56cd68ccfd66919a24e9e8c572ef58;hp=d59c0bfc7c31fb0356ab5ce5073494d2f06bca69;hpb=bf2c987fdef6787a5ce826ed9d98a70f52a1ff96;p=libsigrok.git diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c index d59c0bfc..641ca330 100644 --- a/hardware/mic-985xx/api.c +++ b/hardware/mic-985xx/api.c @@ -157,19 +157,6 @@ static GSList *dev_list(int idx) return ((struct drv_context *)(mic_devs[idx].di->priv))->instances; } -static int dev_open(struct sr_dev_inst *sdi) -{ - struct sr_serial_dev_inst *serial; - - serial = sdi->conn; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; - - return SR_OK; -} - static int cleanup(int idx) { return dev_clear(idx); @@ -254,8 +241,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, 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); } /* Driver-specific API function wrappers */ @@ -293,7 +280,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .config_get = NULL, \ .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_##ID_UPPER, \ .dev_acquisition_stop = dev_acquisition_stop, \