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

hameg-hmo: Publish driver options.

This commit is contained in:
Aurelien Jacobs 2014-11-19 23:52:51 +01:00
parent 8a58419d37
commit 6ec3ef9b92
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hardware/hameg-hmo/api.c
View File

@ -29,6 +29,10 @@ static const char *manufacturers[] = {
"HAMEG", "HAMEG",
}; };
static const uint32_t drvopts[] = {
SR_CONF_OSCILLOSCOPE,
};
static const uint32_t scanopts[] = { static const uint32_t scanopts[] = {
SR_CONF_CONN, SR_CONF_CONN,
SR_CONF_SERIALCOMM, SR_CONF_SERIALCOMM,
@ -497,17 +501,16 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
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_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg)
{ {
int cg_type; int cg_type = CG_NONE;
struct dev_context *devc; struct dev_context *devc = NULL;
struct scope_config *model; struct scope_config *model = NULL;
if (!sdi || !(devc = sdi->priv)) if (sdi && (devc = sdi->priv)) {
return SR_ERR_ARG; if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) model = devc->model_config;
return SR_ERR; }
model = devc->model_config;
switch (key) { switch (key) {
case SR_CONF_SCAN_OPTIONS: case SR_CONF_SCAN_OPTIONS:
@ -516,9 +519,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
break; break;
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (cg_type == CG_NONE) { if (cg_type == CG_NONE) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, if (model)
model->devopts, model->num_devopts, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
sizeof(uint32_t)); model->devopts, model->num_devopts, sizeof(uint32_t));
else
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
} else if (cg_type == CG_ANALOG) { } else if (cg_type == CG_ANALOG) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
model->analog_devopts, model->num_analog_devopts, model->analog_devopts, model->num_analog_devopts,
@ -535,14 +541,20 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
g_strv_length((char **)*model->coupling_options)); g_strv_length((char **)*model->coupling_options));
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
if (!model)
return SR_ERR_ARG;
*data = g_variant_new_strv(*model->trigger_sources, *data = g_variant_new_strv(*model->trigger_sources,
g_strv_length((char **)*model->trigger_sources)); g_strv_length((char **)*model->trigger_sources));
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
if (!model)
return SR_ERR_ARG;
*data = g_variant_new_strv(*model->trigger_slopes, *data = g_variant_new_strv(*model->trigger_slopes,
g_strv_length((char **)*model->trigger_slopes)); g_strv_length((char **)*model->trigger_slopes));
break; break;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE:
if (!model)
return SR_ERR_ARG;
*data = build_tuples(model->timebases, model->num_timebases); *data = build_tuples(model->timebases, model->num_timebases);
break; break;
case SR_CONF_VDIV: case SR_CONF_VDIV: