X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=276ff0ffbcdb4456a2583f52d225c8b477972061;hb=584560f142e1b17b9f4ef9069bd3724f2f77e750;hp=070c6bd0979e111504942d237273dc4f733b0e09;hpb=ac10a927b5141f0f1e163d05a5c43e397c6ce9d2;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 070c6bd0..276ff0ff 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -189,7 +189,7 @@ static int check_channel_group(struct dev_context *devc, return CG_INVALID; } -static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, +static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { int ret, cg_type; @@ -307,7 +307,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n) return g_variant_builder_end(&gvb); } -static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, +static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { int ret, cg_type; @@ -461,7 +461,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, return ret; } -static int config_list(int 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) { int cg_type; @@ -482,14 +482,14 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, break; case SR_CONF_DEVICE_OPTIONS: if (cg_type == CG_NONE) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - model->hw_caps, model->num_hwcaps, sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + model->hw_caps, model->num_hwcaps, sizeof(uint32_t)); } else if (cg_type == CG_ANALOG) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - model->analog_hwcaps, model->num_analog_hwcaps, sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + model->analog_hwcaps, model->num_analog_hwcaps, sizeof(uint32_t)); } else { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - NULL, 0, sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + NULL, 0, sizeof(uint32_t)); } break; case SR_CONF_COUPLING: