X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=bd4c71181264907c8df6f8c09220b6d02ccb4f68;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=7f136a6bec654317852abeaefabafed94193d0f0;hpb=8662130615d7a59883c303914f94377032101cb9;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 7f136a6b..bd4c7118 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -250,6 +250,10 @@ static const struct rigol_ds_model supported_models[] = {
 	{SERIES(DS2000A), "DS2102A", {5, 1000000000}, 2, false},
 	{SERIES(DS2000A), "DS2202A", {2, 1000000000}, 2, false},
 	{SERIES(DS2000A), "DS2302A", {1, 1000000000}, 2, false},
+	{SERIES(DS2000A), "MSO2072A", {5, 1000000000}, 2, true},
+	{SERIES(DS2000A), "MSO2102A", {5, 1000000000}, 2, true},
+	{SERIES(DS2000A), "MSO2202A", {2, 1000000000}, 2, true},
+	{SERIES(DS2000A), "MSO2302A", {1, 1000000000}, 2, true},
 	{SERIES(DSO1000), "DSO1002A", {5, 1000000000}, 2, false},
 	{SERIES(DSO1000), "DSO1004A", {5, 1000000000}, 4, false},
 	{SERIES(DSO1000), "DSO1012A", {2, 1000000000}, 2, false},
@@ -441,8 +445,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 }
 
@@ -451,22 +453,16 @@ static int dev_close(struct sr_dev_inst *sdi)
 	struct sr_scpi_dev_inst *scpi;
 	struct dev_context *devc;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	scpi = sdi->conn;
 	devc = sdi->priv;
 
+	if (!scpi)
+		return SR_ERR_BUG;
+
 	if (devc->model->series->protocol == PROTOCOL_V2)
 		rigol_ds_config_set(sdi, ":KEY:LOCK DISABLE");
 
-	if (scpi) {
-		if (sr_scpi_close(scpi) < 0)
-			return SR_ERR;
-		sdi->status = SR_ST_INACTIVE;
-	}
-
-	return SR_OK;
+	return sr_scpi_close(scpi);
 }
 
 static int analog_frame_size(const struct sr_dev_inst *sdi)
@@ -666,9 +662,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
 	devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	/* If a channel group is specified, it must be a valid one. */
 	if (cg && !g_slist_find(sdi->channel_groups, cg)) {
 		sr_err("Invalid channel group specified.");
@@ -993,9 +986,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	gboolean some_digital;
 	GSList *l;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	scpi = sdi->conn;
 	devc = sdi->priv;
 
@@ -1017,10 +1007,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 				devc->analog_channels[ch->index] = ch->enabled;
 			}
 		} else if (ch->type == SR_CHANNEL_LOGIC) {
-			/* Only one list entry for DS1000D series. All channels are retrieved
-			 * together when this entry is processed. */
+			/* Only one list entry for older protocols. All channels are
+			 * retrieved together when this entry is processed. */
 			if (ch->enabled && (
-						devc->model->series->protocol > PROTOCOL_V2 ||
+						devc->model->series->protocol > PROTOCOL_V3 ||
 						!some_digital))
 				devc->enabled_channels = g_slist_append(
 						devc->enabled_channels, ch);
@@ -1029,7 +1019,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 				/* Turn on LA module if currently off. */
 				if (!devc->la_enabled) {
 					if (rigol_ds_config_set(sdi,
-							devc->model->series->protocol >= PROTOCOL_V4 ?
+							devc->model->series->protocol >= PROTOCOL_V3 ?
 								":LA:STAT ON" : ":LA:DISP ON") != SR_OK)
 						return SR_ERR;
 					devc->la_enabled = TRUE;
@@ -1038,7 +1028,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			if (ch->enabled != devc->digital_channels[ch->index]) {
 				/* Enabled channel is currently disabled, or vice versa. */
 				if (rigol_ds_config_set(sdi,
-						devc->model->series->protocol >= PROTOCOL_V4 ?
+						devc->model->series->protocol >= PROTOCOL_V3 ?
 							":LA:DIG%d:DISP %s" : ":DIG%d:TURN %s", ch->index,
 						ch->enabled ? "ON" : "OFF") != SR_OK)
 					return SR_ERR;
@@ -1053,7 +1043,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	/* Turn off LA module if on and no digital channels selected. */
 	if (devc->la_enabled && !some_digital)
 		if (rigol_ds_config_set(sdi,
-				devc->model->series->protocol >= PROTOCOL_V4 ?
+				devc->model->series->protocol >= PROTOCOL_V3 ?
 					":LA:STAT OFF" : ":LA:DISP OFF") != SR_OK)
 			return SR_ERR;
 
@@ -1115,11 +1105,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("Device inactive, can't stop acquisition.");
-		return SR_ERR;
-	}
-
 	std_session_send_df_end(sdi);
 
 	g_slist_free(devc->enabled_channels);