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

sr: rm unused sr_device_clear() and sr_device_probe_clear()

This commit is contained in:
Bert Vermeulen 2012-02-12 22:36:19 +01:00
parent 040ae8be94
commit 6cfa474a80
2 changed files with 0 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
device.c
View File

@ -138,83 +138,6 @@ SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
return device; return device;
} }
/**
* Clear all probes of the specified device.
*
* This removes/clears the 'name' and 'trigger' fields of all probes of
* the device.
*
* The order in which the probes are cleared is not specified. The caller
* should not assume or rely on a specific order.
*
* TODO: Rename to sr_device_clear_probes() or sr_device_probe_clear_all().
*
* @param device The device whose probes to clear. Must not be NULL.
* Note: device->probes is allowed to be NULL (in that case,
* there are no probes, thus none have to be cleared).
*
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
* If something other than SR_OK is returned, 'device' is unchanged.
*/
SR_API int sr_device_clear(struct sr_device *device)
{
unsigned int pnum;
if (!device) {
sr_err("dev: %s: device was NULL", __func__);
return SR_ERR_ARG;
}
/* Note: device->probes can be NULL, this is handled correctly. */
for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++)
sr_device_probe_clear(device, pnum);
return SR_OK;
}
/**
* Clear the specified probe in the specified device.
*
* The probe itself still exists afterwards, but its 'name' and 'trigger'
* fields are g_free()'d and set to NULL.
*
* @param device The device in which the specified (to be cleared) probe
* resides. Must not be NULL.
* @param probenum The number of the probe to clear.
* Note that the probe numbers start at 1 (not 0!).
*
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
* upon other errors.
* If something other than SR_OK is returned, 'device' is unchanged.
*/
SR_API int sr_device_probe_clear(struct sr_device *device, int probenum)
{
struct sr_probe *p;
if (!device) {
sr_err("dev: %s: device was NULL", __func__);
return SR_ERR_ARG;
}
/* TODO: Sanity check on 'probenum'. */
if (!(p = sr_device_probe_find(device, probenum))) {
sr_err("dev: %s: probe %d not found", __func__, probenum);
return SR_ERR; /* TODO: More specific error? */
}
/* If the probe has a name, remove it. */
g_free(p->name);
p->name = NULL;
/* If the probe has a trigger, remove it. */
g_free(p->trigger);
p->trigger = NULL;
return SR_OK;
}
/** /**
* Add a probe with the specified name to the specified device. * Add a probe with the specified name to the specified device.
* *

2
sigrok-proto.h
View File

@ -51,8 +51,6 @@ SR_API int sr_device_scan(void);
SR_API GSList *sr_device_list(void); SR_API GSList *sr_device_list(void);
SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin, SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
int plugin_index); int plugin_index);
SR_API int sr_device_clear(struct sr_device *device);
SR_API int sr_device_probe_clear(struct sr_device *device, int probenum);
SR_API int sr_device_probe_add(struct sr_device *device, const char *name); SR_API int sr_device_probe_add(struct sr_device *device, const char *name);
SR_API struct sr_probe *sr_device_probe_find(const struct sr_device *device, SR_API struct sr_probe *sr_device_probe_find(const struct sr_device *device,
int probenum); int probenum);