X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fapi.c;h=3dd32433a5a503a37e81cb2c5e5db5d98218a5b4;hb=4d67b9d9dcfbb26f21b5092b79c10da8544e7df1;hp=92b59fe3a32f07751111e5135b82c408c3fc3c3d;hpb=1b7b72d49e5ce19593ca4b2a793bec441b4cdea4;p=libsigrok.git

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 92b59fe3..3dd32433 100644
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -180,20 +180,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-	sdi->status = SR_ST_ACTIVE;
-
-	return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
-}
-
 static void clear_helper(void *priv)
 {
 	struct dev_context *devc;
@@ -288,9 +274,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;
-
 	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
@@ -459,15 +442,19 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	GSList *l;
 	struct sr_channel *ch;
+	int bitpos;
+	uint8_t mask;
 	GHashTableIter iter;
 	void *value;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	devc->sent_samples = 0;
 
+	/*
+	 * Determine the numbers of logic and analog channels that are
+	 * involved in the acquisition. Determine an offset and a mask to
+	 * remove excess logic data content before datafeed submission.
+	 */
 	devc->enabled_logic_channels = 0;
 	devc->enabled_analog_channels = 0;
 	for (l = sdi->channels; l; l = l->next) {
@@ -478,12 +465,34 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			devc->enabled_analog_channels++;
 			continue;
 		}
-		if (ch->type == SR_CHANNEL_LOGIC) {
-			devc->enabled_logic_channels++;
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
-		}
+		/*
+		 * TODO: Need we create a channel map here, such that the
+		 * session datafeed packets will have a dense representation
+		 * of the enabled channels' data? For example store channels
+		 * D3 and D5 in bit positions 0 and 1 respectively, when all
+		 * other channels are disabled? The current implementation
+		 * generates a sparse layout, might provide data for logic
+		 * channels that are disabled while it might suppress data
+		 * from enabled channels at the same time.
+		 */
+		devc->enabled_logic_channels++;
 	}
-
+	devc->first_partial_logic_index = devc->enabled_logic_channels / 8;
+	bitpos = devc->enabled_logic_channels % 8;
+	mask = (1 << bitpos) - 1;
+	devc->first_partial_logic_mask = mask;
+	sr_dbg("num logic %zu, partial off %zu, mask 0x%02x.",
+		devc->enabled_logic_channels,
+		devc->first_partial_logic_index,
+		devc->first_partial_logic_mask);
+
+	/*
+	 * Have the waveform for analog patterns pre-generated. It's
+	 * supposed to be periodic, so the generator just needs to
+	 * access the prepared sample data (DDS style).
+	 */
 	g_hash_table_iter_init(&iter, devc->ch_ag);
 	while (g_hash_table_iter_next(&iter, NULL, &value))
 		demo_generate_analog_pattern(value, devc->cur_samplerate);
@@ -503,7 +512,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	sr_dbg("Stopping acquisition.");
 	sr_session_source_remove(sdi->session, -1);
 	std_session_send_df_end(sdi);
 
@@ -522,8 +530,8 @@ static struct sr_dev_driver demo_driver_info = {
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
-	.dev_open = dev_open,
-	.dev_close = dev_close,
+	.dev_open = std_dummy_dev_open,
+	.dev_close = std_dummy_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,