From: Uwe Hermann <redacted>
Date: Sat, 4 Feb 2012 09:10:43 +0000 (+0100)
Subject: sr/cli/gtk: Remove analog left-overs from API.
X-Git-Tag: libsigrok-0.1.0~150
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=5c64390e5ac8a0052d8b7eeb49c781d86027c814

sr/cli/gtk: Remove analog left-overs from API.

This will come back in some form or another later, but for now
don't clutter the API with non-working stuff. Removing stuff from APIs
is not possible without breaking the API, adding stuff later is simpler.
---

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index d93291ea..1bddda43 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -1352,7 +1352,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = sigma->cur_samplerate;
 	header.num_logic_probes = sigma->num_probes;
-	header.num_analog_probes = 0;
 	sr_session_bus(session_data, &packet);
 
 	/* Add capture source. */
diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index ad8c3601..4560d69f 100644
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -1088,7 +1088,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = la8->cur_samplerate;
 	header.num_logic_probes = NUM_PROBES;
-	header.num_analog_probes = 0;
 	sr_session_bus(session_data, &packet);
 
 	/* Time when we should be done (for detecting trigger timeouts). */
diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index a7ce4ec7..8cfd1c89 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -469,7 +469,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	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);
diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 1af3d2a9..138ffe97 100644
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -808,7 +808,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = mso->cur_rate;
-	header.num_analog_probes = 1;
+	// header.num_analog_probes = 1;
 	header.num_logic_probes = 8;
 	sr_session_bus(session_device_id, &packet);
 
diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index e69bcfb9..3bc087ca 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -1002,7 +1002,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = ols->cur_samplerate;
 	header->num_logic_probes = NUM_PROBES;
-	header->num_analog_probes = 0;
 	sr_session_bus(session_data, packet);
 
 	g_free(header);
diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 49174097..09a37cb2 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -791,7 +791,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = fx2->cur_samplerate;
 	header->num_logic_probes = fx2->profile->num_probes;
-	header->num_analog_probes = 0;
 	sr_session_bus(session_data, packet);
 	g_free(header);
 	g_free(packet);
diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index a4022f1f..4abd7f78 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -664,7 +664,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = zp->cur_samplerate;
 	header.num_logic_probes = zp->num_channels;
-	header.num_analog_probes = 0;
 	sr_session_bus(session_data, &packet);
 
 	if (!(buf = g_try_malloc(PACKET_SIZE))) {
diff --git a/input/binary.c b/input/binary.c
index 80820e02..9172eb8e 100644
--- a/input/binary.c
+++ b/input/binary.c
@@ -78,7 +78,6 @@ static int loadfile(struct sr_input *in, const char *filename)
 	/* send header */
 	header.feed_version = 1;
 	header.num_logic_probes = num_probes;
-	header.num_analog_probes = 0;
 	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);
 	packet.type = SR_DF_HEADER;
diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index c39f0169..efc7704c 100644
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -137,7 +137,6 @@ static int loadfile(struct sr_input *in, const char *filename)
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
 	header.num_logic_probes = num_probes;
-	header.num_analog_probes = 0;
 	header.samplerate = samplerate;
 	sr_session_bus(in->vdevice, &packet);
 
diff --git a/session_driver.c b/session_driver.c
index a994213d..0c1d0d20 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -324,7 +324,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = vdevice->samplerate;
 	header->num_logic_probes = vdevice->num_probes;
-	header->num_analog_probes = 0;
 	sr_session_bus(session_device_id, packet);
 	g_free(header);
 	g_free(packet);
diff --git a/sigrok.h.in b/sigrok.h.in
index 0b585c4e..0a18f8d1 100644
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -107,7 +107,6 @@ enum {
 	SR_DF_END,
 	SR_DF_TRIGGER,
 	SR_DF_LOGIC,
-	SR_DF_ANALOG,
 	SR_DF_PD,
 };
 
@@ -120,7 +119,6 @@ struct sr_datafeed_header {
 	int feed_version;
 	struct timeval starttime;
 	uint64_t samplerate;
-	int num_analog_probes;
 	int num_logic_probes;
 };
 
@@ -188,7 +186,6 @@ struct sr_device {
 
 enum {
 	SR_PROBE_TYPE_LOGIC,
-	SR_PROBE_TYPE_ANALOG,
 };
 
 struct sr_probe {