X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fdemo.c;h=26e49ca98b4c857419beb19aa41d8d08cf647425;hb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;hp=73000bc77e96d2000ddc9a0ba64e72082604c4a5;hpb=aed4ad0beaf64062752039a13f9a95326aa1df87;p=libsigrok.git

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 73000bc7..26e49ca9 100644
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -128,27 +128,29 @@ struct dev_context {
 	GHashTable *ch_ag;
 };
 
+static const uint32_t drvopts[] = {
+	SR_CONF_DEMO_DEV,
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_OSCILLOSCOPE,
+};
+
 static const uint32_t scanopts[] = {
 	SR_CONF_NUM_LOGIC_CHANNELS,
 	SR_CONF_NUM_ANALOG_CHANNELS,
 };
 
-static const int devopts[] = {
-	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_CONTINUOUS,
-	SR_CONF_DEMO_DEV,
-	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+static const uint32_t devopts[] = {
+	SR_CONF_CONTINUOUS | SR_CONF_SET,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
-	SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET,
-	SR_CONF_NUM_ANALOG_CHANNELS | SR_CONF_GET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const int devopts_cg_logic[] = {
+static const uint32_t devopts_cg_logic[] = {
 	SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const int devopts_cg_analog[] = {
+static const uint32_t devopts_cg_analog[] = {
 	SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET,
 };
@@ -200,7 +202,7 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
 			if (i % 5 == 0)
 				value = -value;
 			if (i % 10 == 0)
-				last_end = i - 1;
+				last_end = i;
 			ag->pattern_data[i] = value;
 		}
 		ag->num_samples = last_end;
@@ -287,11 +289,10 @@ static GSList *scan(GSList *options)
 	}
 
 	devices = NULL;
-	sdi = sr_dev_inst_new(SR_ST_ACTIVE, "Demo device", NULL, NULL);
-	if (!sdi) {
-		sr_err("Device instance creation failed.");
-		return NULL;
-	}
+
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi->status = SR_ST_ACTIVE;
+	sdi->model = g_strdup("Demo device");
 	sdi->driver = di;
 
 	devc = g_malloc(sizeof(struct dev_context));
@@ -310,8 +311,7 @@ static GSList *scan(GSList *options)
 	cg->name = g_strdup("Logic");
 	for (i = 0; i < num_logic_channels; i++) {
 		sprintf(channel_name, "D%d", i);
-		if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name)))
-			return NULL;
+		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name);
 		sdi->channels = g_slist_append(sdi->channels, ch);
 		cg->channels = g_slist_append(cg->channels, ch);
 	}
@@ -437,12 +437,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		} else
 			return SR_ERR_BUG;
 		break;
-	case SR_CONF_NUM_LOGIC_CHANNELS:
-		*data = g_variant_new_int32(devc->num_logic_channels);
-		break;
-	case SR_CONF_NUM_ANALOG_CHANNELS:
-		*data = g_variant_new_int32(devc->num_analog_channels);
-		break;
 	case SR_CONF_AMPLITUDE:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
@@ -496,7 +490,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
 		stropt = g_variant_get_string(data, NULL);
-		ch = cg->channels->data;
 		logic_pattern = analog_pattern = -1;
 		for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) {
 			if (!strcmp(stropt, logic_pattern_str[i])) {
@@ -569,6 +562,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		return SR_OK;
 	}
 
+	if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+		return SR_OK;
+	}
+
 	if (!sdi)
 		return SR_ERR_ARG;
 
@@ -671,6 +670,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
 	struct analog_gen *ag;
+	int ag_pattern_pos;
 	GHashTableIter iter;
 	void *value;
 	uint64_t logic_todo, analog_todo, expected_samplenum, analog_sent, sending_now;
@@ -722,13 +722,9 @@ static int prepare_data(int fd, int revents, void *cb_data)
 				ag = value;
 				packet.type = SR_DF_ANALOG;
 				packet.payload = &ag->packet;
-
-				/* FIXME we should make sure we output a whole
-				 * period of data before we send out again the
-				 * beginning of our buffer. A ring buffer would
-				 * help here as well */
-
-				sending_now = MIN(analog_todo, ag->num_samples);
+				ag_pattern_pos = devc->analog_counter % ag->num_samples;
+				sending_now = MIN(analog_todo, ag->num_samples-ag_pattern_pos);
+				ag->packet.data = ag->pattern_data + ag_pattern_pos;
 				ag->packet.num_samples = sending_now;
 				sr_session_send(sdi, &packet);