From: Bert Vermeulen <redacted>
Date: Fri, 25 Jan 2013 10:25:32 +0000 (+0100)
Subject: Deprecate SR_DI_TRIGGER_SOURCES.
X-Git-Tag: dsupstream~311
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=328bafabd4781e416e3d711dabd8c4c43f219794;p=libsigrok.git

Deprecate SR_DI_TRIGGER_SOURCES.

This is replaced by SR_CONF_TRIGGER_SOURCE.
---

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 474b96ed..1e0a4a17 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -432,9 +432,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_TRIGGER_SOURCES:
-		*data = trigger_sources;
-		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_TIMEBASE:
 		*data = timebases;
 		break;
+	case SR_CONF_TRIGGER_SOURCE:
+		*data = trigger_sources;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 7a591292..83323114 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -332,9 +332,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_TRIGGER_SOURCES:
-		*data = trigger_sources;
-		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_TIMEBASE:
 		*data = timebases;
 		break;
+	case SR_CONF_TRIGGER_SOURCE:
+		*data = trigger_sources;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
diff --git a/libsigrok.h b/libsigrok.h
index 88faae25..9b40230a 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -553,8 +553,6 @@ enum {
 	SR_DI_HWCAPS,
 	/** Types of logic trigger supported, out of "01crf" (char *). */
 	SR_DI_TRIGGER_TYPES,
-	/** Supported trigger sources. */
-	SR_DI_TRIGGER_SOURCES,
 };
 
 /*