Commit 952c7376 authored by Soeren Apel's avatar Soeren Apel

lecroy-xstream: Random whitespace/style fixes

parent e7d2cd1e
......@@ -83,7 +83,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
hw_info = NULL;
devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
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;
g_snprintf(command, sizeof(command),
"C%d:VDIV %E", j + 1, (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
if (sr_scpi_send(sdi->conn, command) != SR_OK || sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
ret = SR_OK;
break;
......@@ -285,8 +283,7 @@ static int config_set(uint32_t key, GVariant *data,
state->analog_channels[j].coupling = idx;
g_snprintf(command, sizeof(command), "C%d:COUPLING %s",
j + 1, (*model->coupling_options)[idx]);
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
if (sr_scpi_send(sdi->conn, command) != SR_OK || sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
ret = SR_OK;
break;
......@@ -358,14 +355,12 @@ SR_PRIV int lecroy_xstream_request_data(const struct sr_dev_inst *sdi)
struct dev_context *devc;
devc = sdi->priv;
ch = devc->current_channel->data;
if (ch->type != SR_CHANNEL_ANALOG)
return SR_ERR;
g_snprintf(command, sizeof(command),
"COMM_FORMAT DEF9,WORD,BIN;C%d:WAVEFORM?", ch->index + 1);
g_snprintf(command, sizeof(command), "C%d:WAVEFORM?", ch->index + 1);
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)
return SR_ERR;
state->analog_channels[ch->index].state = ch->enabled;
setup_changed = TRUE;
break;
......
......@@ -75,9 +75,9 @@ struct lecroy_wavedesc {
} __attribute__((packed));
static const char *coupling_options[] = {
"A1M", // AC with 1 MOhm termination
"D50", // DC with 50 Ohm termination
"D1M", // DC with 1 MOhm termination
"A1M", ///< AC with 1 MOhm termination
"D50", ///< DC with 50 Ohm termination
"D1M", ///< DC with 1 MOhm termination
"GND",
"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,
const struct scope_config *config,
struct scope_state *state)
const struct scope_config *config, struct scope_state *state)
{
unsigned int i, j;
char command[MAX_COMMAND_SIZE];
......@@ -391,15 +390,17 @@ SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
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;
g_snprintf(command, sizeof(command), "%s:TRIG_SLOPE?", trig_source);
if (sr_scpi_get_string(sdi->conn, command, &tmp_str) != SR_OK)
return SR_ERR;
if (scope_state_get_array_option(tmp_str,
config->trigger_slopes, config->num_trigger_slopes, &state->trigger_slope) != SR_OK)
if (scope_state_get_array_option(tmp_str, config->trigger_slopes,
config->num_trigger_slopes, &state->trigger_slope) != SR_OK)
return SR_ERR;
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. */
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*) *
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->frame_limit = 0;
if (!(devc->model_state = scope_state_new(devc->model_config)))
return SR_ERR_MALLOC;
devc->model_state = scope_state_new(devc->model_config);
return SR_OK;
}
static int lecroy_waveform_2_x_to_analog(GByteArray *data,
struct lecroy_wavedesc *desc,
struct sr_datafeed_analog *analog)
struct lecroy_wavedesc *desc, struct sr_datafeed_analog *analog)
{
struct sr_analog_encoding *encoding = analog->encoding;
struct sr_analog_meaning *meaning = analog->meaning;
......@@ -514,7 +512,7 @@ static int lecroy_waveform_2_x_to_analog(GByteArray *data,
data_float = g_malloc(desc->version_2_x.wave_array_count * sizeof(float));
num_samples = desc->version_2_x.wave_array_count;
waveform_data = (int16_t *)(data->data +
waveform_data = (int16_t*)(data->data +
+ desc->version_2_x.wave_descriptor_length
+ desc->version_2_x.user_text_len);
......@@ -561,16 +559,14 @@ static int lecroy_waveform_to_analog(GByteArray *data,
if (data->len < sizeof(struct lecroy_wavedesc))
return SR_ERR;
desc = (struct lecroy_wavedesc *)data->data;
desc = (struct lecroy_wavedesc*)data->data;
if (!strncmp(desc->template_name, "LECROY_2_2", 16) ||
!strncmp(desc->template_name, "LECROY_2_3", 16)) {
return lecroy_waveform_2_x_to_analog(data, desc, analog);
}
sr_err("Waveformat template '%.16s' not supported.",
desc->template_name);
sr_err("Waveformat template '%.16s' not supported.", desc->template_name);
return SR_ERR;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment