X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=22788e0eb6f14a8722e44c1eeda95ca4ae14fc2e;hb=95c1fe62f77d347bf173b1236c38a9043efabd2b;hp=8d624edd5cdf8bf8e7a84e0f9a854993f401f1e4;hpb=6e43c3d5318a8ff320bf6539a9efe7f0b8497e2f;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 8d624edd..22788e0e 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_with_callback(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,17 +470,16 @@ 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; + int tmp_int, ch_idx; unsigned int i; const char *tmp_str; - ret = SR_OK; devc = sdi->priv; if (!cg) { switch (key) { @@ -509,7 +497,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd 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; @@ -522,7 +510,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } } if (i == NUM_BUFFER_SIZES) - ret = SR_ERR_ARG; + return SR_ERR_ARG; break; case SR_CONF_TIMEBASE: g_variant_get(data, "(tt)", &p, &q); @@ -536,7 +524,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd if (tmp_int >= 0) devc->timebase = tmp_int; else - ret = SR_ERR_ARG; + return SR_ERR_ARG; break; case SR_CONF_TRIGGER_SOURCE: tmp_str = g_variant_get_string(data, NULL); @@ -547,11 +535,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } } if (trigger_sources[i] == 0) - ret = SR_ERR_ARG; + return SR_ERR_ARG; break; default: - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } } else { if (sdi->channel_groups->data == cg) @@ -576,7 +563,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd if (tmp_int >= 0) { devc->voltage[ch_idx] = tmp_int; } else - ret = SR_ERR_ARG; + return SR_ERR_ARG; break; case SR_CONF_COUPLING: tmp_str = g_variant_get_string(data, NULL); @@ -587,68 +574,40 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } } if (coupling[i] == 0) - ret = SR_ERR_ARG; + return SR_ERR_ARG; 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; @@ -656,21 +615,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;