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:
parent
e7ee300a12
commit
5c64390e5a
|
@ -1352,7 +1352,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
|
||||||
gettimeofday(&header.starttime, NULL);
|
gettimeofday(&header.starttime, NULL);
|
||||||
header.samplerate = sigma->cur_samplerate;
|
header.samplerate = sigma->cur_samplerate;
|
||||||
header.num_logic_probes = sigma->num_probes;
|
header.num_logic_probes = sigma->num_probes;
|
||||||
header.num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_data, &packet);
|
sr_session_bus(session_data, &packet);
|
||||||
|
|
||||||
/* Add capture source. */
|
/* Add capture source. */
|
||||||
|
|
|
@ -1088,7 +1088,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
|
||||||
gettimeofday(&header.starttime, NULL);
|
gettimeofday(&header.starttime, NULL);
|
||||||
header.samplerate = la8->cur_samplerate;
|
header.samplerate = la8->cur_samplerate;
|
||||||
header.num_logic_probes = NUM_PROBES;
|
header.num_logic_probes = NUM_PROBES;
|
||||||
header.num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_data, &packet);
|
sr_session_bus(session_data, &packet);
|
||||||
|
|
||||||
/* Time when we should be done (for detecting trigger timeouts). */
|
/* Time when we should be done (for detecting trigger timeouts). */
|
||||||
|
|
|
@ -469,7 +469,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
|
||||||
gettimeofday(&header->starttime, NULL);
|
gettimeofday(&header->starttime, NULL);
|
||||||
header->samplerate = cur_samplerate;
|
header->samplerate = cur_samplerate;
|
||||||
header->num_logic_probes = NUM_PROBES;
|
header->num_logic_probes = NUM_PROBES;
|
||||||
header->num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_data, packet);
|
sr_session_bus(session_data, packet);
|
||||||
g_free(header);
|
g_free(header);
|
||||||
g_free(packet);
|
g_free(packet);
|
||||||
|
|
|
@ -808,7 +808,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
|
||||||
header.feed_version = 1;
|
header.feed_version = 1;
|
||||||
gettimeofday(&header.starttime, NULL);
|
gettimeofday(&header.starttime, NULL);
|
||||||
header.samplerate = mso->cur_rate;
|
header.samplerate = mso->cur_rate;
|
||||||
header.num_analog_probes = 1;
|
// header.num_analog_probes = 1;
|
||||||
header.num_logic_probes = 8;
|
header.num_logic_probes = 8;
|
||||||
sr_session_bus(session_device_id, &packet);
|
sr_session_bus(session_device_id, &packet);
|
||||||
|
|
||||||
|
|
|
@ -1002,7 +1002,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
|
||||||
gettimeofday(&header->starttime, NULL);
|
gettimeofday(&header->starttime, NULL);
|
||||||
header->samplerate = ols->cur_samplerate;
|
header->samplerate = ols->cur_samplerate;
|
||||||
header->num_logic_probes = NUM_PROBES;
|
header->num_logic_probes = NUM_PROBES;
|
||||||
header->num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_data, packet);
|
sr_session_bus(session_data, packet);
|
||||||
|
|
||||||
g_free(header);
|
g_free(header);
|
||||||
|
|
|
@ -791,7 +791,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
|
||||||
gettimeofday(&header->starttime, NULL);
|
gettimeofday(&header->starttime, NULL);
|
||||||
header->samplerate = fx2->cur_samplerate;
|
header->samplerate = fx2->cur_samplerate;
|
||||||
header->num_logic_probes = fx2->profile->num_probes;
|
header->num_logic_probes = fx2->profile->num_probes;
|
||||||
header->num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_data, packet);
|
sr_session_bus(session_data, packet);
|
||||||
g_free(header);
|
g_free(header);
|
||||||
g_free(packet);
|
g_free(packet);
|
||||||
|
|
|
@ -664,7 +664,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
|
||||||
gettimeofday(&header.starttime, NULL);
|
gettimeofday(&header.starttime, NULL);
|
||||||
header.samplerate = zp->cur_samplerate;
|
header.samplerate = zp->cur_samplerate;
|
||||||
header.num_logic_probes = zp->num_channels;
|
header.num_logic_probes = zp->num_channels;
|
||||||
header.num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_data, &packet);
|
sr_session_bus(session_data, &packet);
|
||||||
|
|
||||||
if (!(buf = g_try_malloc(PACKET_SIZE))) {
|
if (!(buf = g_try_malloc(PACKET_SIZE))) {
|
||||||
|
|
|
@ -78,7 +78,6 @@ static int loadfile(struct sr_input *in, const char *filename)
|
||||||
/* send header */
|
/* send header */
|
||||||
header.feed_version = 1;
|
header.feed_version = 1;
|
||||||
header.num_logic_probes = num_probes;
|
header.num_logic_probes = num_probes;
|
||||||
header.num_analog_probes = 0;
|
|
||||||
header.samplerate = 0;
|
header.samplerate = 0;
|
||||||
gettimeofday(&header.starttime, NULL);
|
gettimeofday(&header.starttime, NULL);
|
||||||
packet.type = SR_DF_HEADER;
|
packet.type = SR_DF_HEADER;
|
||||||
|
|
|
@ -137,7 +137,6 @@ static int loadfile(struct sr_input *in, const char *filename)
|
||||||
header.feed_version = 1;
|
header.feed_version = 1;
|
||||||
gettimeofday(&header.starttime, NULL);
|
gettimeofday(&header.starttime, NULL);
|
||||||
header.num_logic_probes = num_probes;
|
header.num_logic_probes = num_probes;
|
||||||
header.num_analog_probes = 0;
|
|
||||||
header.samplerate = samplerate;
|
header.samplerate = samplerate;
|
||||||
sr_session_bus(in->vdevice, &packet);
|
sr_session_bus(in->vdevice, &packet);
|
||||||
|
|
||||||
|
|
|
@ -324,7 +324,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
|
||||||
gettimeofday(&header->starttime, NULL);
|
gettimeofday(&header->starttime, NULL);
|
||||||
header->samplerate = vdevice->samplerate;
|
header->samplerate = vdevice->samplerate;
|
||||||
header->num_logic_probes = vdevice->num_probes;
|
header->num_logic_probes = vdevice->num_probes;
|
||||||
header->num_analog_probes = 0;
|
|
||||||
sr_session_bus(session_device_id, packet);
|
sr_session_bus(session_device_id, packet);
|
||||||
g_free(header);
|
g_free(header);
|
||||||
g_free(packet);
|
g_free(packet);
|
||||||
|
|
|
@ -107,7 +107,6 @@ enum {
|
||||||
SR_DF_END,
|
SR_DF_END,
|
||||||
SR_DF_TRIGGER,
|
SR_DF_TRIGGER,
|
||||||
SR_DF_LOGIC,
|
SR_DF_LOGIC,
|
||||||
SR_DF_ANALOG,
|
|
||||||
SR_DF_PD,
|
SR_DF_PD,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -120,7 +119,6 @@ struct sr_datafeed_header {
|
||||||
int feed_version;
|
int feed_version;
|
||||||
struct timeval starttime;
|
struct timeval starttime;
|
||||||
uint64_t samplerate;
|
uint64_t samplerate;
|
||||||
int num_analog_probes;
|
|
||||||
int num_logic_probes;
|
int num_logic_probes;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -188,7 +186,6 @@ struct sr_device {
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
SR_PROBE_TYPE_LOGIC,
|
SR_PROBE_TYPE_LOGIC,
|
||||||
SR_PROBE_TYPE_ANALOG,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sr_probe {
|
struct sr_probe {
|
||||||
|
|
Loading…
Reference in New Issue