X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=2bd4709545cd656d93c99abb35f12fac779ede91;hb=c8f4624d9b265f63bc880df28bd9b1a7e29f1488;hp=c1e1a90721aaf811d62220ec3a9fb2ed1e1976b4;hpb=697785d1aedc0bf385ea21074d83d61b11d8ce29;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index c1e1a907..2bd47095 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -36,10 +36,24 @@
 /* size of chunks to send through the session bus */
 #define BUFSIZE                4096
 
+/* Supported patterns which we can generate */
 enum {
-	GENMODE_DEFAULT,
-	GENMODE_RANDOM,
-	GENMODE_INC,
+	/**
+	 * Pattern which spells "sigrok" using '0's (with '1's as "background")
+	 * when displayed using the 'bits' output format.
+	 */
+	PATTERN_SIGROK,
+
+	/**
+	 * Pattern which consists of (pseudo-)random values on all probes.
+	 */
+	PATTERN_RANDOM,
+
+	/**
+	 * Pattern which consists of incrementing numbers.
+	 * TODO: Better description.
+	 */
+	PATTERN_INC,
 };
 
 /* FIXME: Should not be global. */
@@ -71,13 +85,13 @@ static struct sr_samplerates samplerates = {
 	NULL,
 };
 
-static const char *patternmodes[] = {
+static const char *pattern_strings[] = {
 	"random",
 	"incremental",
 	NULL,
 };
 
-static uint8_t genmode_default[] = {
+static uint8_t pattern_sigrok[] = {
 	0x4c, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00,
 	0x82, 0xfe, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00,
 	0x7c, 0x82, 0x82, 0x92, 0x74, 0x00, 0x00, 0x00,
@@ -93,7 +107,7 @@ static GSList *device_instances = NULL;
 static uint64_t cur_samplerate = SR_KHZ(200);
 static uint64_t limit_samples = 0;
 static uint64_t limit_msec = 0;
-static int default_genmode = GENMODE_DEFAULT;
+static int default_pattern = PATTERN_SIGROK;
 static GThread *my_thread;
 static int thread_running;
 
@@ -162,7 +176,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 		info = &cur_samplerate;
 		break;
 	case SR_DI_PATTERNMODES:
-		info = &patternmodes;
+		info = &pattern_strings;
 		break;
 	}
 
@@ -185,7 +199,6 @@ static int *hw_get_capabilities(void)
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
 	int ret;
-	uint64_t *tmp_u64;
 	char *stropt;
 
 	/* Avoid compiler warnings. */
@@ -195,36 +208,33 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 		/* Nothing to do, but must be supported */
 		ret = SR_OK;
 	} else if (capability == SR_HWCAP_SAMPLERATE) {
-		tmp_u64 = value;
-		cur_samplerate = *tmp_u64;
+		cur_samplerate = *(uint64_t *)value;
 		sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__,
 		       cur_samplerate);
 		ret = SR_OK;
 	} else if (capability == SR_HWCAP_LIMIT_SAMPLES) {
-		tmp_u64 = value;
-		limit_samples = *tmp_u64;
+		limit_samples = *(uint64_t *)value;
 		sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__,
 		       limit_samples);
 		ret = SR_OK;
 	} else if (capability == SR_HWCAP_LIMIT_MSEC) {
-		tmp_u64 = value;
-		limit_msec = *tmp_u64;
+		limit_msec = *(uint64_t *)value;
 		sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__,
 		       limit_msec);
 		ret = SR_OK;
 	} else if (capability == SR_HWCAP_PATTERN_MODE) {
 		stropt = value;
 		if (!strcmp(stropt, "random")) {
-			default_genmode = GENMODE_RANDOM;
+			default_pattern = PATTERN_RANDOM;
 			ret = SR_OK;
 		} else if (!strcmp(stropt, "incremental")) {
-			default_genmode = GENMODE_INC;
+			default_pattern = PATTERN_INC;
 			ret = SR_OK;
 		} else {
 			ret = SR_ERR;
 		}
-		sr_dbg("demo: %s: setting patternmode to %d", __func__,
-		       default_genmode);
+		sr_dbg("demo: %s: setting pattern to %d", __func__,
+		       default_pattern);
 	} else {
 		ret = SR_ERR;
 	}
@@ -241,18 +251,18 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data)
 	memset(buf, 0, size);
 
 	switch (mydata->sample_generator) {
-	case GENMODE_DEFAULT:
+	case PATTERN_SIGROK:
 		for (i = 0; i < size; i++) {
-			*(buf + i) = ~(genmode_default[p] >> 1);
+			*(buf + i) = ~(pattern_sigrok[p] >> 1);
 			if (++p == 64)
 				p = 0;
 		}
 		break;
-	case GENMODE_RANDOM: /* Random */
+	case PATTERN_RANDOM: /* Random */
 		for (i = 0; i < size; i++)
 			*(buf + i) = (uint8_t)(rand() & 0xff);
 		break;
-	case GENMODE_INC: /* Simple increment */
+	case PATTERN_INC: /* Simple increment */
 		for (i = 0; i < size; i++)
 			*(buf + i) = i;
 		break;
@@ -358,7 +368,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 		return SR_ERR_MALLOC;
 	}
 
-	mydata->sample_generator = default_genmode;
+	mydata->sample_generator = default_pattern;
 	mydata->session_device_id = session_device_id;
 	mydata->device_index = device_index;
 	mydata->samples_counter = 0;