X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=5f029a9e9970e97a272b2bda5005322c96175966;hb=487d4528be9fce621d2a7111fcb16056a0048ad8;hp=91f12560074d3c9dfc8eb01681800802c70d4efe;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 91f12560..5f029a9e 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -25,7 +25,6 @@
 #define SERIALCOMM_1X_RS232 "8228/6n1/dtr=1/rts=1/flow=0" /* =8192, closer with divider */
 #define SERIALCOMM_2X_RS232 "9600/6n1/dtr=1/rts=1/flow=0"
 #define SERIALCOMM_2X "9600/8n1/dtr=1/rts=1/flow=0"
-#define VENDOR_GMC "Gossen Metrawatt"
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -103,6 +102,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
 	 * Try to find message consisting of device code and several
 	 * (at least 4) data bytes.
 	 */
+	serial_flush(serial);
 	for (bytecnt = 0; bytecnt < 100; bytecnt++) {
 		byte = read_byte(serial, timeout_us);
 		if ((byte == -1) || (timeout_us < g_get_monotonic_time()))
@@ -176,8 +176,6 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
 		return NULL;
 	}
 
-	serial_flush(serial);
-
 	model = scan_model_sm(serial);
 
 	/*
@@ -188,17 +186,15 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
 		serialcomm = SERIALCOMM_1X_RS232;
 		g_free(serial->serialcomm);
 		serial->serialcomm = g_strdup(serialcomm);
-		if (serial_set_paramstr(serial, serialcomm) == SR_OK) {
-			serial_flush(serial);
+		if (serial_set_paramstr(serial, serialcomm) == SR_OK)
 			model = scan_model_sm(serial);
-		}
 	}
 
 	if (model != METRAHIT_NONE) {
-		sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(model));
+		sr_spew("%s detected!", gmc_model_str(model));
 		sdi = g_malloc0(sizeof(struct sr_dev_inst));
 		sdi->status = SR_ST_INACTIVE;
-		sdi->vendor = g_strdup(VENDOR_GMC);
+		sdi->vendor = g_strdup("Gossen Metrawatt");
 		sdi->model = g_strdup(gmc_model_str(model));
 		devc = g_malloc0(sizeof(struct dev_context));
 		sr_sw_limits_init(&devc->limits);
@@ -258,7 +254,7 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->status = SR_ST_INACTIVE;
-	sdi->vendor = g_strdup(VENDOR_GMC);
+	sdi->vendor = g_strdup("Gossen Metrawatt");
 	sdi->priv = devc;
 
 	/* Send message 03 "Query multimeter version and status" */
@@ -286,7 +282,7 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 		devc->buflen = 0;
 
 		if (devc->model != METRAHIT_NONE) {
-			sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(devc->model));
+			sr_spew("%s detected!", gmc_model_str(devc->model));
 			sr_sw_limits_init(&devc->limits);
 			sdi->model = g_strdup(gmc_model_str(devc->model));
 			sdi->version = g_strdup_printf("Firmware %d.%d", devc->fw_ver_maj, devc->fw_ver_min);
@@ -297,15 +293,13 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 			devc = g_malloc0(sizeof(struct dev_context));
 			sdi = g_malloc0(sizeof(struct sr_dev_inst));
 			sdi->status = SR_ST_INACTIVE;
-			sdi->vendor = g_strdup(VENDOR_GMC);
+			sdi->vendor = g_strdup("Gossen Metrawatt");
 		}
 	};
 
-	/* Free last alloc if no device found */
-	if (devc->model == METRAHIT_NONE) {
-		g_free(devc);
-		sr_dev_inst_free(sdi);
-	}
+	/* Free last alloc that was done in preparation. */
+	g_free(devc);
+	sr_dev_inst_free(sdi);
 
 	return std_scan_complete(di, devices);
 
@@ -328,8 +322,8 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return std_serial_dev_close(sdi);
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
@@ -355,15 +349,15 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 }
 
 /** Implementation of config_list for Metrahit 1x/2x send mode */
-static int config_list_sm(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-			  const struct sr_channel_group *cg)
+static int config_list_sm(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts_sm);
 }
 
 /** Implementation of config_list for Metrahit 2x bidirectional mode */
-static int config_list_bd(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-			  const struct sr_channel_group *cg)
+static int config_list_bd(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts_bd);
 }