From: Bert Vermeulen <redacted>
Date: Tue, 27 May 2014 22:01:54 +0000 (+0200)
Subject: Remove obsolete API call sr_dev_trigger_set().
X-Git-Tag: libsigrok-0.4.0~1309
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=3b0ff21c8cac7e8db5ed1c00d36d12c8fd41c7ec

Remove obsolete API call sr_dev_trigger_set().

Triggers are now set on the session, not on a channel.
---

diff --git a/device.c b/device.c
index 889f02df..9b6412d2 100644
--- a/device.c
+++ b/device.c
@@ -157,62 +157,6 @@ SR_API int sr_dev_channel_enable(const struct sr_dev_inst *sdi, int channelnum,
 	return ret;
 }
 
-/**
- * Add a trigger to the specified device (and the specified channel).
- *
- * If the specified channel of this device already has a trigger, it will
- * be silently replaced.
- *
- * @param[in,out] sdi Pointer to the device instance; must not be NULL.
- * @param[in] channelnum Number of channel, starting at 0.
- * @param[in] trigger Trigger string, in the format used by sigrok-cli
- *
- * @return SR_OK on success or SR_ERR on failure.  In case of invalid
- *         arguments, SR_ERR_ARG is returned and the trigger settings
- *         remain unchanged.
- *
- * @since 0.2.0
- */
-SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int channelnum,
-		const char *trigger)
-{
-	GSList *l;
-	struct sr_channel *ch;
-	char *old_trigger;
-	int ret;
-
-	if (!sdi)
-		return SR_ERR_ARG;
-
-	ret = SR_ERR_ARG;
-	for (l = sdi->channels; l; l = l->next) {
-		ch = l->data;
-		if (ch->index == channelnum) {
-			old_trigger = ch->trigger;
-			ret = SR_OK;
-			if (g_strcmp0(trigger, old_trigger) == 0)
-				break;
-			/* Set new trigger if it has changed. */
-			ch->trigger = g_strdup(trigger);
-
-			if (sdi->driver && sdi->driver->config_channel_set) {
-				ret = sdi->driver->config_channel_set(
-					sdi, ch, SR_CHANNEL_SET_TRIGGER);
-				/* Roll back change if it wasn't applicable. */
-				if (ret == SR_ERR_ARG) {
-					g_free(ch->trigger);
-					ch->trigger = old_trigger;
-					break;
-				}
-			}
-			g_free(old_trigger);
-			break;
-		}
-	}
-
-	return ret;
-}
-
 /**
  * Determine whether the specified device instance has the specified
  * capability.
diff --git a/libsigrok.h b/libsigrok.h
index 3408f433..dd776c35 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -979,7 +979,7 @@ struct sr_dev_driver {
 			const struct sr_dev_inst *sdi,
 			const struct sr_channel_group *cg);
 	/** Channel status change.
-	 *  @see sr_dev_channel_enable(), sr_dev_trigger_set(). */
+	 *  @see sr_dev_channel_enable(). */
 	int (*config_channel_set) (const struct sr_dev_inst *sdi,
 			struct sr_channel *ch, unsigned int changes);
 	/** Apply configuration settings to the device hardware.
diff --git a/proto.h b/proto.h
index 2a2b9a6a..0e9af5a5 100644
--- a/proto.h
+++ b/proto.h
@@ -49,8 +49,6 @@ SR_API int sr_dev_channel_name_set(const struct sr_dev_inst *sdi,
 		int channelnum, const char *name);
 SR_API int sr_dev_channel_enable(const struct sr_dev_inst *sdi, int channelnum,
 		gboolean state);
-SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int channelnum,
-		const char *trigger);
 SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
 SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver);
 SR_API int sr_dev_clear(const struct sr_dev_driver *driver);