X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=cdc4360e9a40b440099ae86e7ada37b46b63edcf;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=f5e7383d9c439d97297c855d85c9396eb60a01f5;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index f5e7383d..cdc4360e 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -144,21 +144,16 @@ static const uint64_t vdivs[][2] = { }; static const char *trigger_sources[] = { - "CH1", - "CH2", - "EXT", + "CH1", "CH2", "EXT", /* TODO: forced */ }; static const char *trigger_slopes[] = { - "r", - "f", + "r", "f", }; static const char *coupling[] = { - "AC", - "DC", - "GND", + "AC", "DC", "GND", }; static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) @@ -232,19 +227,15 @@ static int configure_channels(const struct sr_dev_inst *sdi) return SR_OK; } -static void clear_dev_context(void *priv) +static void clear_helper(struct dev_context *devc) { - struct dev_context *devc; - - devc = priv; g_free(devc->triggersource); g_slist_free(devc->enabled_channels); - } static int dev_clear(const struct sr_dev_driver *di) { - return std_dev_clear(di, clear_dev_context); + return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } static GSList *scan(struct sr_dev_driver *di, GSList *options) @@ -401,12 +392,11 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_usb_dev_inst *usb; - char str[128]; const char *s; const uint64_t *vdiv; int ch_idx; @@ -434,8 +424,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s /* Device still needs to re-enumerate after firmware * upload, so we don't know its (future) address. */ return SR_ERR; - snprintf(str, 128, "%d.%d", usb->bus, usb->address); - *data = g_variant_new_string(str); + *data = g_variant_new_printf("%d.%d", usb->bus, usb->address); break; case SR_CONF_TIMEBASE: *data = g_variant_new("(tt)", timebases[devc->timebase][0], @@ -481,20 +470,13 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; double tmp_double; - uint64_t tmp_u64, p, q; - int tmp_int, ch_idx, ret; - unsigned int i; - const char *tmp_str; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; + int ch_idx, idx; - ret = SR_OK; devc = sdi->priv; if (!cg) { switch (key) { @@ -502,59 +484,36 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd devc->limit_frames = g_variant_get_uint64(data); break; case SR_CONF_TRIGGER_SLOPE: - tmp_str = g_variant_get_string(data, NULL); - if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0) return SR_ERR_ARG; - devc->triggerslope = (tmp_str[0] == 'r') + devc->triggerslope = (trigger_slopes[idx][0] == 'r') ? SLOPE_POSITIVE : SLOPE_NEGATIVE; break; case SR_CONF_HORIZ_TRIGGERPOS: tmp_double = g_variant_get_double(data); if (tmp_double < 0.0 || tmp_double > 1.0) { sr_err("Trigger position should be between 0.0 and 1.0."); - ret = SR_ERR_ARG; + return SR_ERR_ARG; } else devc->triggerposition = tmp_double; break; case SR_CONF_BUFFERSIZE: - tmp_u64 = g_variant_get_uint64(data); - for (i = 0; i < NUM_BUFFER_SIZES; i++) { - if (devc->profile->buffersizes[i] == tmp_u64) { - devc->framesize = tmp_u64; - break; - } - } - if (i == NUM_BUFFER_SIZES) - ret = SR_ERR_ARG; + if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0) + return SR_ERR_ARG; + devc->framesize = devc->profile->buffersizes[idx]; break; case SR_CONF_TIMEBASE: - g_variant_get(data, "(tt)", &p, &q); - tmp_int = -1; - for (i = 0; i < ARRAY_SIZE(timebases); i++) { - if (timebases[i][0] == p && timebases[i][1] == q) { - tmp_int = i; - break; - } - } - if (tmp_int >= 0) - devc->timebase = tmp_int; - else - ret = SR_ERR_ARG; + if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(timebases))) < 0) + return SR_ERR_ARG; + devc->timebase = idx; break; case SR_CONF_TRIGGER_SOURCE: - tmp_str = g_variant_get_string(data, NULL); - for (i = 0; trigger_sources[i]; i++) { - if (!strcmp(tmp_str, trigger_sources[i])) { - devc->triggersource = g_strdup(tmp_str); - break; - } - } - if (trigger_sources[i] == 0) - ret = SR_ERR_ARG; + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0) + return SR_ERR_ARG; + devc->triggersource = g_strdup(trigger_sources[idx]); break; default: - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } } else { if (sdi->channel_groups->data == cg) @@ -568,90 +527,47 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd devc->filter[ch_idx] = g_variant_get_boolean(data); break; case SR_CONF_VDIV: - g_variant_get(data, "(tt)", &p, &q); - tmp_int = -1; - for (i = 0; i < ARRAY_SIZE(vdivs); i++) { - if (vdivs[i][0] == p && vdivs[i][1] == q) { - tmp_int = i; - break; - } - } - if (tmp_int >= 0) { - devc->voltage[ch_idx] = tmp_int; - } else - ret = SR_ERR_ARG; + if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0) + return SR_ERR_ARG; + devc->voltage[ch_idx] = idx; break; case SR_CONF_COUPLING: - tmp_str = g_variant_get_string(data, NULL); - for (i = 0; coupling[i]; i++) { - if (!strcmp(tmp_str, coupling[i])) { - devc->coupling[ch_idx] = i; - break; - } - } - if (coupling[i] == 0) - ret = SR_ERR_ARG; + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0) + return SR_ERR_ARG; + devc->coupling[ch_idx] = idx; break; default: - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } } - return ret; + return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; - GVariant *tuple, *rational[2]; - GVariantBuilder gvb; - unsigned int i; - - if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - return SR_OK; - } else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); - return SR_OK; - } - - if (!sdi) - return SR_ERR_ARG; if (!cg) { switch (key) { + case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_BUFFERSIZE: if (!sdi) return SR_ERR_ARG; devc = sdi->priv; - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64, - devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t)); + *data = std_gvar_array_u64(devc->profile->buffersizes, NUM_BUFFER_SIZES); break; case SR_CONF_TIMEBASE: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - for (i = 0; i < ARRAY_SIZE(timebases); i++) { - rational[0] = g_variant_new_uint64(timebases[i][0]); - rational[1] = g_variant_new_uint64(timebases[i][1]); - tuple = g_variant_new_tuple(rational, 2); - g_variant_builder_add_value(&gvb, tuple); - } - *data = g_variant_builder_end(&gvb); + *data = std_gvar_tuple_array(ARRAY_AND_SIZE(timebases)); break; case SR_CONF_TRIGGER_SOURCE: - *data = g_variant_new_strv(trigger_sources, - ARRAY_SIZE(trigger_sources)); + *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources)); break; case SR_CONF_TRIGGER_SLOPE: - *data = g_variant_new_strv(trigger_slopes, - ARRAY_SIZE(trigger_slopes)); + *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_slopes)); break; default: return SR_ERR_NA; @@ -659,21 +575,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } else { switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg)); break; case SR_CONF_COUPLING: - *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); + *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling)); break; case SR_CONF_VDIV: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - for (i = 0; i < ARRAY_SIZE(vdivs); i++) { - rational[0] = g_variant_new_uint64(vdivs[i][0]); - rational[1] = g_variant_new_uint64(vdivs[i][1]); - tuple = g_variant_new_tuple(rational, 2); - g_variant_builder_add_value(&gvb, tuple); - } - *data = g_variant_builder_end(&gvb); + *data = std_gvar_tuple_array(ARRAY_AND_SIZE(vdivs)); break; default: return SR_ERR_NA; @@ -954,9 +862,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct sr_dev_driver *di = sdi->driver; struct drv_context *drvc = di->context; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; if (configure_channels(sdi) != SR_OK) {