From 03dbc020cde2f0d9857ffcfc273eed5f504a4860 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 8 Feb 2011 21:50:27 +0100 Subject: [PATCH] Rename probe_find() to sr_device_probe_find(). --- device.c | 10 +++++----- sigrok-proto.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device.c b/device.c index dd3a4000..2dee902c 100644 --- a/device.c +++ b/device.c @@ -131,7 +131,7 @@ void sr_device_probe_clear(struct sr_device *device, int probenum) { struct sr_probe *p; - p = probe_find(device, probenum); + p = sr_device_probe_find(device, probenum); if (!p) return; @@ -166,7 +166,7 @@ void sr_device_probe_add(struct sr_device *device, char *name) device->probes = g_slist_append(device->probes, p); } -struct sr_probe *probe_find(struct sr_device *device, int probenum) +struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum) { GSList *l; struct sr_probe *p, *found_probe; @@ -188,7 +188,7 @@ void sr_device_probe_name(struct sr_device *device, int probenum, char *name) { struct sr_probe *p; - p = probe_find(device, probenum); + p = sr_device_probe_find(device, probenum); if (!p) return; @@ -207,7 +207,7 @@ void sr_device_trigger_clear(struct sr_device *device) return; for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) { - p = probe_find(device, pnum); + p = sr_device_probe_find(device, pnum); if (p && p->trigger) { g_free(p->trigger); p->trigger = NULL; @@ -220,7 +220,7 @@ void sr_device_trigger_set(struct sr_device *device, int probenum, char *trigger { struct sr_probe *p; - p = probe_find(device, probenum); + p = sr_device_probe_find(device, probenum); if (!p) return; diff --git a/sigrok-proto.h b/sigrok-proto.h index e41dd9f4..d6904eb8 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -45,7 +45,7 @@ void sr_device_destroy(struct sr_device *dev); void sr_device_probe_clear(struct sr_device *device, int probenum); void sr_device_probe_add(struct sr_device *device, char *name); -struct sr_probe *probe_find(struct sr_device *device, int probenum); +struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum); void sr_device_probe_name(struct sr_device *device, int probenum, char *name); void sr_device_trigger_clear(struct sr_device *device);