X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fgmc-mh-1x-2x%2Fapi.c;h=2938c36a4aada210c019b27e530b6cf6d729185e;hb=81a9ab725f9ce9125c9bc22bc5ebd2903c26bc35;hp=42969412025c7ebc7d1e8cdfe0f7d9c1142eff6d;hpb=f57924179d08dee9d24099233ffbee2123613a22;p=libsigrok.git

diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c
index 42969412..2938c36a 100644
--- a/hardware/gmc-mh-1x-2x/api.c
+++ b/hardware/gmc-mh-1x-2x/api.c
@@ -221,27 +221,11 @@ static int dev_clear_1x_2x_rs232(void)
 	return std_dev_clear(&gmc_mh_1x_2x_rs232_driver_info, NULL);
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-	struct sr_serial_dev_inst *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;
 	struct dev_context *devc;
 
-	serial = sdi->conn;
-	if (serial && serial->fd != -1) {
-		serial_close(serial);
-		sdi->status = SR_ST_INACTIVE;
-	}
+	std_serial_dev_close(sdi);
 
 	sdi->status = SR_ST_INACTIVE;
 
@@ -363,7 +347,7 @@ static int dev_acq_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
 
 	/* Poll every 40ms, or whenever some data comes in. */
 	serial = sdi->conn;
-	sr_source_add(serial->fd, G_IO_IN, 40, gmc_mh_1x_2x_receive_data,
+	serial_source_add(serial, G_IO_IN, 40, gmc_mh_1x_2x_receive_data,
 		(void *)sdi);
 
 	return SR_OK;
@@ -377,7 +361,7 @@ static int dev_acq_stop(struct sr_dev_inst *sdi, void *cb_data)
 	if (sdi && (devc = sdi->priv) && devc->limit_msec)
 		g_timer_stop(devc->elapsed_msec);
 
-	return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+	return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 
@@ -394,7 +378,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
-	.dev_open = dev_open,
+	.dev_open = std_serial_dev_open,
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acq_start_1x_2x_rs232,
 	.dev_acquisition_stop = dev_acq_stop,