X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=bb066dc2b84cc06bbf3406fd0b631b93f2ffe22e;hb=105df67463b84683a35f3474eccc871e5aa4ed0e;hp=83e7e0400d1da484a3da564778cb4c2b1e8d2345;hpb=db944f1622479a91c257315ad368b63c5b58149c;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index 83e7e040..bb066dc2 100644 --- a/src/hardware/hameg-hmo/api.c +++ b/src/hardware/hameg-hmo/api.c @@ -460,24 +460,18 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); + *data = std_gvar_array_u32(scanopts, ARRAY_SIZE(scanopts)); break; case SR_CONF_DEVICE_OPTIONS: if (cg_type == CG_NONE) { if (model) - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - model->devopts, model->num_devopts, sizeof(uint32_t)); + *data = std_gvar_array_u32((const uint32_t *)model->devopts, model->num_devopts); else - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + *data = std_gvar_array_u32(drvopts, ARRAY_SIZE(drvopts)); } else if (cg_type == CG_ANALOG) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - model->devopts_cg_analog, model->num_devopts_cg_analog, - sizeof(uint32_t)); + *data = std_gvar_array_u32((const uint32_t *)model->devopts_cg_analog, model->num_devopts_cg_analog); } else { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - NULL, 0, sizeof(uint32_t)); + *data = std_gvar_array_u32(NULL, 0); } break; case SR_CONF_COUPLING: