X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=c1faaefb0e41c6efd8d4aa4cdc05338e417ade47;hb=ca0938c50b4bf5d010d6140f64542f8307d8ea17;hp=248ee11eabb53756dd3c697ff221f080448b7ce7;hpb=0e94d524c19fe89c564243421d37c17818f87631;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 248ee11e..c1faaefb 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -49,6 +49,12 @@
 /* TODO: Should be configurable. */
 #define BUFSIZE                4096
 
+#define STR_PATTERN_SIGROK   "sigrok"
+#define STR_PATTERN_RANDOM   "random"
+#define STR_PATTERN_INC      "incremental"
+#define STR_PATTERN_ALL_LOW  "all-low"
+#define STR_PATTERN_ALL_HIGH "all-high"
+
 /* Supported patterns which we can generate */
 enum {
 	/**
@@ -79,7 +85,7 @@ struct dev_context {
 	GIOChannel *channels[2];
 	uint8_t sample_generator;
 	uint64_t samples_counter;
-	void *session_dev_id;
+	void *cb_data;
 	int64_t starttime;
 };
 
@@ -222,6 +228,31 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_CONF_SAMPLERATE:
 		*data = &cur_samplerate;
 		break;
+	case SR_CONF_LIMIT_SAMPLES:
+		*data = &limit_samples;
+		break;
+	case SR_CONF_LIMIT_MSEC:
+		*data = &limit_msec;
+		break;
+	case SR_CONF_PATTERN_MODE:
+		switch (default_pattern) {
+		case PATTERN_SIGROK:
+			*data = STR_PATTERN_SIGROK;
+			break;
+		case PATTERN_RANDOM:
+			*data = STR_PATTERN_RANDOM;
+			break;
+		case PATTERN_INC:
+			*data = STR_PATTERN_INC;
+			break;
+		case PATTERN_ALL_LOW:
+			*data = STR_PATTERN_ALL_LOW;
+			break;
+		case PATTERN_ALL_HIGH:
+			*data = STR_PATTERN_ALL_HIGH;
+			break;
+		}
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -256,15 +287,15 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 	} else if (id == SR_CONF_PATTERN_MODE) {
 		stropt = value;
 		ret = SR_OK;
-		if (!strcmp(stropt, "sigrok")) {
+		if (!strcmp(stropt, STR_PATTERN_SIGROK)) {
 			default_pattern = PATTERN_SIGROK;
-		} else if (!strcmp(stropt, "random")) {
+		} else if (!strcmp(stropt, STR_PATTERN_RANDOM)) {
 			default_pattern = PATTERN_RANDOM;
-		} else if (!strcmp(stropt, "incremental")) {
+		} else if (!strcmp(stropt, STR_PATTERN_INC)) {
 			default_pattern = PATTERN_INC;
-		} else if (!strcmp(stropt, "all-low")) {
+		} else if (!strcmp(stropt, STR_PATTERN_ALL_LOW)) {
 			default_pattern = PATTERN_ALL_LOW;
-		} else if (!strcmp(stropt, "all-high")) {
+		} else if (!strcmp(stropt, STR_PATTERN_ALL_HIGH)) {
 			default_pattern = PATTERN_ALL_HIGH;
 		} else {
 			ret = SR_ERR;
@@ -371,7 +402,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 		logic.length = sending_now;
 		logic.unitsize = 1;
 		logic.data = buf;
-		sr_session_send(devc->session_dev_id, &packet);
+		sr_session_send(devc->cb_data, &packet);
 		devc->samples_counter += sending_now;
 	}
 
@@ -387,14 +418,10 @@ static int receive_data(int fd, int revents, void *cb_data)
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		void *cb_data)
 {
-	struct sr_datafeed_packet *packet;
-	struct sr_datafeed_header *header;
 	struct dev_context *devc;
 
 	(void)sdi;
 
-	sr_dbg("Starting acquisition.");
-
 	/* TODO: 'devc' is never g_free()'d? */
 	if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
 		sr_err("%s: devc malloc failed", __func__);
@@ -402,7 +429,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	}
 
 	devc->sample_generator = default_pattern;
-	devc->session_dev_id = cb_data;
+	devc->cb_data = cb_data;
 	devc->samples_counter = 0;
 
 	/*
@@ -434,28 +461,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_session_source_add_channel(devc->channels[0], G_IO_IN | G_IO_ERR,
 		    40, receive_data, devc);
 
-	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("%s: packet malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("%s: header malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	packet->type = SR_DF_HEADER;
-	packet->payload = header;
-	header->feed_version = 1;
-	gettimeofday(&header->starttime, NULL);
-	sr_session_send(devc->session_dev_id, packet);
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
 	/* We use this timestamp to decide how many more samples to send. */
 	devc->starttime = g_get_monotonic_time();
 
-	g_free(header);
-	g_free(packet);
-
 	return SR_OK;
 }
 
@@ -475,7 +486,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 	/* Send last packet. */
 	packet.type = SR_DF_END;
-	sr_session_send(devc->session_dev_id, &packet);
+	sr_session_send(devc->cb_data, &packet);
 
 	return SR_OK;
 }