X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fdemo.c;h=0a220fe759fbe64df9aed7d3656dceac01166a59;hb=45884333ff8641c86d9808b46dde9f571083c10d;hp=f0edbcab1c8c3f7ca2f246f9f38230fa76692513;hpb=36cbd69e12d8957592c94420d98552bb00d67be6;p=libsigrok.git

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index f0edbcab..0a220fe7 100644
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -38,7 +38,7 @@
 /* Size of the analog pattern space per channel. */
 #define ANALOG_BUFSIZE       4096
 
-#define DEFAULT_ANALOG_AMPLITUDE 25
+#define DEFAULT_ANALOG_AMPLITUDE 10
 #define ANALOG_SAMPLES_PER_PERIOD 20
 
 /* Logic patterns we can generate. */
@@ -98,7 +98,7 @@ struct analog_gen {
 	float amplitude;
 	float pattern_data[ANALOG_BUFSIZE];
 	unsigned int num_samples;
-	struct sr_datafeed_analog packet;
+	struct sr_datafeed_analog_old packet;
 	float avg_val; /* Average value */
 	unsigned num_avgs; /* Number of samples averaged */
 };
@@ -137,7 +137,7 @@ static const uint32_t scanopts[] = {
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_CONTINUOUS | SR_CONF_SET,
+	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@@ -177,12 +177,7 @@ static const uint8_t pattern_sigrok[] = {
 
 SR_PRIV struct sr_dev_driver demo_driver_info;
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
+static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
 {
@@ -289,7 +284,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	devices = NULL;
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_ACTIVE;
+	sdi->status = SR_ST_INACTIVE;
 	sdi->model = g_strdup("Demo device");
 	sdi->driver = di;
 
@@ -354,11 +349,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	sdi->status = SR_ST_ACTIVE;
@@ -389,7 +379,7 @@ static void clear_helper(void *priv)
 	g_free(devc);
 }
 
-static int cleanup(const struct sr_dev_driver *di)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, clear_helper);
 }
@@ -687,7 +677,7 @@ static void send_analog_packet(struct analog_gen *ag,
 	unsigned int i;
 
 	devc = sdi->priv;
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &ag->packet;
 
 	if (!devc->avg) {
@@ -757,7 +747,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
 	if (devc->cur_samplerate <= 0 || devc->logic_unitsize <= 0
 			|| (devc->num_logic_channels <= 0
 			&& devc->num_analog_channels <= 0)) {
-		dev_acquisition_stop(sdi, sdi);
+		dev_acquisition_stop(sdi);
 		return G_SOURCE_CONTINUE;
 	}
 
@@ -784,8 +774,8 @@ static int prepare_data(int fd, int revents, void *cb_data)
 	 */
 	todo_us = samples_todo * G_USEC_PER_SEC / devc->cur_samplerate;
 
-	logic_done = 0;
-	analog_done = 0;
+	logic_done  = devc->num_logic_channels  > 0 ? 0 : samples_todo;
+	analog_done = devc->num_analog_channels > 0 ? 0 : samples_todo;
 
 	while (logic_done < samples_todo || analog_done < samples_todo) {
 		/* Logic */
@@ -833,7 +823,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
 			g_hash_table_iter_init(&iter, devc->ch_ag);
 			while (g_hash_table_iter_next(&iter, NULL, &value)) {
 				ag = value;
-				packet.type = SR_DF_ANALOG;
+				packet.type = SR_DF_ANALOG_OLD;
 				packet.payload = &ag->packet;
 				ag->packet.data = &ag->avg_val;
 				ag->packet.num_samples = 1;
@@ -841,20 +831,18 @@ static int prepare_data(int fd, int revents, void *cb_data)
 			}
 		}
 		sr_dbg("Requested number of samples reached.");
-		dev_acquisition_stop(sdi, sdi);
+		dev_acquisition_stop(sdi);
 	}
 
 	return G_SOURCE_CONTINUE;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	GHashTableIter iter;
 	void *value;
 
-	(void)cb_data;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
@@ -868,7 +856,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	sr_session_source_add(sdi->session, -1, 0, 100,
 			prepare_data, (struct sr_dev_inst *)sdi);
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* We use this timestamp to decide how many more samples to send. */
@@ -878,19 +865,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	struct sr_datafeed_packet packet;
-
-	(void)cb_data;
-
 	sr_dbg("Stopping acquisition.");
-
 	sr_session_source_remove(sdi->session, -1);
-
-	/* Send last packet. */
-	packet.type = SR_DF_END;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	return SR_OK;
 }
@@ -899,11 +878,11 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
 	.name = "demo",
 	.longname = "Demo driver and pattern generator",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
-	.dev_clear = NULL,
+	.dev_list = std_dev_list,
+	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,