BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Uwe Hermann 2012-02-04 10:10:43 +01:00
parent e7ee300a12
commit 5c64390e5a
11 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hardware/asix-sigma/asix-sigma.c
View File

@ -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. */

1
hardware/chronovu-la8/chronovu-la8.c
View File

@ -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). */

1
hardware/demo/demo.c
View File

@ -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);

2
hardware/link-mso19/link-mso19.c
View File

@ -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);

1
hardware/openbench-logic-sniffer/ols.c
View File

@ -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);

1
hardware/saleae-logic/saleae-logic.c
View File

@ -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);

1
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -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))) {

1
input/binary.c
View File

@ -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;

1
input/chronovu_la8.c
View File

@ -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);

1
session_driver.c
View File

@ -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);

3
sigrok.h.in
View File

@ -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 {