From: Daniel Ribeiro <redacted>
Date: Mon, 10 Jan 2011 17:12:38 +0000 (-0200)
Subject: update plugins and cli to use new DF_HEADER
X-Git-Tag: libsigrok-0.1.0~456
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c2616fb9faca19945154974884a0816359cec1df;p=libsigrok.git

update plugins and cli to use new DF_HEADER
---

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 09c87993..d4d9fddf 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -1219,7 +1219,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = cur_samplerate;
 	header.protocol_id = PROTO_RAW;
-	header.num_probes = num_probes;
+	header.num_logic_probes = num_probes;
+	header.num_analog_probes = 0;
 	session_bus(session_device_id, &packet);
 
 	/* Add capture source. */
diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index cb627ef5..f3f71fa5 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -318,7 +318,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = cur_samplerate;
 	header->protocol_id = PROTO_RAW;
-	header->num_probes = NUM_PROBES;
+	header->num_logic_probes = NUM_PROBES;
+	header->num_analog_probes = 0;
 	session_bus(session_device_id, packet);
 	free(header);
 	free(packet);
diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 0e791457..7f44788e 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -760,7 +760,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = cur_samplerate;
 	header->protocol_id = PROTO_RAW;
-	header->num_probes = NUM_PROBES;
+	header->num_logic_probes = NUM_PROBES;
+	header->num_analog_probes = 0;
 	session_bus(session_device_id, packet);
 	g_free(header);
 	g_free(packet);
diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index b80808db..f89d3ee2 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -713,7 +713,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = cur_samplerate;
 	header->protocol_id = PROTO_RAW;
-	header->num_probes = NUM_PROBES;
+	header->num_logic_probes = NUM_PROBES;
+	header->num_analog_probes = 0;
 	session_bus(session_device_id, packet);
 	g_free(header);
 	g_free(packet);
diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index eef93cbf..e034dfcc 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -512,7 +512,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = cur_samplerate;
 	header.protocol_id = PROTO_RAW;
-	header.num_probes = num_channels;
+	header.num_logic_probes = num_channels;
+	header.num_analog_probes = 0;
 	session_bus(session_device_id, &packet);
 
 	buf = g_malloc(PACKET_SIZE);
diff --git a/input/input_binary.c b/input/input_binary.c
index 7c9f96ba..2f1462d0 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -48,7 +48,8 @@ static int in_loadfile(const char *filename)
 	device = device_new(NULL, 0, num_probes);
 
 	header.feed_version = 1;
-	header.num_probes = num_probes;
+	header.num_logic_probes = num_probes;
+	header.num_analog_probes = 0; /* FIXME */
 	header.protocol_id = PROTO_RAW;
 	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);