BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove obsolete API call sr_dev_trigger_set(). 

Triggers are now set on the session, not on a channel.
This commit is contained in:
Bert Vermeulen 2014-05-28 00:01:54 +02:00
parent 795c9de35e
commit 3b0ff21c8c
3 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
device.c
View File

@ -157,62 +157,6 @@ SR_API int sr_dev_channel_enable(const struct sr_dev_inst *sdi, int channelnum,
return ret; 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 * Determine whether the specified device instance has the specified
* capability. * capability.

2
libsigrok.h
View File

@ -979,7 +979,7 @@ struct sr_dev_driver {
const struct sr_dev_inst *sdi, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg); const struct sr_channel_group *cg);
/** Channel status change. /** 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, int (*config_channel_set) (const struct sr_dev_inst *sdi,
struct sr_channel *ch, unsigned int changes); struct sr_channel *ch, unsigned int changes);
/** Apply configuration settings to the device hardware. /** Apply configuration settings to the device hardware.

2
proto.h
View File

@ -49,8 +49,6 @@ SR_API int sr_dev_channel_name_set(const struct sr_dev_inst *sdi,
int channelnum, const char *name); int channelnum, const char *name);
SR_API int sr_dev_channel_enable(const struct sr_dev_inst *sdi, int channelnum, SR_API int sr_dev_channel_enable(const struct sr_dev_inst *sdi, int channelnum,
gboolean state); 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 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 GSList *sr_dev_list(const struct sr_dev_driver *driver);
SR_API int sr_dev_clear(const struct sr_dev_driver *driver); SR_API int sr_dev_clear(const struct sr_dev_driver *driver);