X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=af08f2ab6172a0a38500898577498965ef82c0db;hb=6525d819eef098a43b1f438ae4af50e67c9c4335;hp=5ada5f99601ea03d01e84418f09de72b98ccc789;hpb=32ba0d80054df01767ec323c621ab1c6bc5f310c;p=libsigrok.git

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 5ada5f99..af08f2ab 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -817,6 +817,8 @@ SR_PRIV int sr_session_source_remove_channel(struct sr_session *session,
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
 SR_PRIV int sr_sessionfile_check(const char *filename);
+SR_PRIV struct sr_dev_inst *sr_session_prepare_sdi(const char *filename,
+		struct sr_session **session);
 SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		struct sr_datafeed_packet **copy);
 SR_PRIV void sr_packet_free(struct sr_datafeed_packet *packet);
@@ -850,11 +852,13 @@ SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
 #ifdef HAVE_LIBSERIALPORT
 SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-		void *cb_data, dev_close_callback dev_close_fn,
+		dev_close_callback dev_close_fn,
 		struct sr_serial_dev_inst *serial, const char *prefix);
 #endif
 SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 		const char *prefix);
+SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi,
+		const char *prefix);
 SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 		std_dev_clear_callback clear_private);
 SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi);
@@ -1196,13 +1200,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);
@@ -1224,10 +1228,8 @@ SR_PRIV int es51919_serial_config_set(uint32_t key, GVariant *data,
 SR_PRIV int es51919_serial_config_list(uint32_t key, GVariant **data,
 				       const struct sr_dev_inst *sdi,
 				       const struct sr_channel_group *cg);
-SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi,
-					     void *cb_data);
-SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi,
-					    void *cb_data);
+SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi);
+SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi);
 
 /*--- hardware/dmm/ut372.c --------------------------------------------------*/