X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fprotocol.c;h=8721ec2b0c4761e4abf675de1e0a722821575057;hb=3ff6cfeebe15f0122499c6524e102d8462bc5752;hp=5c263adb89317f3f2fee066c4df3c89ccdef779b;hpb=f53ff6436923b99260a6cbac241fa054ec78d503;p=libsigrok.git

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index 5c263adb..8721ec2b 100644
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -48,8 +48,8 @@ SR_PRIV int mso_send_control_message(struct sr_serial_dev_inst *serial,
 	p += sizeof(mso_head);
 
 	for (i = 0; i < n; i++) {
-		*(uint16_t *) p = g_htons(payload[i]);
-		p += 2;
+		WB16(p, payload[i]);
+		p += sizeof(uint16_t);
 	}
 	memcpy(p, mso_foot, sizeof(mso_foot));
 
@@ -100,7 +100,7 @@ SR_PRIV int mso_configure_trigger(const struct sr_dev_inst *sdi)
 		trigger_config |= 0x20;	//DSO level trigger & width < trigger_width
 		break;
 	case 2:
-		trigger_config |= 0x40;	//DSO level trigger & width >= trigger_width 
+		trigger_config |= 0x40;	//DSO level trigger & width >= trigger_width
 		break;
 	case 3:
 		trigger_config |= 0x60;	//LA combination trigger
@@ -289,7 +289,7 @@ SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 	serial_source_remove(sdi->session, devc->serial);
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 }
 
 SR_PRIV int mso_clkrate_out(struct sr_serial_dev_inst *serial, uint16_t val)
@@ -405,7 +405,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
 
 	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
 		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 	}
 
 	return TRUE;