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

sr: s/sr_dev_probe_name/sr_dev_probe_name_set/.

This commit is contained in:
Uwe Hermann 2012-02-29 19:17:36 +01:00
parent 7b8ca864a0
commit 2f8cf27409
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device.c
View File

@ -238,8 +238,6 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
* If the probe already has a different name assigned to it, it will be * If the probe already has a different name assigned to it, it will be
* removed, and the new name will be saved instead. * removed, and the new name will be saved instead.
* *
* TODO: Rename to sr_dev_probe_name_set().
*
* @param dev TODO * @param dev TODO
* @param probenum The number of the probe whose name to set. * @param probenum The number of the probe whose name to set.
* Note that the probe numbers start at 1 (not 0!). * Note that the probe numbers start at 1 (not 0!).
@ -249,8 +247,8 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
* upon other errors. * upon other errors.
* If something other than SR_OK is returned, 'dev' is unchanged. * If something other than SR_OK is returned, 'dev' is unchanged.
*/ */
SR_API int sr_dev_probe_name(struct sr_dev *dev, int probenum, SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
const char *name) const char *name)
{ {
struct sr_probe *p; struct sr_probe *p;

2
session_file.c
View File

@ -139,7 +139,7 @@ SR_API int sr_session_load(const char *filename)
continue; continue;
enabled_probes++; enabled_probes++;
tmp_u64 = strtoul(keys[j]+5, NULL, 10); tmp_u64 = strtoul(keys[j]+5, NULL, 10);
sr_dev_probe_name(dev, tmp_u64, val); sr_dev_probe_name_set(dev, tmp_u64, val);
} else if (!strncmp(keys[j], "trigger", 7)) { } else if (!strncmp(keys[j], "trigger", 7)) {
probenum = strtoul(keys[j]+7, NULL, 10); probenum = strtoul(keys[j]+7, NULL, 10);
sr_dev_trigger_set(dev, probenum, val); sr_dev_trigger_set(dev, probenum, val);

6
sigrok-proto.h
View File

@ -28,7 +28,7 @@ SR_API int sr_exit(void);
/*--- log.c -----------------------------------------------------------------*/ /*--- log.c -----------------------------------------------------------------*/
typedef int (*sr_log_handler_t)(void *data, int loglevel, const char *format, typedef int (*sr_log_handler_t)(void *data, int loglevel, const char *format,
va_list args); va_list args);
SR_API int sr_log_loglevel_set(int loglevel); SR_API int sr_log_loglevel_set(int loglevel);
SR_API int sr_log_loglevel_get(void); SR_API int sr_log_loglevel_get(void);
@ -54,8 +54,8 @@ SR_API struct sr_dev *sr_dev_new(const struct sr_dev_driver *driver,
SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name); SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name);
SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev, SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
int probenum); int probenum);
SR_API int sr_dev_probe_name(struct sr_dev *dev, int probenum, SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
const char *name); const char *name);
SR_API int sr_dev_trigger_clear(struct sr_dev *dev); SR_API int sr_dev_trigger_clear(struct sr_dev *dev);
SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum, SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
const char *trigger); const char *trigger);