X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=7c7ca88e27b862ba35c0ff655cc0d1c6fed2da34;hb=cf49d66bc6dc2903ac1380464fe5f3004eaf508d;hp=4574dfea72d7d8f79d3db665713b82e2ebd4aa2f;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 4574dfea..7c7ca88e 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -90,7 +90,7 @@ static int read_byte(struct sr_serial_dev_inst *serial, gint64 timeout)
 	int rc = 0;
 
 	for (;;) {
-		rc = serial_read(serial, &result, 1);
+		rc = serial_read_nonblocking(serial, &result, 1);
 		if (rc == 1) {
 			sr_spew("read: 0x%02x/%d", result, result);
 			return result;
@@ -198,7 +198,7 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
 
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) {
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK) {
 		sr_serial_dev_inst_free(serial);
 		return NULL;
 	}
@@ -223,7 +223,7 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 
 	if (model != METRAHIT_NONE) {
 		sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(model));
-		if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC,
+		if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, VENDOR_GMC,
 				gmc_model_str(model), NULL)))
 			return NULL;
 		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -295,7 +295,7 @@ static GSList *scan_2x_bd232(GSList *options)
 	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
 
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		goto exit_err;
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -303,7 +303,7 @@ static GSList *scan_2x_bd232(GSList *options)
 		goto exit_err;
 	}
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC, NULL, NULL)))
+	if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, VENDOR_GMC, NULL, NULL)))
 		goto exit_err;
 
 	sdi->priv = devc;
@@ -354,7 +354,7 @@ static GSList *scan_2x_bd232(GSList *options)
 				goto exit_err;
 			}
 
-			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC, NULL, NULL)))
+			if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, VENDOR_GMC, NULL, NULL)))
 				goto exit_err;
 		}
 	};