X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=aac08599b0d85d69379ba82a4a227829219c572b;hb=5a2326a71b3a7d3bc6b367a7a3dfa6f137f5f0ec;hp=ac7dea9a8977d79092a10b8a6c5bf9da00032ea2;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index ac7dea9a..aac08599 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[] = {
@@ -78,7 +78,7 @@ static uint8_t genmode_default[] = {
 	0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
 static GSList *device_instances = NULL;
 static uint64_t cur_samplerate = KHZ(200);
 static uint64_t limit_samples = 0;
@@ -91,12 +91,12 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id);
 
 static int hw_init(char *deviceinfo)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
 	/* Avoid compiler warnings. */
 	deviceinfo = deviceinfo;
 
-	sdi = sigrok_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;
 
@@ -129,23 +129,23 @@ static void hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	void *info = NULL;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		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,18 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	/* Avoid compiler warnings. */
 	device_index = device_index;
 
-	if (capability == HWCAP_PROBECONFIG) {
+	if (capability == SR_HWCAP_PROBECONFIG) {
 		/* Nothing to do. */
 		ret = SR_OK;
-	} else if (capability == HWCAP_LIMIT_SAMPLES) {
+	} 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;
@@ -282,7 +282,7 @@ static void thread_func(void *data)
 /* Callback handling data */
 static int receive_data(int fd, int revents, void *user_data)
 {
-	struct datafeed_packet packet;
+	struct sr_datafeed_packet packet;
 	char c[BUFSIZE];
 	gsize z;
 
@@ -295,7 +295,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 +309,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;
@@ -320,8 +320,8 @@ static int receive_data(int fd, int revents, void *user_data)
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-	struct datafeed_packet *packet;
-	struct datafeed_header *header;
+	struct sr_datafeed_packet *packet;
+	struct sr_datafeed_header *header;
 	struct databag *mydata;
 
 	mydata = malloc(sizeof(struct databag));
@@ -359,18 +359,18 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	if (!my_thread)
 		return SR_ERR;
 
-	packet = malloc(sizeof(struct datafeed_packet));
-	header = malloc(sizeof(struct datafeed_header));
+	packet = malloc(sizeof(struct sr_datafeed_packet));
+	header = malloc(sizeof(struct sr_datafeed_header));
 	if (!packet || !header)
 		return SR_ERR_MALLOC;
 
-	packet->type = DF_HEADER;
-	packet->length = sizeof(struct datafeed_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,8 +390,9 @@ 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,
 	hw_init,
 	hw_cleanup,