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

lecroy-xstream: Minor whitespace and consistency fixes.

This commit is contained in:
Uwe Hermann 2017-03-02 20:05:52 +01:00
parent 9de47e9e71
commit ea257cdc23
3 changed files with 51 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,8 +140,7 @@ static int dev_close(struct sr_dev_inst *sdi)
} }
static int config_get(uint32_t key, GVariant **data, static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
const struct sr_channel_group *cg)
{ {
int ret; int ret;
unsigned int i; unsigned int i;
@ -158,6 +157,7 @@ static int config_get(uint32_t key, GVariant **data,
model = devc->model_config; model = devc->model_config;
state = devc->model_state; state = devc->model_state;
*data = NULL; *data = NULL;
switch (key) { switch (key) {
case SR_CONF_NUM_HDIV: case SR_CONF_NUM_HDIV:
*data = g_variant_new_int32(model->num_xdivs); *data = g_variant_new_int32(model->num_xdivs);
@ -200,11 +200,9 @@ static int config_get(uint32_t key, GVariant **data,
ret = SR_OK; ret = SR_OK;
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
for (i = 0; i < model->analog_channels; i++) { for (i = 0; i < model->analog_channels; i++) {
if (cg != devc->analog_groups[i]) { if (cg != devc->analog_groups[i])
continue; continue;
}
*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]); *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
ret = SR_OK; ret = SR_OK;
} }
@ -220,6 +218,7 @@ static int config_get(uint32_t key, GVariant **data,
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;
} }
return ret; return ret;
} }
@ -242,8 +241,8 @@ static GVariant *build_tuples(const struct sr_rational *array, unsigned int n)
return g_variant_builder_end(&gvb); return g_variant_builder_end(&gvb);
} }
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, static int config_set(uint32_t key, GVariant *data,
const struct sr_channel_group *cg) const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{ {
int ret; int ret;
unsigned int i, j; unsigned int i, j;
@ -358,7 +357,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
} }
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
tmp = g_variant_get_string(data, NULL); tmp = g_variant_get_string(data, NULL);
for (i = 0; (*model->coupling_options)[i]; i++) { for (i = 0; (*model->coupling_options)[i]; i++) {
@ -396,11 +394,12 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return ret; return ret;
} }
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, static int config_list(uint32_t key, GVariant **data,
const struct sr_channel_group *cg) const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{ {
struct dev_context *devc = NULL; struct dev_context *devc = NULL;
const struct scope_config *model = NULL; const struct scope_config *model = NULL;
(void)cg; (void)cg;
if (sdi) { if (sdi) {
@ -416,14 +415,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (!cg) { if (!cg) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
model->devopts, model->devopts, model->num_devopts, sizeof(uint32_t));
model->num_devopts,
sizeof(uint32_t));
break; break;
} }
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
model->analog_devopts, model->analog_devopts, model->num_analog_devopts,
model->num_analog_devopts,
sizeof(uint32_t)); sizeof(uint32_t));
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
@ -576,6 +572,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
free_enabled: free_enabled:
g_slist_free(devc->enabled_channels); g_slist_free(devc->enabled_channels);
devc->enabled_channels = NULL; devc->enabled_channels = NULL;
return ret; return ret;
} }

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

@ -258,8 +258,7 @@ static void scope_state_dump(const struct scope_config *config,
} }
static int scope_state_get_array_option(const char *resp, static int scope_state_get_array_option(const char *resp,
const char *(*array)[], const char *(*array)[], int *result)
int *result)
{ {
unsigned int i; unsigned int i;
@ -378,8 +377,8 @@ SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi)
SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi) SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct scope_state *state struct scope_state *state;
; const struct scope_config *config; const struct scope_config *config;
unsigned int i; unsigned int i;
char *tmp_str, *tmp_str2, *tmpp, *p, *key; char *tmp_str, *tmp_str2, *tmpp, *p, *key;
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE];
@ -426,11 +425,9 @@ 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, if (!trig_source || scope_state_get_array_option(trig_source, config->trigger_sources, &state->trigger_source) != SR_OK)
&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;
@ -493,7 +490,7 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
} }
if (model_index == -1) { if (model_index == -1) {
sr_dbg("Unsupported LECROY device."); sr_dbg("Unsupported LeCroy device.");
return SR_ERR_NA; return SR_ERR_NA;
} }
@ -502,7 +499,6 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
/* Add analog channels. */ /* Add analog channels. */
for (i = 0; i < scope_models[model_index].analog_channels; i++) { for (i = 0; i < scope_models[model_index].analog_channels; i++) {
g_snprintf(command, sizeof(command), "C%d:TRACE?", i + 1); g_snprintf(command, sizeof(command), "C%d:TRACE?", i + 1);
if (sr_scpi_get_bool(sdi->conn, command, &channel_enabled) != SR_OK) if (sr_scpi_get_bool(sdi->conn, command, &channel_enabled) != SR_OK)
@ -558,7 +554,6 @@ static int lecroy_waveform_2_x_to_analog(GByteArray *data,
* desc->version_2_x.vertical_gain * desc->version_2_x.vertical_gain
+ desc->version_2_x.vertical_offset; + desc->version_2_x.vertical_offset;
analog->data = data_float; analog->data = data_float;
analog->num_samples = num_samples; analog->num_samples = num_samples;
@ -578,13 +573,14 @@ static int lecroy_waveform_2_x_to_analog(GByteArray *data,
meaning->mq = SR_MQ_CURRENT; meaning->mq = SR_MQ_CURRENT;
meaning->unit = SR_UNIT_AMPERE; meaning->unit = SR_UNIT_AMPERE;
} else { } else {
/* default to voltage */ /* Default to voltage. */
meaning->mq = SR_MQ_VOLTAGE; meaning->mq = SR_MQ_VOLTAGE;
meaning->unit = SR_UNIT_VOLT; meaning->unit = SR_UNIT_VOLT;
} }
meaning->mqflags = 0; meaning->mqflags = 0;
spec->spec_digits = 3; spec->spec_digits = 3;
return SR_OK; return SR_OK;
} }
@ -603,7 +599,9 @@ 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\n", desc->template_name); sr_err("Waveformat template '%.16s' not supported.",
desc->template_name);
return SR_ERR; return SR_ERR;
} }
@ -619,6 +617,7 @@ SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data)
struct sr_analog_meaning meaning; struct sr_analog_meaning meaning;
struct sr_analog_spec spec; struct sr_analog_spec spec;
char buf[8]; char buf[8];
(void)fd; (void)fd;
(void)revents; (void)revents;
@ -643,11 +642,10 @@ SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data)
if (ch->type != SR_CHANNEL_ANALOG) if (ch->type != SR_CHANNEL_ANALOG)
return SR_ERR; return SR_ERR;
/*
* Pass on the received data of the channel(s). /* Pass on the received data of the channel(s). */
*/
if (sr_scpi_read_data(sdi->conn, buf, 4) != 4) { if (sr_scpi_read_data(sdi->conn, buf, 4) != 4) {
sr_err("reading header failed\n"); sr_err("Reading header failed.");
return TRUE; return TRUE;
} }
@ -675,7 +673,6 @@ SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data)
g_slist_free(meaning.channels); g_slist_free(meaning.channels);
g_free(analog.data); g_free(analog.data);
/* /*
* Advance to the next enabled channel. When data for all enabled * Advance to the next enabled channel. When data for all enabled
* channels was received, then flush potentially queued logic data, * channels was received, then flush potentially queued logic data,

1
src/hardware/lecroy-xstream/protocol.h
View File

@ -94,7 +94,6 @@ struct dev_context {
uint64_t num_frames; uint64_t num_frames;
uint64_t frame_limit; uint64_t frame_limit;
}; };
SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi); SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi);