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

lecroy-xstream: Random whitespace/style fixes

This commit is contained in:
Soeren Apel 2017-10-03 17:29:53 +02:00
parent e7d2cd1e05
commit 952c7376e4
2 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hardware/lecroy-xstream/api.c
View File

@ -83,7 +83,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
hw_info = NULL; hw_info = NULL;
devc = g_malloc0(sizeof(struct dev_context)); devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc; sdi->priv = devc;
if (lecroy_xstream_init_device(sdi) != SR_OK) if (lecroy_xstream_init_device(sdi) != SR_OK)
@ -239,8 +238,7 @@ static int config_set(uint32_t key, GVariant *data,
state->analog_channels[j].vdiv = idx; state->analog_channels[j].vdiv = idx;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
"C%d:VDIV %E", j + 1, (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]); "C%d:VDIV %E", j + 1, (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
if (sr_scpi_send(sdi->conn, command) != SR_OK || if (sr_scpi_send(sdi->conn, command) != SR_OK || sr_scpi_get_opc(sdi->conn) != SR_OK)
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR; return SR_ERR;
ret = SR_OK; ret = SR_OK;
break; break;
@ -285,8 +283,7 @@ static int config_set(uint32_t key, GVariant *data,
state->analog_channels[j].coupling = idx; state->analog_channels[j].coupling = idx;
g_snprintf(command, sizeof(command), "C%d:COUPLING %s", g_snprintf(command, sizeof(command), "C%d:COUPLING %s",
j + 1, (*model->coupling_options)[idx]); j + 1, (*model->coupling_options)[idx]);
if (sr_scpi_send(sdi->conn, command) != SR_OK || if (sr_scpi_send(sdi->conn, command) != SR_OK || sr_scpi_get_opc(sdi->conn) != SR_OK)
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR; return SR_ERR;
ret = SR_OK; ret = SR_OK;
break; break;
@ -358,14 +355,12 @@ SR_PRIV int lecroy_xstream_request_data(const struct sr_dev_inst *sdi)
struct dev_context *devc; struct dev_context *devc;
devc = sdi->priv; devc = sdi->priv;
ch = devc->current_channel->data; ch = devc->current_channel->data;
if (ch->type != SR_CHANNEL_ANALOG) if (ch->type != SR_CHANNEL_ANALOG)
return SR_ERR; return SR_ERR;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command), "C%d:WAVEFORM?", ch->index + 1);
"COMM_FORMAT DEF9,WORD,BIN;C%d:WAVEFORM?", ch->index + 1);
return sr_scpi_send(sdi->conn, command); return sr_scpi_send(sdi->conn, command);
} }
@ -395,6 +390,7 @@ static int setup_channels(const struct sr_dev_inst *sdi)
if (sr_scpi_send(scpi, command) != SR_OK) if (sr_scpi_send(scpi, command) != SR_OK)
return SR_ERR; return SR_ERR;
state->analog_channels[ch->index].state = ch->enabled; state->analog_channels[ch->index].state = ch->enabled;
setup_changed = TRUE; setup_changed = TRUE;
break; break;

30
src/hardware/lecroy-xstream/protocol.c
View File

@ -75,9 +75,9 @@ struct lecroy_wavedesc {
} __attribute__((packed)); } __attribute__((packed));
static const char *coupling_options[] = { static const char *coupling_options[] = {
"A1M", // AC with 1 MOhm termination "A1M", ///< AC with 1 MOhm termination
"D50", // DC with 50 Ohm termination "D50", ///< DC with 50 Ohm termination
"D1M", // DC with 1 MOhm termination "D1M", ///< DC with 1 MOhm termination
"GND", "GND",
"OVL", "OVL",
}; };
@ -269,8 +269,7 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
} }
static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
const struct scope_config *config, const struct scope_config *config, struct scope_state *state)
struct scope_state *state)
{ {
unsigned int i, j; unsigned int i, j;
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE];
@ -391,15 +390,17 @@ SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
i++; i++;
} }
if (!trig_source || scope_state_get_array_option(trig_source, config->trigger_sources, config->num_trigger_sources, &state->trigger_source) != SR_OK) if (!trig_source || scope_state_get_array_option(trig_source,
config->trigger_sources, config->num_trigger_sources,
&state->trigger_source) != SR_OK)
return SR_ERR; return SR_ERR;
g_snprintf(command, sizeof(command), "%s:TRIG_SLOPE?", trig_source); g_snprintf(command, sizeof(command), "%s:TRIG_SLOPE?", trig_source);
if (sr_scpi_get_string(sdi->conn, command, &tmp_str) != SR_OK) if (sr_scpi_get_string(sdi->conn, command, &tmp_str) != SR_OK)
return SR_ERR; return SR_ERR;
if (scope_state_get_array_option(tmp_str, if (scope_state_get_array_option(tmp_str, config->trigger_slopes,
config->trigger_slopes, config->num_trigger_slopes, &state->trigger_slope) != SR_OK) config->num_trigger_slopes, &state->trigger_slope) != SR_OK)
return SR_ERR; return SR_ERR;
if (sr_scpi_get_float(sdi->conn, "TRIG_DELAY?", &state->horiz_triggerpos) != SR_OK) if (sr_scpi_get_float(sdi->conn, "TRIG_DELAY?", &state->horiz_triggerpos) != SR_OK)
@ -464,7 +465,7 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
/* Set the desired response and format modes. */ /* Set the desired response and format modes. */
sr_scpi_send(sdi->conn, "COMM_HEADER OFF"); sr_scpi_send(sdi->conn, "COMM_HEADER OFF");
sr_scpi_send(sdi->conn, "COMM_FORMAT OFF,WORD,BIN"); sr_scpi_send(sdi->conn, "COMM_FORMAT DEF9,WORD,BIN");
devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) * devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
scope_models[model_index].analog_channels); scope_models[model_index].analog_channels);
@ -493,16 +494,13 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
devc->model_config = &scope_models[model_index]; devc->model_config = &scope_models[model_index];
devc->frame_limit = 0; devc->frame_limit = 0;
devc->model_state = scope_state_new(devc->model_config);
if (!(devc->model_state = scope_state_new(devc->model_config)))
return SR_ERR_MALLOC;
return SR_OK; return SR_OK;
} }
static int lecroy_waveform_2_x_to_analog(GByteArray *data, static int lecroy_waveform_2_x_to_analog(GByteArray *data,
struct lecroy_wavedesc *desc, struct lecroy_wavedesc *desc, struct sr_datafeed_analog *analog)
struct sr_datafeed_analog *analog)
{ {
struct sr_analog_encoding *encoding = analog->encoding; struct sr_analog_encoding *encoding = analog->encoding;
struct sr_analog_meaning *meaning = analog->meaning; struct sr_analog_meaning *meaning = analog->meaning;
@ -568,9 +566,7 @@ static int lecroy_waveform_to_analog(GByteArray *data,
return lecroy_waveform_2_x_to_analog(data, desc, analog); return lecroy_waveform_2_x_to_analog(data, desc, analog);
} }
sr_err("Waveformat template '%.16s' not supported.", sr_err("Waveformat template '%.16s' not supported.", desc->template_name);
desc->template_name);
return SR_ERR; return SR_ERR;
} }