X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsigrok-internal.h;h=7bde2b1e10558cfa885a5af05b13087156fa882a;hb=57837aeda5d0e738717a1f397f0934d8e1e307f1;hp=112ee4600d8cc61b1cdc49cf947d55e51766a3d2;hpb=7bc3cfe6ffefb8d4768a247df6a0c4dccc21ee53;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 112ee460..7bde2b1e 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -956,7 +956,7 @@ SR_PRIV int std_opts_config_list(uint32_t key, GVariant **data, std_opts_config_list(key, data, sdi, cg, ARRAY_AND_SIZE(scanopts), \ ARRAY_AND_SIZE(drvopts), ARRAY_AND_SIZE(devopts)) -SR_PRIV GVariant *std_gvar_tuple_array(const uint64_t (*a)[][2], unsigned int n); +SR_PRIV GVariant *std_gvar_tuple_array(const uint64_t a[][2], unsigned int n); SR_PRIV GVariant *std_gvar_tuple_rational(const struct sr_rational *r, unsigned int n); SR_PRIV GVariant *std_gvar_samplerates(const uint64_t samplerates[], unsigned int n); SR_PRIV GVariant *std_gvar_samplerates_steps(const uint64_t samplerates[], unsigned int n); @@ -964,6 +964,27 @@ SR_PRIV GVariant *std_gvar_min_max_step(double min, double max, double step); SR_PRIV GVariant *std_gvar_min_max_step_array(const double a[3]); SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double dmin, const double dmax, const double dstep); +SR_PRIV GVariant *std_gvar_tuple_u64(uint64_t low, uint64_t high); +SR_PRIV GVariant *std_gvar_tuple_double(double low, double high); + +SR_PRIV GVariant *std_gvar_array_i32(const int32_t *a, unsigned int n); +SR_PRIV GVariant *std_gvar_array_u32(const uint32_t *a, unsigned int n); +SR_PRIV GVariant *std_gvar_array_u64(const uint64_t *a, unsigned int n); + +SR_PRIV GVariant *std_gvar_thresholds(const double a[][2], unsigned int n); + +SR_PRIV int std_str_idx(GVariant *data, const char *a[], unsigned int n); +SR_PRIV int std_u64_idx(GVariant *data, const uint64_t a[], unsigned int n); +SR_PRIV int std_u8_idx(GVariant *data, const uint8_t a[], unsigned int n); + +SR_PRIV int std_str_idx_s(const char *s, const char *a[], unsigned int n); +SR_PRIV int std_u8_idx_s(uint8_t b, const uint8_t a[], unsigned int n); + +SR_PRIV int std_u64_tuple_idx(GVariant *data, const uint64_t a[][2], unsigned int n); +SR_PRIV int std_double_tuple_idx(GVariant *data, const double a[][2], unsigned int n); +SR_PRIV int std_double_tuple_idx_d0(const double d, const double a[][2], unsigned int n); + +SR_PRIV int std_cg_idx(const struct sr_channel_group *cg, struct sr_channel_group *a[], unsigned int n); /*--- resource.c ------------------------------------------------------------*/