X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=3c18ffaf19c7d184d57b90f4e57198652a3cb6cd;hb=3591481e871eec154a764e1c78004095144de5b5;hp=a045b57eada2d24da9d403439213567d7391e3eb;hpb=e318f01b2f17d60fc4b25feb7d23e948cb5ffb8f;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index a045b57e..3c18ffaf 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -868,7 +868,7 @@ SR_PRIV int sr_resource_open(struct sr_context *ctx, G_GNUC_WARN_UNUSED_RESULT; SR_PRIV int sr_resource_close(struct sr_context *ctx, struct sr_resource *res); -SR_PRIV ssize_t sr_resource_read(struct sr_context *ctx, +SR_PRIV gssize sr_resource_read(struct sr_context *ctx, const struct sr_resource *res, void *buf, size_t count) G_GNUC_WARN_UNUSED_RESULT; SR_PRIV void *sr_resource_load(struct sr_context *ctx, int type, @@ -1196,13 +1196,13 @@ struct vc870_info { gboolean is_voltage, is_dc, is_ac, is_temperature, is_resistance; gboolean is_continuity, is_capacitance, is_diode, is_loop_current; gboolean is_current, is_micro, is_milli, is_power; - gboolean is_power_factor_freq, is_power_apparent_power, is_v_a_eff_value; + gboolean is_power_factor_freq, is_power_apparent_power, is_v_a_rms_value; gboolean is_sign2, is_sign1, is_batt, is_ol1, is_max, is_min; gboolean is_maxmin, is_rel, is_ol2, is_open, is_manu, is_hold; gboolean is_light, is_usb, is_warning, is_auto_power, is_misplug_warn; gboolean is_lo, is_hi, is_open2; - gboolean is_frequency, is_dual_display, is_auto, is_rms; + gboolean is_frequency, is_dual_display, is_auto; }; SR_PRIV gboolean sr_vc870_packet_valid(const uint8_t *buf);