From: Bert Vermeulen <redacted>
Date: Fri, 25 Jan 2013 10:13:49 +0000 (+0100)
Subject: Deprecate SR_DI_VDIVS.
X-Git-Tag: dsupstream~314
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=e4f2b2adc17bf0ab6dfa38b7511caf5a5dcfa7fd

Deprecate SR_DI_VDIVS.

This is replaced by SR_CONF_VDIV.
---

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 920a3c56..f797b709 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -441,9 +441,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_DI_FILTERS:
 		*data = filter_targets;
 		break;
-	case SR_DI_VDIVS:
-		*data = vdivs;
-		break;
 	/* TODO remove this */
 	case SR_CONF_SAMPLERATE:
 		*data = &tmp;
@@ -586,6 +583,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 	case SR_CONF_COUPLING:
 		*data = coupling;
 		break;
+	case SR_CONF_VDIV:
+		*data = vdivs;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 33aaecd2..5d6e3dc7 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -338,9 +338,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_DI_TRIGGER_SOURCES:
 		*data = trigger_sources;
 		break;
-	case SR_DI_VDIVS:
-		*data = vdivs;
-		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -445,6 +442,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 	case SR_CONF_COUPLING:
 		*data = coupling;
 		break;
+	case SR_CONF_VDIV:
+		*data = vdivs;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
diff --git a/libsigrok.h b/libsigrok.h
index 1346d76c..9add374b 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -559,8 +559,6 @@ enum {
 	SR_DI_TRIGGER_SOURCES,
 	/** Supported filter targets. */
 	SR_DI_FILTERS,
-	/** Valid volts/div values. */
-	SR_DI_VDIVS,
 };
 
 /*