X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=deff5a7b2a9b703203ccf011256647d68e25f8ea;hb=adcb9951f8a52852e65f99d45083a3e6b9a1981a;hp=ab2210104fbe72ac6c82100253516fbcd266b65f;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git diff --git a/src/hwdriver.c b/src/hwdriver.c index ab221010..deff5a7b 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -61,6 +61,7 @@ static struct sr_key_info sr_key_info_config[] = { {SR_CONF_LCRMETER, SR_T_STRING, NULL, "LCR meter", NULL}, {SR_CONF_ELECTRONIC_LOAD, SR_T_STRING, NULL, "Electronic load", NULL}, {SR_CONF_SCALE, SR_T_STRING, NULL, "Scale", NULL}, + {SR_CONF_SIGNAL_GENERATOR, SR_T_STRING, NULL, "Signal generator", NULL}, /* Driver scan options */ {SR_CONF_CONN, SR_T_STRING, "conn", @@ -247,6 +248,7 @@ static struct sr_key_info sr_key_info_mq[] = { {SR_MQ_POWER_FACTOR, 0, "power_factor", "Power factor", NULL}, {SR_MQ_APPARENT_POWER, 0, "apparent_power", "Apparent power", NULL}, {SR_MQ_MASS, 0, "mass", "Mass", NULL}, + {SR_MQ_HARMONIC_RATIO, 0, "harmonic_ratio", "Harmonic ratio", NULL}, ALL_ZERO }; @@ -285,6 +287,7 @@ static struct sr_key_info sr_key_info_mqflag[] = { }; /* This must handle all the keys from enum sr_datatype (libsigrok.h). */ +/** @private */ SR_PRIV const GVariantType *sr_variant_type_get(int datatype) { switch (datatype) { @@ -312,6 +315,7 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype) } } +/** @private */ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value) { const struct sr_key_info *info; @@ -390,7 +394,6 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver) return SR_ERR_ARG; } - sr_spew("Initializing driver '%s'.", driver->name); if ((ret = driver->init(driver, ctx)) < 0) sr_err("Failed to initialize the driver: %d.", ret);