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

sr: rename all sr_device_* functions to sr_dev_*

This commit is contained in:
Bert Vermeulen 2012-02-13 14:00:47 +01:00
parent a1645fcd81
commit 031685005b
14 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
device.c
View File

@ -50,14 +50,14 @@ static GSList *devices = NULL;
* caller should not assume or rely on any specific order. * caller should not assume or rely on any specific order.
* *
* After the system has been scanned for devices, the list of detected (and * After the system has been scanned for devices, the list of detected (and
* supported) devices can be acquired via sr_device_list(). * supported) devices can be acquired via sr_dev_list().
* *
* TODO: Error checks? * TODO: Error checks?
* TODO: Option to only scan for specific devices or device classes. * TODO: Option to only scan for specific devices or device classes.
* *
* @return SR_OK upon success, SR_ERR upon errors. * @return SR_OK upon success, SR_ERR upon errors.
*/ */
SR_API int sr_device_scan(void) SR_API int sr_dev_scan(void)
{ {
GSList *plugins, *l; GSList *plugins, *l;
struct sr_device_plugin *plugin; struct sr_device_plugin *plugin;
@ -85,16 +85,16 @@ SR_API int sr_device_scan(void)
* Return the list of logic analyzer devices libsigrok has detected. * Return the list of logic analyzer devices libsigrok has detected.
* *
* If the libsigrok-internal device list is empty, a scan for attached * If the libsigrok-internal device list is empty, a scan for attached
* devices -- via a call to sr_device_scan() -- is performed first. * devices -- via a call to sr_dev_scan() -- is performed first.
* *
* TODO: Error handling? * TODO: Error handling?
* *
* @return The list (GSList) of detected devices, or NULL if none were found. * @return The list (GSList) of detected devices, or NULL if none were found.
*/ */
SR_API GSList *sr_device_list(void) SR_API GSList *sr_dev_list(void)
{ {
if (!devices) if (!devices)
sr_device_scan(); sr_dev_scan();
return devices; return devices;
} }
@ -106,7 +106,7 @@ SR_API GSList *sr_device_list(void)
* additionally a pointer to the newly created device is also returned. * additionally a pointer to the newly created device is also returned.
* *
* The device has no probes attached to it yet after this call. You can * The device has no probes attached to it yet after this call. You can
* use sr_device_probe_add() to add one or more probes. * use sr_dev_probe_add() to add one or more probes.
* *
* TODO: Should return int, so that we can return SR_OK, SR_ERR_* etc. * TODO: Should return int, so that we can return SR_OK, SR_ERR_* etc.
* *
@ -119,7 +119,7 @@ SR_API GSList *sr_device_list(void)
* *
* @return Pointer to the newly allocated device, or NULL upon errors. * @return Pointer to the newly allocated device, or NULL upon errors.
*/ */
SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin, SR_API struct sr_device *sr_dev_new(const struct sr_device_plugin *plugin,
int plugin_index) int plugin_index)
{ {
struct sr_device *device; struct sr_device *device;
@ -144,7 +144,7 @@ SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
* The added probe is automatically enabled (the 'enabled' field is TRUE). * The added probe is automatically enabled (the 'enabled' field is TRUE).
* *
* The 'trigger' field of the added probe is set to NULL. A trigger can be * The 'trigger' field of the added probe is set to NULL. A trigger can be
* added via sr_device_trigger_set(). * added via sr_dev_trigger_set().
* *
* TODO: Are duplicate names allowed? * TODO: Are duplicate names allowed?
* TODO: Do we enforce a maximum probe number for a device? * TODO: Do we enforce a maximum probe number for a device?
@ -160,7 +160,7 @@ SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
* or SR_ERR_ARG upon invalid arguments. * or SR_ERR_ARG upon invalid arguments.
* If something other than SR_OK is returned, 'device' is unchanged. * If something other than SR_OK is returned, 'device' is unchanged.
*/ */
SR_API int sr_device_probe_add(struct sr_device *device, const char *name) SR_API int sr_dev_probe_add(struct sr_device *device, const char *name)
{ {
struct sr_probe *p; struct sr_probe *p;
int probenum; int probenum;
@ -208,7 +208,7 @@ SR_API int sr_device_probe_add(struct sr_device *device, const char *name)
* @return A pointer to the requested probe's 'struct sr_probe', or NULL * @return A pointer to the requested probe's 'struct sr_probe', or NULL
* if the probe could not be found. * if the probe could not be found.
*/ */
SR_API struct sr_probe *sr_device_probe_find(const struct sr_device *device, SR_API struct sr_probe *sr_dev_probe_find(const struct sr_device *device,
int probenum) int probenum)
{ {
GSList *l; GSList *l;
@ -251,7 +251,7 @@ SR_API struct sr_probe *sr_device_probe_find(const struct sr_device *device,
* upon other errors. * upon other errors.
* If something other than SR_OK is returned, 'device' is unchanged. * If something other than SR_OK is returned, 'device' is unchanged.
*/ */
SR_API int sr_device_probe_name(struct sr_device *device, int probenum, SR_API int sr_dev_probe_name(struct sr_device *device, int probenum,
const char *name) const char *name)
{ {
struct sr_probe *p; struct sr_probe *p;
@ -261,7 +261,7 @@ SR_API int sr_device_probe_name(struct sr_device *device, int probenum,
return SR_ERR_ARG; return SR_ERR_ARG;
} }
p = sr_device_probe_find(device, probenum); p = sr_dev_probe_find(device, probenum);
if (!p) { if (!p) {
sr_err("dev: %s: probe %d not found", __func__, probenum); sr_err("dev: %s: probe %d not found", __func__, probenum);
return SR_ERR; /* TODO: More specific error? */ return SR_ERR; /* TODO: More specific error? */
@ -287,7 +287,7 @@ SR_API int sr_device_probe_name(struct sr_device *device, int probenum,
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments. * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
* If something other than SR_OK is returned, 'device' is unchanged. * If something other than SR_OK is returned, 'device' is unchanged.
*/ */
SR_API int sr_device_trigger_clear(struct sr_device *device) SR_API int sr_dev_trigger_clear(struct sr_device *device)
{ {
struct sr_probe *p; struct sr_probe *p;
unsigned int pnum; /* TODO: uint16_t? */ unsigned int pnum; /* TODO: uint16_t? */
@ -303,7 +303,7 @@ SR_API int sr_device_trigger_clear(struct sr_device *device)
} }
for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) { for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) {
p = sr_device_probe_find(device, pnum); p = sr_dev_probe_find(device, pnum);
/* TODO: Silently ignore probes which cannot be found? */ /* TODO: Silently ignore probes which cannot be found? */
if (p) { if (p) {
g_free(p->trigger); g_free(p->trigger);
@ -330,7 +330,7 @@ SR_API int sr_device_trigger_clear(struct sr_device *device)
* upon other errors. * upon other errors.
* If something other than SR_OK is returned, 'device' is unchanged. * If something other than SR_OK is returned, 'device' is unchanged.
*/ */
SR_API int sr_device_trigger_set(struct sr_device *device, int probenum, SR_API int sr_dev_trigger_set(struct sr_device *device, int probenum,
const char *trigger) const char *trigger)
{ {
struct sr_probe *p; struct sr_probe *p;
@ -344,7 +344,7 @@ SR_API int sr_device_trigger_set(struct sr_device *device, int probenum,
/* TODO: Sanity check on 'trigger'. */ /* TODO: Sanity check on 'trigger'. */
p = sr_device_probe_find(device, probenum); p = sr_dev_probe_find(device, probenum);
if (!p) { if (!p) {
sr_err("dev: %s: probe %d not found", __func__, probenum); sr_err("dev: %s: probe %d not found", __func__, probenum);
return SR_ERR; /* TODO: More specific error? */ return SR_ERR; /* TODO: More specific error? */
@ -372,7 +372,7 @@ SR_API int sr_device_trigger_set(struct sr_device *device, int probenum,
* FALSE is also returned upon invalid input parameters or other * FALSE is also returned upon invalid input parameters or other
* error conditions. * error conditions.
*/ */
SR_API gboolean sr_device_has_hwcap(const struct sr_device *device, int hwcap) SR_API gboolean sr_dev_has_hwcap(const struct sr_device *device, int hwcap)
{ {
int *capabilities, i; int *capabilities, i;
@ -416,7 +416,7 @@ SR_API gboolean sr_device_has_hwcap(const struct sr_device *device, int hwcap)
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
* upon other errors. * upon other errors.
*/ */
int sr_device_get_info(const struct sr_device *device, int id, int sr_dev_get_info(const struct sr_device *device, int id,
const void **data) const void **data)
{ {
if ((device == NULL) || (device->plugin == NULL)) if ((device == NULL) || (device->plugin == NULL))

4
hwplugin.c
View File

@ -145,9 +145,9 @@ SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin)
continue; continue;
} }
device = sr_device_new(plugin, i); device = sr_dev_new(plugin, i);
for (j = 0; j < num_probes; j++) for (j = 0; j < num_probes; j++)
sr_device_probe_add(device, probe_names[j]); sr_dev_probe_add(device, probe_names[j]);
num_initialized_devices++; num_initialized_devices++;
} }

4
input/binary.c
View File

@ -51,12 +51,12 @@ static int init(struct sr_input *in)
} }
/* Create a virtual device. */ /* Create a virtual device. */
in->vdevice = sr_device_new(NULL, 0); in->vdevice = sr_dev_new(NULL, 0);
for (i = 0; i < num_probes; i++) { for (i = 0; i < num_probes; i++) {
snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
/* TODO: Check return value. */ /* TODO: Check return value. */
sr_device_probe_add(in->vdevice, name); sr_dev_probe_add(in->vdevice, name);
} }
return SR_OK; return SR_OK;

4
input/chronovu_la8.c
View File

@ -91,12 +91,12 @@ static int init(struct sr_input *in)
} }
/* Create a virtual device. */ /* Create a virtual device. */
in->vdevice = sr_device_new(NULL, 0); in->vdevice = sr_dev_new(NULL, 0);
for (i = 0; i < num_probes; i++) { for (i = 0; i < num_probes; i++) {
snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
/* TODO: Check return value. */ /* TODO: Check return value. */
sr_device_probe_add(in->vdevice, name); sr_dev_probe_add(in->vdevice, name);
} }
return SR_OK; return SR_OK;

2
output/analog.c
View File

@ -135,7 +135,7 @@ static int init(struct sr_output *o, int default_spl, enum outputmode mode)
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING); snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (o->device->plugin && sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
if (!(samplerate_s = sr_samplerate_string(samplerate))) { if (!(samplerate_s = sr_samplerate_string(samplerate))) {

2
output/chronovu_la8.c
View File

@ -122,7 +122,7 @@ static int init(struct sr_output *o)
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
/* TODO: Error checks. */ /* TODO: Error checks. */

2
output/csv.c
View File

@ -91,7 +91,7 @@ static int init(struct sr_output *o)
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
/* TODO: Error checks. */ /* TODO: Error checks. */

4
output/gnuplot.c
View File

@ -100,7 +100,7 @@ static int init(struct sr_output *o)
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
comment[0] = '\0'; comment[0] = '\0';
if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
if (!(frequency_s = sr_samplerate_string(samplerate))) { if (!(frequency_s = sr_samplerate_string(samplerate))) {
@ -324,7 +324,7 @@ static int analog_init(struct sr_output *o)
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
comment[0] = '\0'; comment[0] = '\0';
if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (o->device->plugin && sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
if (!(frequency_s = sr_samplerate_string(samplerate))) { if (!(frequency_s = sr_samplerate_string(samplerate))) {

2
output/ols.c
View File

@ -60,7 +60,7 @@ static int init(struct sr_output *o)
} }
ctx->unitsize = (num_enabled_probes + 7) / 8; ctx->unitsize = (num_enabled_probes + 7) / 8;
if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) if (o->device->plugin && sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE))
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
else else

2
output/text/text.c
View File

@ -110,7 +110,7 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING); snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
if (o->device->plugin || sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (o->device->plugin || sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
if (!(samplerate_s = sr_samplerate_string(samplerate))) { if (!(samplerate_s = sr_samplerate_string(samplerate))) {

2
output/vcd.c
View File

@ -84,7 +84,7 @@ static int init(struct sr_output *o)
g_string_append_printf(ctx->header, "$version %s %s $end\n", g_string_append_printf(ctx->header, "$version %s %s $end\n",
PACKAGE, PACKAGE_VERSION); PACKAGE, PACKAGE_VERSION);
if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { if (o->device->plugin && sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
ctx->samplerate = *((uint64_t *) o->device->plugin->get_device_info( ctx->samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) { if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {

2
session_driver.c
View File

@ -214,7 +214,7 @@ static int hw_get_status(int device_index)
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
(void)device_index; (void)device_index;
if (sr_device_list() != NULL) if (sr_dev_list() != NULL)
return SR_OK; return SR_OK;
else else
return SR_ERR; return SR_ERR;

10
session_file.c
View File

@ -114,7 +114,7 @@ SR_API int sr_session_load(const char *filename)
for (j = 0; keys[j]; j++) { for (j = 0; keys[j]; j++) {
val = g_key_file_get_string(kf, sections[i], keys[j], NULL); val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
if (!strcmp(keys[j], "capturefile")) { if (!strcmp(keys[j], "capturefile")) {
device = sr_device_new(&session_driver, devcnt); device = sr_dev_new(&session_driver, devcnt);
if (devcnt == 0) if (devcnt == 0)
/* first device, init the plugin */ /* first device, init the plugin */
device->plugin->init((char *)filename); device->plugin->init((char *)filename);
@ -132,17 +132,17 @@ SR_API int sr_session_load(const char *filename)
device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
for (p = 0; p < total_probes; p++) { for (p = 0; p < total_probes; p++) {
snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
sr_device_probe_add(device, probename); sr_dev_probe_add(device, probename);
} }
} else if (!strncmp(keys[j], "probe", 5)) { } else if (!strncmp(keys[j], "probe", 5)) {
if (!device) if (!device)
continue; continue;
enabled_probes++; enabled_probes++;
tmp_u64 = strtoul(keys[j]+5, NULL, 10); tmp_u64 = strtoul(keys[j]+5, NULL, 10);
sr_device_probe_name(device, tmp_u64, val); sr_dev_probe_name(device, 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_device_trigger_set(device, probenum, val); sr_dev_trigger_set(device, probenum, val);
} }
} }
g_strfreev(keys); g_strfreev(keys);
@ -225,7 +225,7 @@ int sr_session_save(const char *filename)
fprintf(meta, "capturefile = logic-%d\n", devcnt); fprintf(meta, "capturefile = logic-%d\n", devcnt);
fprintf(meta, "unitsize = %d\n", ds->ds_unitsize); fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
fprintf(meta, "total probes = %d\n", g_slist_length(device->probes)); fprintf(meta, "total probes = %d\n", g_slist_length(device->probes));
if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) { if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
samplerate = *((uint64_t *) device->plugin->get_device_info( samplerate = *((uint64_t *) device->plugin->get_device_info(
device->plugin_index, SR_DI_CUR_SAMPLERATE)); device->plugin_index, SR_DI_CUR_SAMPLERATE));
s = sr_samplerate_string(samplerate); s = sr_samplerate_string(samplerate);

20
sigrok-proto.h
View File

@ -47,20 +47,20 @@ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data,
/*--- device.c --------------------------------------------------------------*/ /*--- device.c --------------------------------------------------------------*/
SR_API int sr_device_scan(void); SR_API int sr_dev_scan(void);
SR_API GSList *sr_device_list(void); SR_API GSList *sr_dev_list(void);
SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin, SR_API struct sr_device *sr_dev_new(const struct sr_device_plugin *plugin,
int plugin_index); int plugin_index);
SR_API int sr_device_probe_add(struct sr_device *device, const char *name); SR_API int sr_dev_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_dev_probe_find(const struct sr_device *device,
int probenum); int probenum);
SR_API int sr_device_probe_name(struct sr_device *device, int probenum, SR_API int sr_dev_probe_name(struct sr_device *device, int probenum,
const char *name); const char *name);
SR_API int sr_device_trigger_clear(struct sr_device *device); SR_API int sr_dev_trigger_clear(struct sr_device *device);
SR_API int sr_device_trigger_set(struct sr_device *device, int probenum, SR_API int sr_dev_trigger_set(struct sr_device *device, int probenum,
const char *trigger); const char *trigger);
SR_API gboolean sr_device_has_hwcap(const struct sr_device *device, int hwcap); SR_API gboolean sr_dev_has_hwcap(const struct sr_device *device, int hwcap);
SR_API int sr_device_get_info(const struct sr_device *device, int id, SR_API int sr_dev_get_info(const struct sr_device *device, int id,
const void **data); const void **data);
/*--- filter.c --------------------------------------------------------------*/ /*--- filter.c --------------------------------------------------------------*/