X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsiglent-sds%2Fprotocol.c;fp=src%2Fhardware%2Fsiglent-sds%2Fprotocol.c;h=69c07db5c9e2151907a5043e59af8cdccf05d5c1;hb=4c5f70063ad6ae311809ee7818ddc9070fbe05cf;hp=af2f2d9b0b9a1c00f028e7b33013da4fbabf56d7;hpb=7f7702b81bd9051a87fde54983561675329d5dc8;p=libsigrok.git

diff --git a/src/hardware/siglent-sds/protocol.c b/src/hardware/siglent-sds/protocol.c
index af2f2d9b..69c07db5 100644
--- a/src/hardware/siglent-sds/protocol.c
+++ b/src/hardware/siglent-sds/protocol.c
@@ -539,8 +539,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 				return TRUE;
 			if (len == -1) {
 				sr_err("Read error, aborting capture.");
-				packet.type = SR_DF_FRAME_END;
-				sr_session_send(sdi, &packet);
+				std_session_send_df_frame_end(sdi);
 				sdi->driver->dev_acquisition_stop(sdi);
 				return TRUE;
 			}
@@ -549,8 +548,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 
 			if (len == -1) {
 				sr_err("Read error, aborting capture.");
-				packet.type = SR_DF_FRAME_END;
-				sr_session_send(sdi, &packet);
+				std_session_send_df_frame_end(sdi);
 				sdi->driver->dev_acquisition_stop(sdi);
 				return TRUE;
 			}
@@ -567,8 +565,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 					len = sr_scpi_read_data(scpi, (char *)devc->buffer, devc->num_samples-devc->num_block_bytes);
 					if (len == -1) {
 						sr_err("Read error, aborting capture.");
-						packet.type = SR_DF_FRAME_END;
-						sr_session_send(sdi, &packet);
+						std_session_send_df_frame_end(sdi);
 						sdi->driver->dev_acquisition_stop(sdi);
 						return TRUE;
 					}
@@ -615,8 +612,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 					read_complete = TRUE;
 					if (!sr_scpi_read_complete(scpi)) {
 						sr_err("Read should have been completed.");
-						packet.type = SR_DF_FRAME_END;
-						sr_session_send(sdi, &packet);
+						std_session_send_df_frame_end(sdi);
 						sdi->driver->dev_acquisition_stop(sdi);
 						return TRUE;
 					}
@@ -633,8 +629,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 				siglent_sds_channel_start(sdi);
 			} else {
 				/* Done with this frame. */
-				packet.type = SR_DF_FRAME_END;
-				sr_session_send(sdi, &packet);
+				std_session_send_df_frame_end(sdi);
 				if (++devc->num_frames == devc->limit_frames) {
 					/* Last frame, stop capture. */
 					sdi->driver->dev_acquisition_stop(sdi);
@@ -644,8 +639,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 					siglent_sds_capture_start(sdi);
 
 					/* Start of next frame. */
-					packet.type = SR_DF_FRAME_BEGIN;
-					sr_session_send(sdi, &packet);
+					std_session_send_df_frame_begin(sdi);
 				}
 			}
 		}
@@ -658,8 +652,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 		packet.type = SR_DF_LOGIC;
 		packet.payload = &logic;
 		sr_session_send(sdi, &packet);
-		packet.type = SR_DF_FRAME_END;
-		sr_session_send(sdi, &packet);
+		std_session_send_df_frame_end(sdi);
 		sdi->driver->dev_acquisition_stop(sdi);
 
 		if (++devc->num_frames == devc->limit_frames) {
@@ -671,14 +664,12 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data)
 			siglent_sds_capture_start(sdi);
 
 			/* Start of next frame. */
-			packet.type = SR_DF_FRAME_BEGIN;
-			sr_session_send(sdi, &packet);
+			std_session_send_df_frame_begin(sdi);
 		}
 	}
 
 	// sr_session_send(sdi, &packet);
-	// packet.type = SR_DF_FRAME_END;
-	// sr_session_send(sdi, &packet);
+	// std_session_send_df_frame_end(sdi);
 	// sdi->driver->dev_acquisition_stop(sdi);
 
 	return TRUE;