X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fprotocol.c;h=0c28585e774bcf69fd1eb263c6885332ed3d90d6;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=148f0ba18933fd80ec26bd2ee171be379e582097;hpb=98fec29ecbb5093856b69311be8e937c162edded;p=libsigrok.git

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index 148f0ba1..0c28585e 100644
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 /* serial protocol */
@@ -198,7 +199,7 @@ SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val)
 	return mso_send_control_message(devc->serial, ARRAY_AND_SIZE(ops));
 }
 
-SR_PRIV inline uint16_t mso_calc_raw_from_mv(struct dev_context * devc)
+SR_PRIV uint16_t mso_calc_raw_from_mv(struct dev_context *devc)
 {
 	return (uint16_t) (0x200 -
 			   ((devc->dso_trigger_voltage / devc->dso_probe_attn) /
@@ -285,15 +286,12 @@ SR_PRIV int mso_toggle_led(struct sr_dev_inst *sdi, int state)
 
 SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi)
 {
-	struct sr_datafeed_packet packet;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
 	serial_source_remove(sdi->session, devc->serial);
 
-	/* Terminate session */
-	packet.type = SR_DF_END;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 }
 
 SR_PRIV int mso_clkrate_out(struct sr_serial_dev_inst *serial, uint16_t val)
@@ -357,7 +355,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
 	GSList *l;
 	int i;
 
-	struct drv_context *drvc = di->priv;
+	struct drv_context *drvc = di->context;
 
 	/* Find this device's devc struct by its fd. */
 	struct dev_context *devc = NULL;