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 d93291ea4bb8ba1a9ab49910b7b2d3785a230b0c..1bddda43e44f75e621ddf50b57150d888ce1954c 100644 (file)
--- 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 ad8c3601f8e150179d8b16e97f84dc4e51684b58..4560d69f47ed68f9539bb0a1892aad7722218da5 100644 (file)
--- 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 a7ce4ec70aa870905065d1afcaf455a3d8a56398..8cfd1c8946a5ca96b43a14b854c4a57c055b78d2 100644 (file)
--- 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 1af3d2a9fddfc882da6197de1b6f1efe9e9e7a85..138ffe970125de629fd56b528c716552fc9cd045 100644 (file)
--- 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 e69bcfb93eba20670ec1af2bc878ed5c61649a08..3bc087ca344a9b6d17bf9a037ee5ecd701f23fad 100644 (file)
--- 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 49174097af0052c8805b328c98aa48660fe399d6..09a37cb29caa63dae0e0a98ae850c17c920f60ae 100644 (file)
--- 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 a4022f1fb63da8bdbebc6ebbca9ffe8e01d9c23f..4abd7f789b0a1011d27900396ac173d677de09bf 100644 (file)
--- 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 80820e022c7b64c736a4e4f14f4d7f42d51c0ebe..9172eb8e8fc66bbd5d919ce6d9b3130011ea25a0 100644 (file)
--- 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 c39f0169b0a66ac0a7e78107119930b7e250bbe4..efc7704c3cbc1057aa4ef1a2e31fc35630abc592 100644 (file)
--- 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 a994213df18b04ba48466248f1d656d723a88c32..0c1d0d20de0465ee622a09da8b660d7208e5ff60 100644 (file)
--- 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 0b585c4e67b74e038dcfbd8d2226bfd4f39af872..0a18f8d1231b09c3465e1bef8c70a11506af0912 100644 (file)
--- 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 {