X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fapi.c;h=ff045f16425e61ad091be85868c2111845cb39fe;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=2988823b5a7f5a3691e881bcfefc6b7d079330f2;hpb=91aea754aaed0f0f2a6fc4b2b875f0d0b7c01f8e;p=libsigrok.git diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c index 2988823b..ff045f16 100644 --- a/hardware/hameg-hmo/api.c +++ b/hardware/hameg-hmo/api.c @@ -35,10 +35,10 @@ static const int32_t hwopts[] = { }; enum { - PG_INVALID = -1, - PG_NONE, - PG_ANALOG, - PG_DIGITAL, + CG_INVALID = -1, + CG_NONE, + CG_ANALOG, + CG_DIGITAL, }; static int init(struct sr_context *sr_ctx) @@ -192,25 +192,25 @@ static int check_channel_group(struct dev_context *devc, model = devc->model_config; if (!cg) - return PG_NONE; + return CG_NONE; for (i = 0; i < model->analog_channels; ++i) if (cg == &devc->analog_groups[i]) - return PG_ANALOG; + return CG_ANALOG; for (i = 0; i < model->digital_pods; ++i) if (cg == &devc->digital_groups[i]) - return PG_DIGITAL; + return CG_DIGITAL; sr_err("Invalid channel group specified."); - return PG_INVALID; + return CG_INVALID; } static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int ret, pg_type; + int ret, cg_type; unsigned int i; struct dev_context *devc; struct scope_config *model; @@ -219,7 +219,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID) + if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) return SR_ERR; ret = SR_ERR_NA; @@ -237,10 +237,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, ret = SR_OK; break; case SR_CONF_NUM_VDIV: - if (pg_type == PG_NONE) { + if (cg_type == CG_NONE) { sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; - } else if (pg_type == PG_ANALOG) { + } else if (cg_type == CG_ANALOG) { for (i = 0; i < model->analog_channels; ++i) { if (cg != &devc->analog_groups[i]) continue; @@ -254,12 +254,12 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, } break; case SR_CONF_VDIV: - if (pg_type == PG_NONE) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; - } else if (pg_type == PG_ANALOG) { + if (cg_type == CG_NONE) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; + } else if (cg_type == CG_ANALOG) { for (i = 0; i < model->analog_channels; ++i) { - if (probe_group != &devc->analog_groups[i]) + if (cg != &devc->analog_groups[i]) continue; *data = g_variant_new("(tt)", (*model->vdivs)[state->analog_channels[i].vdiv][0], @@ -285,10 +285,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, ret = SR_OK; break; case SR_CONF_COUPLING: - if (pg_type == PG_NONE) { + if (cg_type == CG_NONE) { sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; - } else if (pg_type == PG_ANALOG) { + } else if (cg_type == CG_ANALOG) { for (i = 0; i < model->analog_channels; ++i) { if (cg != &devc->analog_groups[i]) continue; @@ -334,7 +334,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n) static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int ret, pg_type; + int ret, cg_type; unsigned int i, j; char command[MAX_COMMAND_SIZE], float_str[30]; struct dev_context *devc; @@ -348,7 +348,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID) + if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) return SR_ERR; model = devc->model_config; @@ -377,7 +377,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, } break; case SR_CONF_VDIV: - if (pg_type == PG_NONE) { + if (cg_type == CG_NONE) { sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } @@ -460,7 +460,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, ret = sr_scpi_send(sdi->conn, command); break; case SR_CONF_COUPLING: - if (pg_type == PG_NONE) { + if (cg_type == CG_NONE) { sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } @@ -506,25 +506,25 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int pg_type; + int cg_type; struct dev_context *devc; struct scope_config *model; if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID) + if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) return SR_ERR; model = devc->model_config; switch (key) { case SR_CONF_DEVICE_OPTIONS: - if (pg_type == PG_NONE) { + if (cg_type == CG_NONE) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, model->hw_caps, model->num_hwcaps, sizeof(int32_t)); - } else if (pg_type == PG_ANALOG) { + } else if (cg_type == CG_ANALOG) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, model->analog_hwcaps, model->num_analog_hwcaps, sizeof(int32_t)); @@ -534,7 +534,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, } break; case SR_CONF_COUPLING: - if (pg_type == PG_NONE) + if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; *data = g_variant_new_strv(*model->coupling_options, g_strv_length((char **)*model->coupling_options)); @@ -551,7 +551,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, *data = build_tuples(model->timebases, model->num_timebases); break; case SR_CONF_VDIV: - if (pg_type == PG_NONE) + if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; *data = build_tuples(model->vdivs, model->num_vdivs); break; @@ -565,53 +565,53 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi) { char command[MAX_COMMAND_SIZE]; - struct sr_channel *probe; + struct sr_channel *ch; struct dev_context *devc; struct scope_config *model; devc = sdi->priv; model = devc->model_config; - probe = devc->current_probe->data; + ch = devc->current_channel->data; - switch (probe->type) { - case SR_PROBE_ANALOG: + switch (ch->type) { + case SR_CHANNEL_ANALOG: g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_GET_ANALOG_DATA], - probe->index + 1); + ch->index + 1); break; - case SR_PROBE_LOGIC: + case SR_CHANNEL_LOGIC: g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_GET_DIG_DATA], - probe->index < 8 ? 1 : 2); + ch->index < 8 ? 1 : 2); break; default: - sr_err("Invalid probe type."); + sr_err("Invalid channel type."); break; } return sr_scpi_send(sdi->conn, command); } -static int hmo_check_probes(GSList *probes) +static int hmo_check_channels(GSList *channels) { GSList *l; - struct sr_channel *probe; + struct sr_channel *ch; gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4; enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE; - for (l = probes; l; l = l->next) { - probe = l->data; - switch (probe->type) { - case SR_PROBE_ANALOG: - if (probe->index == 2) + for (l = channels; l; l = l->next) { + ch = l->data; + switch (ch->type) { + case SR_CHANNEL_ANALOG: + if (ch->index == 2) enabled_chan3 = TRUE; - else if (probe->index == 3) + else if (ch->index == 3) enabled_chan4 = TRUE; break; - case SR_PROBE_LOGIC: - if (probe->index < 8) + case SR_CHANNEL_LOGIC: + if (ch->index < 8) enabled_pod1 = TRUE; else enabled_pod2 = TRUE; @@ -628,7 +628,7 @@ static int hmo_check_probes(GSList *probes) return SR_OK; } -static int hmo_setup_probes(const struct sr_dev_inst *sdi) +static int hmo_setup_channels(const struct sr_dev_inst *sdi) { GSList *l; unsigned int i; @@ -636,7 +636,7 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi) char command[MAX_COMMAND_SIZE]; struct scope_state *state; struct scope_config *model; - struct sr_channel *probe; + struct sr_channel *ch; struct dev_context *devc; struct sr_scpi_dev_inst *scpi; @@ -648,39 +648,39 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi) pod_enabled = g_try_malloc0(sizeof(gboolean) * model->digital_pods); - for (l = sdi->probes; l; l = l->next) { - probe = l->data; - switch (probe->type) { - case SR_PROBE_ANALOG: - if (probe->enabled == state->analog_channels[probe->index].state) + for (l = sdi->channels; l; l = l->next) { + ch = l->data; + switch (ch->type) { + case SR_CHANNEL_ANALOG: + if (ch->enabled == state->analog_channels[ch->index].state) break; g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE], - probe->index + 1, probe->enabled); + ch->index + 1, ch->enabled); if (sr_scpi_send(scpi, command) != SR_OK) return SR_ERR; - state->analog_channels[probe->index].state = probe->enabled; + state->analog_channels[ch->index].state = ch->enabled; setup_changed = TRUE; break; - case SR_PROBE_LOGIC: + case SR_CHANNEL_LOGIC: /* * A digital POD needs to be enabled for every group of - * 8 probes. + * 8 channels. */ - if (probe->enabled) - pod_enabled[probe->index < 8 ? 0 : 1] = TRUE; + if (ch->enabled) + pod_enabled[ch->index < 8 ? 0 : 1] = TRUE; - if (probe->enabled == state->digital_channels[probe->index]) + if (ch->enabled == state->digital_channels[ch->index]) break; g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE], - probe->index, probe->enabled); + ch->index, ch->enabled); if (sr_scpi_send(scpi, command) != SR_OK) return SR_ERR; - state->digital_channels[probe->index] = probe->enabled; + state->digital_channels[ch->index] = ch->enabled; setup_changed = TRUE; break; default: @@ -712,7 +712,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { GSList *l; gboolean digital_added; - struct sr_channel *probe; + struct sr_channel *ch; struct dev_context *devc; struct sr_scpi_dev_inst *scpi; @@ -723,38 +723,39 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc = sdi->priv; digital_added = FALSE; - for (l = sdi->probes; l; l = l->next) { - probe = l->data; - if (!probe->enabled) + for (l = sdi->channels; l; l = l->next) { + ch = l->data; + if (!ch->enabled) continue; - /* Only add a single digital probe. */ - if (probe->type != SR_PROBE_LOGIC || !digital_added) { - devc->enabled_probes = g_slist_append( - devc->enabled_probes, probe); - if (probe->type == SR_PROBE_LOGIC) + /* Only add a single digital channel. */ + if (ch->type != SR_CHANNEL_LOGIC || !digital_added) { + devc->enabled_channels = g_slist_append( + devc->enabled_channels, ch); + if (ch->type == SR_CHANNEL_LOGIC) digital_added = TRUE; } } - if (!devc->enabled_probes) + if (!devc->enabled_channels) return SR_ERR; - if (hmo_check_probes(devc->enabled_probes) != SR_OK) { - sr_err("Invalid probe configuration specified!"); + if (hmo_check_channels(devc->enabled_channels) != SR_OK) { + sr_err("Invalid channel configuration specified!"); return SR_ERR_NA; } - if (hmo_setup_probes(sdi) != SR_OK) { - sr_err("Failed to setup probe configuration!"); + if (hmo_setup_channels(sdi) != SR_OK) { + sr_err("Failed to setup channel configuration!"); return SR_ERR; } - sr_scpi_source_add(scpi, G_IO_IN, 50, hmo_receive_data, (void *)sdi); + sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50, + hmo_receive_data, (void *)sdi); /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); - devc->current_probe = devc->enabled_probes; + devc->current_channel = devc->enabled_channels; return hmo_request_data(sdi); } @@ -777,10 +778,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) devc = sdi->priv; devc->num_frames = 0; - g_slist_free(devc->enabled_probes); - devc->enabled_probes = NULL; + g_slist_free(devc->enabled_channels); + devc->enabled_channels = NULL; scpi = sdi->conn; - sr_scpi_source_remove(scpi); + sr_scpi_source_remove(sdi->session, scpi); return SR_OK; }