X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=8cfd1c8946a5ca96b43a14b854c4a57c055b78d2;hb=5c64390e5ac8a0052d8b7eeb49c781d86027c814;hp=c06a814a789f2181cafa32b14fceebc197baf61e;hpb=9c939c5132d82575cc1ce8f8fef5b6c4289aec5b;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index c06a814a..8cfd1c89 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -22,14 +22,13 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
 #ifdef _WIN32
 #include <io.h>
 #include <fcntl.h>
 #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif
-#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* TODO: Number of probes should be configurable. */
 #define NUM_PROBES             8
@@ -65,7 +64,7 @@ enum {
 };
 
 /* FIXME: Should not be global. */
-GIOChannel *channels[2];
+SR_PRIV GIOChannel *channels[2];
 
 struct databag {
 	int pipe_fds[2];
@@ -79,6 +78,7 @@ struct databag {
 
 static int capabilities[] = {
 	SR_HWCAP_LOGIC_ANALYZER,
+	SR_HWCAP_DEMO_DEVICE,
 	SR_HWCAP_SAMPLERATE,
 	SR_HWCAP_PATTERN_MODE,
 	SR_HWCAP_LIMIT_SAMPLES,
@@ -102,6 +102,18 @@ static const char *pattern_strings[] = {
 	NULL,
 };
 
+static const char *probe_names[NUM_PROBES + 1] = {
+	"0",
+	"1",
+	"2",
+	"3",
+	"4",
+	"5",
+	"6",
+	"7",
+	NULL,
+};
+
 static uint8_t pattern_sigrok[] = {
 	0x4c, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00,
 	0x82, 0xfe, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00,
@@ -116,7 +128,6 @@ static uint8_t pattern_sigrok[] = {
 /* List of struct sr_device_instance, maintained by opendev()/closedev(). */
 static GSList *device_instances = NULL;
 static uint64_t cur_samplerate = SR_KHZ(200);
-static uint64_t period_ps = 5000000;
 static uint64_t limit_samples = 0;
 static uint64_t limit_msec = 0;
 static int default_pattern = PATTERN_SIGROK;
@@ -130,7 +141,7 @@ static int hw_init(const char *deviceinfo)
 	struct sr_device_instance *sdi;
 
 	/* Avoid compiler warnings. */
-	deviceinfo = deviceinfo;
+	(void)deviceinfo;
 
 	sdi = sr_device_instance_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
 	if (!sdi) {
@@ -146,7 +157,7 @@ static int hw_init(const char *deviceinfo)
 static int hw_opendev(int device_index)
 {
 	/* Avoid compiler warnings. */
-	device_index = device_index;
+	(void)device_index;
 
 	/* Nothing needed so far. */
 
@@ -156,7 +167,7 @@ static int hw_opendev(int device_index)
 static int hw_closedev(int device_index)
 {
 	/* Avoid compiler warnings. */
-	device_index = device_index;
+	(void)device_index;
 
 	/* Nothing needed so far. */
 
@@ -185,6 +196,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 	case SR_DI_NUM_PROBES:
 		info = GINT_TO_POINTER(NUM_PROBES);
 		break;
+	case SR_DI_PROBE_NAMES:
+		info = probe_names;
+		break;
 	case SR_DI_SAMPLERATES:
 		info = &samplerates;
 		break;
@@ -202,7 +216,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 static int hw_get_status(int device_index)
 {
 	/* Avoid compiler warnings. */
-	device_index = device_index;
+	(void)device_index;
 
 	return SR_ST_ACTIVE;
 }
@@ -218,14 +232,13 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	char *stropt;
 
 	/* Avoid compiler warnings. */
-	device_index = device_index;
+	(void)device_index;
 
 	if (capability == SR_HWCAP_PROBECONFIG) {
 		/* Nothing to do, but must be supported */
 		ret = SR_OK;
 	} else if (capability == SR_HWCAP_SAMPLERATE) {
 		cur_samplerate = *(uint64_t *)value;
-		period_ps = 1000000000000 / cur_samplerate;
 		sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__,
 		       cur_samplerate);
 		ret = SR_OK;
@@ -359,8 +372,8 @@ static int receive_data(int fd, int revents, void *session_data)
 	gsize z;
 
 	/* Avoid compiler warnings. */
-	fd = fd;
-	revents = revents;
+	(void)fd;
+	(void)revents;
 
 	do {
 		g_io_channel_read_chars(channels[0],
@@ -369,8 +382,6 @@ static int receive_data(int fd, int revents, void *session_data)
 		if (z > 0) {
 			packet.type = SR_DF_LOGIC;
 			packet.payload = &logic;
-			packet.timeoffset =  samples_received * period_ps;
-			packet.duration = z * period_ps;
 			logic.length = z;
 			logic.unitsize = 1;
 			logic.data = c;
@@ -454,13 +465,10 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 
 	packet->type = SR_DF_HEADER;
 	packet->payload = header;
-	packet->timeoffset = 0;
-	packet->duration = 0;
 	header->feed_version = 1;
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = cur_samplerate;
 	header->num_logic_probes = NUM_PROBES;
-	header->num_analog_probes = 0;
 	sr_session_bus(session_data, packet);
 	g_free(header);
 	g_free(packet);
@@ -471,14 +479,14 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 static void hw_stop_acquisition(int device_index, gpointer session_data)
 {
 	/* Avoid compiler warnings. */
-	device_index = device_index;
-	session_data = session_data;
+	(void)device_index;
+	(void)session_data;
 
 	/* Stop generate thread. */
 	thread_running = 0;
 }
 
-struct sr_device_plugin demo_plugin_info = {
+SR_PRIV struct sr_device_plugin demo_plugin_info = {
 	.name = "demo",
 	.longname = "Demo driver and pattern generator",
 	.api_version = 1,