From: Bert Vermeulen <redacted>
Date: Thu, 9 Jan 2014 11:36:05 +0000 (+0100)
Subject: Add SR_CONF_MAX_UNCOMPRESSED_SAMPLES.
X-Git-Tag: libsigrok-0.3.0~328
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=d86e0b11c7dabcf8fbbb9f692a070f9679f0ea18

Add SR_CONF_MAX_UNCOMPRESSED_SAMPLES.
---

diff --git a/hwdriver.c b/hwdriver.c
index 90661f17..00e111c6 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -100,6 +100,8 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Number of logic probes", NULL},
 	{SR_CONF_NUM_ANALOG_PROBES, SR_T_INT32, "analog_probes",
 		"Number of analog probes", NULL},
+	{SR_CONF_MAX_UNCOMPRESSED_SAMPLES, SR_T_UINT64, "max_uncompressed_samples",
+		"Maximum number of uncompressed samples", NULL},
 	{0, 0, NULL, NULL, NULL},
 };
 
diff --git a/libsigrok.h b/libsigrok.h
index a3011320..239820a1 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -827,7 +827,8 @@ enum {
 	/** Power off the device. */
 	SR_CONF_POWER_OFF,
 
-	/** Data source for acquisition. If not present, acquisition from
+	/**
+	 * Data source for acquisition. If not present, acquisition from
 	 * the device is always "live", i.e. acquisition starts when the
 	 * frontend asks and the results are sent out as soon as possible.
 	 *
@@ -836,9 +837,22 @@ enum {
 	 * there is a choice. sr_config_list() returns those choices.
 	 *
 	 * In any case if a device has live acquisition capabilities, it
-	 * is always the default. */
+	 * is always the default.
+	 */
 	SR_CONF_DATA_SOURCE,
 
+	/**
+	 * On devices without sample compression (or compression turned off),
+	 * this returns the maximum number of samples that can be stored. This
+	 * can change as probes are disabled, depending on the hardware, so
+	 * should be queried after such changes are made. If not applicable,
+	 * fetching this value with sr_config_get() will return SR_ERR_NA.
+	 *
+	 * SR_CONF_LIMIT_SAMPLES should not be set to a higher value than
+	 * this value, if applicable.
+	 */
+	SR_CONF_MAX_UNCOMPRESSED_SAMPLES,
+
 	/*--- Acquisition modes ---------------------------------------------*/
 
 	/**