From: Bert Vermeulen <redacted>
Date: Fri, 25 Jan 2013 10:04:27 +0000 (+0100)
Subject: Deprecate SR_DI_COUPLING.
X-Git-Tag: dsupstream~315
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2a7b113d1382aef08d63778042589177c9b04347;p=libsigrok.git

Deprecate SR_DI_COUPLING.

This is replaced by SR_CONF_COUPLING.
---

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index bf3fefab..920a3c56 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -444,9 +444,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_DI_VDIVS:
 		*data = vdivs;
 		break;
-	case SR_DI_COUPLING:
-		*data = coupling;
-		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_BUFFERSIZE:
 		*data = buffersizes;
 		break;
+	case SR_CONF_COUPLING:
+		*data = coupling;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 25d68563..33aaecd2 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -341,9 +341,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_DI_VDIVS:
 		*data = vdivs;
 		break;
-	case SR_DI_COUPLING:
-		*data = coupling;
-		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
 	(void)sdi;
 
 	switch (key) {
+	case SR_CONF_COUPLING:
+		*data = coupling;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
diff --git a/libsigrok.h b/libsigrok.h
index 04776ee8..1346d76c 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -561,8 +561,6 @@ enum {
 	SR_DI_FILTERS,
 	/** Valid volts/div values. */
 	SR_DI_VDIVS,
-	/** Coupling options. */
-	SR_DI_COUPLING,
 };
 
 /*