X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fdemo%2Fdemo.c;h=fda8091bbced50fe915ce8834d502c34751633dc;hb=d81d29333e255a236b029860683f4bfadd1c15e3;hp=0811cbf3b5ff52002af139991e46cc0e8def3313;hpb=9f8274a544865838f880c4849c28b6129141cf99;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 0811cbf3..fda8091b 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -54,11 +54,11 @@ struct databag {
 };
 
 static int capabilities[] = {
-	HWCAP_LOGIC_ANALYZER,
-	HWCAP_PATTERN_MODE,
-	HWCAP_LIMIT_SAMPLES,
-	HWCAP_LIMIT_MSEC,
-	HWCAP_CONTINUOUS
+	SR_HWCAP_LOGIC_ANALYZER,
+	SR_HWCAP_PATTERN_MODE,
+	SR_HWCAP_LIMIT_SAMPLES,
+	SR_HWCAP_LIMIT_MSEC,
+	SR_HWCAP_CONTINUOUS,
 };
 
 static const char *patternmodes[] = {
@@ -96,7 +96,7 @@ static int hw_init(char *deviceinfo)
 	/* Avoid compiler warnings. */
 	deviceinfo = deviceinfo;
 
-	sdi = sr_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL);
+	sdi = sr_device_instance_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
 	if (!sdi)
 		return 0;
 
@@ -136,16 +136,16 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 		return NULL;
 
 	switch (device_info_id) {
-	case DI_INSTANCE:
+	case SR_DI_INSTANCE:
 		info = sdi;
 		break;
-	case DI_NUM_PROBES:
+	case SR_DI_NUM_PROBES:
 		info = GINT_TO_POINTER(NUM_PROBES);
 		break;
-	case DI_CUR_SAMPLERATE:
+	case SR_DI_CUR_SAMPLERATE:
 		info = &cur_samplerate;
 		break;
-	case DI_PATTERNMODES:
+	case SR_DI_PATTERNMODES:
 		info = &patternmodes;
 		break;
 	}
@@ -158,7 +158,7 @@ static int hw_get_status(int device_index)
 	/* Avoid compiler warnings. */
 	device_index = device_index;
 
-	return ST_ACTIVE;
+	return SR_ST_ACTIVE;
 }
 
 static int *hw_get_capabilities(void)
@@ -175,18 +175,22 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	/* Avoid compiler warnings. */
 	device_index = device_index;
 
-	if (capability == HWCAP_PROBECONFIG) {
-		/* Nothing to do. */
+	if (capability == SR_HWCAP_PROBECONFIG) {
+		/* Nothing to do, but must be supported */
 		ret = SR_OK;
-	} else if (capability == HWCAP_LIMIT_SAMPLES) {
+	} else if (capability == SR_HWCAP_SAMPLERATE) {
+		tmp_u64 = value;
+		cur_samplerate = *tmp_u64;
+		ret = SR_OK;
+	} else if (capability == SR_HWCAP_LIMIT_SAMPLES) {
 		tmp_u64 = value;
 		limit_samples = *tmp_u64;
 		ret = SR_OK;
-	} else if (capability == HWCAP_LIMIT_MSEC) {
+	} else if (capability == SR_HWCAP_LIMIT_MSEC) {
 		tmp_u64 = value;
 		limit_msec = *tmp_u64;
 		ret = SR_OK;
-	} else if (capability == HWCAP_PATTERN_MODE) {
+	} else if (capability == SR_HWCAP_PATTERN_MODE) {
 		stropt = value;
 		if (!strcmp(stropt, "random")) {
 			default_genmode = GENMODE_RANDOM;
@@ -206,14 +210,14 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
 static void samples_generator(uint8_t *buf, uint64_t size, void *data)
 {
+	static uint64_t p = 0;
 	struct databag *mydata = data;
-	uint64_t p, i;
+	uint64_t i;
 
 	memset(buf, 0, size);
 
 	switch (mydata->sample_generator) {
 	case GENMODE_DEFAULT:
-		p = 0;
 		for (i = 0; i < size; i++) {
 			*(buf + i) = ~(genmode_default[p] >> 1);
 			if (++p == 64)
@@ -295,7 +299,7 @@ static int receive_data(int fd, int revents, void *user_data)
 				        (gchar *)&c, BUFSIZE, &z, NULL);
 
 		if (z > 0) {
-			packet.type = DF_LOGIC;
+			packet.type = SR_DF_LOGIC;
 			packet.length = z;
 			packet.unitsize = 1;
 			packet.payload = c;
@@ -309,7 +313,7 @@ static int receive_data(int fd, int revents, void *user_data)
 		g_io_channel_close(channels[0]);
 
 		/* Send last packet. */
-		packet.type = DF_END;
+		packet.type = SR_DF_END;
 		session_bus(user_data, &packet);
 
 		return FALSE;
@@ -352,6 +356,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
 	/* Run the demo thread. */
 	g_thread_init(NULL);
+	/* this needs to be done between g_thread_init() and g_thread_create() */
 	mydata->timer = g_timer_new();
 	thread_running = 1;
 	my_thread =
@@ -364,13 +369,13 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	if (!packet || !header)
 		return SR_ERR_MALLOC;
 
-	packet->type = DF_HEADER;
+	packet->type = SR_DF_HEADER;
 	packet->length = sizeof(struct sr_datafeed_header);
 	packet->payload = (unsigned char *)header;
 	header->feed_version = 1;
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = cur_samplerate;
-	header->protocol_id = PROTO_RAW;
+	header->protocol_id = SR_PROTO_RAW;
 	header->num_logic_probes = NUM_PROBES;
 	header->num_analog_probes = 0;
 	session_bus(session_device_id, packet);
@@ -390,7 +395,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 	thread_running = 0;
 }
 
-struct device_plugin demo_plugin_info = {
+struct sr_device_plugin demo_plugin_info = {
 	"demo",
 	"Demo driver and pattern generator",
 	1,