X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;fp=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=5bba8d9bb52085930a835365dc6249ab5d6d8d53;hb=105df67463b84683a35f3474eccc871e5aa4ed0e;hp=6364d104cb3c19e31ce95c239afe69b12d7c3a8e;hpb=7bc3cfe6ffefb8d4768a247df6a0c4dccc21ee53;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 6364d104..5bba8d9b 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -488,16 +488,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_DEVICE_OPTIONS: - if (cg_type == CG_ANALOG) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog), sizeof(uint32_t)); - } else if (cg_type == CG_DIGITAL) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg_digital, ARRAY_SIZE(devopts_cg_digital), sizeof(uint32_t)); - } else { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - NULL, 0, sizeof(uint32_t)); - } + if (cg_type == CG_ANALOG) + *data = std_gvar_array_u32(devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog)); + else if (cg_type == CG_DIGITAL) + *data = std_gvar_array_u32(devopts_cg_digital, ARRAY_SIZE(devopts_cg_digital)); + else + *data = std_gvar_array_u32(NULL, 0); break; case SR_CONF_COUPLING: if (cg_type == CG_NONE)