X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=e6668ae637e804c2f42667e30d2b21ef7ed5097a;hb=16aca7661b7ab34a399c323bb9214721e2b1be0c;hp=3c8cc3b39f72c309c56cccaef94b04b06632285c;hpb=fe5a735553470fe372ff1c12eb55398bd0f098b8;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 3c8cc3b3..e6668ae6 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -35,6 +35,7 @@ static const uint32_t devopts[] = {
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET,
 };
 
@@ -85,7 +86,6 @@ static GSList *scan(GSList *options)
 	struct sr_config *src;
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
-	struct sr_channel *ch;
 	int i, maxch;
 
 	devices = NULL;
@@ -135,11 +135,9 @@ static GSList *scan(GSList *options)
 	sr_info("BeagleLogic device found at "BEAGLELOGIC_DEV_NODE);
 
 	/* Fill the channels */
-	for (i = 0; i < maxch; i++) {
-		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+	for (i = 0; i < maxch; i++)
+		sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
 				beaglelogic_channel_names[i]);
-		sdi->channels = g_slist_append(sdi->channels, ch);
-	}
 
 	sdi->priv = devc;
 	drvc->instances = g_slist_append(drvc->instances, sdi);
@@ -242,6 +240,10 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		*data = g_variant_new_uint64(devc->cur_samplerate);
 		break;
 
+	case SR_CONF_CAPTURE_RATIO:
+		*data = g_variant_new_uint64(devc->capture_ratio);
+		break;
+
 	case SR_CONF_NUM_LOGIC_CHANNELS:
 		*data = g_variant_new_uint32(g_slist_length(sdi->channels));
 		break;
@@ -286,6 +288,14 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		}
 		return beaglelogic_set_triggerflags(devc);
 
+	case SR_CONF_CAPTURE_RATIO:
+		devc->capture_ratio = g_variant_get_uint64(data);
+		if (devc->capture_ratio > 100) {
+			devc->capture_ratio = 0;
+			return SR_ERR;
+		}
+		return SR_OK;
+
 	default:
 		return SR_ERR_NA;
 	}
@@ -361,7 +371,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	/* Configure triggers & send header packet */
 	if ((trigger = sr_session_trigger_get(sdi->session))) {
-		devc->stl = soft_trigger_logic_new(sdi, trigger, 0);
+		int pre_trigger_samples = 0;
+		if (devc->limit_samples > 0)
+			pre_trigger_samples = devc->capture_ratio * devc->limit_samples/100;
+		devc->stl = soft_trigger_logic_new(sdi, trigger, pre_trigger_samples);
+		if (devc->stl == NULL)
+			return SR_ERR_MALLOC;
 		devc->trigger_fired = FALSE;
 	} else
 		devc->trigger_fired = TRUE;