X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=0cb0c11557c201c94740f324bc13ebfb9b0ae5fc;hb=51b294cd013db9d4d15f713c9ed576c343e685d6;hp=604d65f4f44aeb7ab5722dcf03bbcc0ae88d60e6;hpb=8f996b89481670219c7576e2c68b128a0a2ce026;p=libsigrok.git

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index 604d65f4..0cb0c115 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -202,32 +202,6 @@ static GSList *dev_list(void)
 	return ((struct drv_context *)(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(void)
 {
 	return dev_clear();
@@ -313,7 +287,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	/* Poll every 100ms, or whenever some data comes in. */
 	serial = sdi->conn;
-	sr_source_add(serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi);
+	serial_source_add(serial, G_IO_IN, 50, fluke_receive_data, (void *)sdi);
 
 	if (serial_write(serial, "QM\r", 3) == -1) {
 		sr_err("Unable to send QM: %s.", strerror(errno));
@@ -327,7 +301,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);
 }
 
@@ -343,8 +317,8 @@ SR_PRIV struct sr_dev_driver flukedmm_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,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.priv = NULL,