X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcenter-3xx%2Fapi.c;h=b85273e51d2942ebde8aa034112a46d4fae77ed4;hb=589edd9b81bce493de73075c9cdd6a5928ed3f59;hp=0960af82af3d56037f1cd0b70f66908b2bfc683e;hpb=abc4b3356d184401cb62aaa521d1c80ebd7d6f0f;p=libsigrok.git diff --git a/hardware/center-3xx/api.c b/hardware/center-3xx/api.c index 0960af82..b85273e5 100644 --- a/hardware/center-3xx/api.c +++ b/hardware/center-3xx/api.c @@ -155,32 +155,6 @@ static GSList *dev_list(int idx) return ((struct drv_context *)(center_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 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(int idx) { return dev_clear(idx); @@ -265,8 +239,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, 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 */ @@ -304,8 +278,8 @@ 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_close = dev_close, \ + .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, \ .priv = NULL, \