X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=bd33d9f2c2ad451fad18236b444f82f8a866670d;hb=a9010323ddf4e479663e871386c05db05ea3522e;hp=241d5e0a6d2f798c363a8995f02bc531e27836f1;hpb=c3cd66a00cdb4afbd43108563d979eebfbafaf69;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 241d5e0a..bd33d9f2 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -180,8 +180,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK)
 		return SR_ERR;
 
-	sdi->status = SR_ST_ACTIVE;
-
 	/* FIXME: discard serial buffer */
 	mso_check_trigger(devc->serial, &devc->trigger_state);
 	sr_dbg("Trigger state: 0x%x.", devc->trigger_state);
@@ -238,24 +236,21 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 
 	devc = sdi->priv;
 
+	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		// FIXME
 		return mso_configure_rate(sdi, g_variant_get_uint64(data));
-		ret = SR_OK;
-		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		num_samples = g_variant_get_uint64(data);
 		if (num_samples != 1024) {
 			sr_err("Only 1024 samples are supported.");
 			ret = SR_ERR_ARG;
-		} else {
-			devc->limit_samples = num_samples;
-			ret = SR_OK;
-		}
+			break;
+		};
+		devc->limit_samples = num_samples;
 		break;
 	case SR_CONF_CAPTURE_RATIO:
-		ret = SR_OK;
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		slope = g_variant_get_string(data, NULL);
@@ -263,29 +258,25 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		if (!slope || !(slope[0] == 'f' || slope[0] == 'r'))
 			sr_err("Invalid trigger slope");
 			ret = SR_ERR_ARG;
-		} else {
-			devc->trigger_slope = (slope[0] == 'r')
-				? SLOPE_POSITIVE : SLOPE_NEGATIVE;
-			ret = SR_OK;
+			break;
 		}
+		devc->trigger_slope = (slope[0] == 'r')
+			? SLOPE_POSITIVE : SLOPE_NEGATIVE;
 		break;
 	case SR_CONF_HORIZ_TRIGGERPOS:
 		pos = g_variant_get_double(data);
 		if (pos < 0 || pos > 255) {
 			sr_err("Trigger position (%f) should be between 0 and 255.", pos);
 			ret = SR_ERR_ARG;
-		} else {
-			trigger_pos = (int)pos;
-			devc->trigger_holdoff[0] = trigger_pos & 0xff;
-			ret = SR_OK;
+			break;
 		}
+		trigger_pos = (int)pos;
+		devc->trigger_holdoff[0] = trigger_pos & 0xff;
 		break;
 	case SR_CONF_RLE:
-		ret = SR_OK;
 		break;
 	default:
 		ret = SR_ERR_NA;
-		break;
 	}
 
 	return ret;
@@ -401,6 +392,7 @@ static struct sr_dev_driver link_mso19_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,