Added limit samples Eveything seems to work find up to 1024 samples

[libsigrok.git] / hardware / link-mso19 / protocol.c

diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index b4dcfbf97cd0fde58fb15bb7f0046a4308004e1b..a3f4cb19d63dbb2e1408afc5a9e4dd72fcb41a0d 100644 (file)
--- a/hardware/link-mso19/protocol.c
+++ b/hardware/link-mso19/protocol.c
@@ -387,9 +387,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
    * to read the data */
   if (devc->trigger_state != MSO_TRIGGER_DATAREADY) {
     devc->trigger_state = in[0];
-    //printf("Got %c for trigger \n", in[0]);
     if (devc->trigger_state == MSO_TRIGGER_DATAREADY) {
-      //printf("Trigger is ready %c\n", MSO_TRIGGER_DATAREADY);
       mso_read_buffer(sdi);
       devc->buffer_n = 0;
     } else {
@@ -406,7 +404,6 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
        if (devc->buffer_n < 3072)
                return TRUE;
 
-  printf("Got samples, write out the data\n");
        /* do the conversion */
        uint8_t logic_out[1024];
        double analog_out[1024];
@@ -423,9 +420,10 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
        logic.length = 1024;
        logic.unitsize = 1;
        logic.data = logic_out;
-  printf("Send Data\n");
        sr_session_send(cb_data, &packet);
 
+  devc->num_samples += 1024;
+
        // Dont bother fixing this yet, keep it "old style"
        /*
        packet.type = SR_DF_ANALOG;
@@ -435,16 +433,11 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
        sr_session_send(ctx->session_dev_id, &packet);
        */
 
-  //printf("Send END\n");
-       //packet.type = SR_DF_END;
-       //sr_session_send(devc->session_dev_id, &packet);
-
- // serial_flush(devc->serial);
- // abort_acquisition(sdi);
- // serial_close(devc->serial);
+  if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { 
+    sr_info("Requested number of samples reached."); 
+    sdi->driver->dev_acquisition_stop(sdi, cb_data); 
+  } 
 
-  return FALSE;
-  printf("REturn \n");
   return TRUE;
 }