From: lelazary <redacted>
Date: Mon, 7 Jan 2013 15:49:31 +0000 (-0800)
Subject: Added limit samples Eveything seems to work find up to 1024 samples
X-Git-Tag: dsupstream~366
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=eb913174ab1fa7decaab3dd64eec0a0a42a2391a;p=libsigrok.git

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

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 3534ef60..0e865ed1 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -240,7 +240,6 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-  printf("dev close\n");
 	struct dev_context *devc;
 
 	devc = sdi->priv;
@@ -340,14 +339,26 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		ret = SR_OK;
 		break;
 	case SR_HWCAP_LIMIT_SAMPLES:
-		ret = SR_OK;
+    {
+      const uint64_t num_samples = *(const uint64_t *)value;
+      if (num_samples < 1024)
+      {
+        sr_err("minimum of 1024 samples required");
+        ret = SR_ERR_ARG;
+
+      } else {
+        devc->limit_samples = num_samples;
+        sr_dbg("setting limit_samples to %i\n", num_samples);
+        ret = SR_OK;
+      }
+    }
 		break;
   case SR_HWCAP_CAPTURE_RATIO:
     ret = SR_OK;
 		break;
   case SR_HWCAP_TRIGGER_SLOPE:
     {
-      uint64_t slope = *(const uint64_t *)value;
+      const uint64_t slope = *(const uint64_t *)value;
       if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE)
       {
         sr_err("Invalid trigger slope");
@@ -360,13 +371,12 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
     break;
   case SR_HWCAP_HORIZ_TRIGGERPOS:
     {
-      float pos = *(const float *)value;
+      const float pos = *(const float *)value;
       if (pos < 0 || pos > 255) {
         sr_err("Trigger position (%f) should be between 0 and 255.", pos);
         ret = SR_ERR_ARG;
       } else {
         int trigger_pos = (int)pos;
-        printf("Set trigger posion to %X\n", trigger_pos&0xff);
         devc->trigger_holdoff[0] = trigger_pos&0xff;
         ret = SR_OK;
       }
@@ -393,7 +403,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	int ret = SR_ERR;
   
   
-  printf("Accquistion start\n");
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -413,24 +422,20 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	devc->ctlbase1 &= 0x7f;
 //	devc->ctlbase1 |= devc->acdcmode;
 
-  printf("Configure rate\n");
 	ret = mso_configure_rate(sdi, devc->cur_rate);
 	if (ret != SR_OK)
 		return ret;
 
 	/* set dac offset */
-  printf("Configure dac\n");
 	ret = mso_dac_out(sdi, devc->dac_offset);
 	if (ret != SR_OK)
 		return ret;
 
-  printf("Configure threshold level\n");
 	ret = mso_configure_threshold_level(sdi);
 	if (ret != SR_OK)
 		return ret;
 
 
-  printf("Configure trigger\n");
 	ret = mso_configure_trigger(sdi);
 	if (ret != SR_OK)
 		return ret;
@@ -442,16 +447,13 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
     return ret;
 
 	/* Start acquisition on the device. */
-  printf("Check trigger\n");
 	mso_check_trigger(devc->serial, &devc->trigger_state);
 	ret = mso_check_trigger(devc->serial, NULL);
 	if (ret != SR_OK)
 		return ret;
 
-  printf("Source add\n");
   sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
 
-  printf("Create packet\n");
 	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
 		sr_err("Datafeed packet malloc failed.");
 		return SR_ERR_MALLOC;
@@ -463,6 +465,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		return SR_ERR_MALLOC;
 	}
 
+
 	packet->type = SR_DF_HEADER;
 	packet->payload = (unsigned char *)header;
 	header->feed_version = 1;
diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index b4dcfbf9..a3f4cb19 100644
--- 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;
 }
 
diff --git a/hardware/link-mso19/protocol.h b/hardware/link-mso19/protocol.h
index 474fba14..77312393 100644
--- a/hardware/link-mso19/protocol.h
+++ b/hardware/link-mso19/protocol.h
@@ -100,6 +100,8 @@ struct dev_context {
 	double vbit;
 	uint16_t dac_offset;
 	uint16_t offset_range;
+  uint64_t limit_samples;
+  uint64_t num_samples;
 	/* register cache */
 	uint8_t ctlbase1;
 	uint8_t ctlbase2;