From: Bert Vermeulen Date: Mon, 13 Feb 2012 13:00:47 +0000 (+0100) Subject: sr: rename all sr_device_* functions to sr_dev_* X-Git-Tag: libsigrok-0.1.0~129 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=031685005b022b98b5b1604cc6226c0cc2b959f8 sr: rename all sr_device_* functions to sr_dev_* --- diff --git a/device.c b/device.c index e3543d53..491317a5 100644 --- a/device.c +++ b/device.c @@ -50,14 +50,14 @@ static GSList *devices = NULL; * caller should not assume or rely on any specific order. * * 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: Option to only scan for specific devices or device classes. * * @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; 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. * * 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? * * @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) - sr_device_scan(); + sr_dev_scan(); return devices; } @@ -106,7 +106,7 @@ SR_API GSList *sr_device_list(void) * 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 - * 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. * @@ -119,7 +119,7 @@ SR_API GSList *sr_device_list(void) * * @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) { 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 '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: 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. * 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; 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 * 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) { GSList *l; @@ -251,7 +251,7 @@ SR_API struct sr_probe *sr_device_probe_find(const struct sr_device *device, * upon other errors. * 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) { 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; } - p = sr_device_probe_find(device, probenum); + p = sr_dev_probe_find(device, probenum); if (!p) { sr_err("dev: %s: probe %d not found", __func__, probenum); 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. * 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; 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++) { - p = sr_device_probe_find(device, pnum); + p = sr_dev_probe_find(device, pnum); /* TODO: Silently ignore probes which cannot be found? */ if (p) { g_free(p->trigger); @@ -330,7 +330,7 @@ SR_API int sr_device_trigger_clear(struct sr_device *device) * upon other errors. * 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) { 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'. */ - p = sr_device_probe_find(device, probenum); + p = sr_dev_probe_find(device, probenum); if (!p) { sr_err("dev: %s: probe %d not found", __func__, probenum); 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 * 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; @@ -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 * 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) { if ((device == NULL) || (device->plugin == NULL)) diff --git a/hwplugin.c b/hwplugin.c index dfee3814..a12501f0 100644 --- a/hwplugin.c +++ b/hwplugin.c @@ -145,9 +145,9 @@ SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin) continue; } - device = sr_device_new(plugin, i); + device = sr_dev_new(plugin, i); 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++; } diff --git a/input/binary.c b/input/binary.c index f00a14b8..4ea77b23 100644 --- a/input/binary.c +++ b/input/binary.c @@ -51,12 +51,12 @@ static int init(struct sr_input *in) } /* 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++) { snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); /* TODO: Check return value. */ - sr_device_probe_add(in->vdevice, name); + sr_dev_probe_add(in->vdevice, name); } return SR_OK; diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c index e1b6ad10..10653073 100644 --- a/input/chronovu_la8.c +++ b/input/chronovu_la8.c @@ -91,12 +91,12 @@ static int init(struct sr_input *in) } /* 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++) { snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); /* TODO: Check return value. */ - sr_device_probe_add(in->vdevice, name); + sr_dev_probe_add(in->vdevice, name); } return SR_OK; diff --git a/output/analog.c b/output/analog.c index c59399a2..a0b81119 100644 --- a/output/analog.c +++ b/output/analog.c @@ -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); 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); if (!(samplerate_s = sr_samplerate_string(samplerate))) { diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c index 993d29fc..830f4269 100644 --- a/output/chronovu_la8.c +++ b/output/chronovu_la8.c @@ -122,7 +122,7 @@ static int init(struct sr_output *o) 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); /* TODO: Error checks. */ diff --git a/output/csv.c b/output/csv.c index 2f91226b..c1b0ee92 100644 --- a/output/csv.c +++ b/output/csv.c @@ -91,7 +91,7 @@ static int init(struct sr_output *o) 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); /* TODO: Error checks. */ diff --git a/output/gnuplot.c b/output/gnuplot.c index cfb5d7ec..1107d226 100644 --- a/output/gnuplot.c +++ b/output/gnuplot.c @@ -100,7 +100,7 @@ static int init(struct sr_output *o) num_probes = g_slist_length(o->device->probes); 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( o->device->plugin_index, SR_DI_CUR_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); 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); if (!(frequency_s = sr_samplerate_string(samplerate))) { diff --git a/output/ols.c b/output/ols.c index dff54a42..7c98a8a9 100644 --- a/output/ols.c +++ b/output/ols.c @@ -60,7 +60,7 @@ static int init(struct sr_output *o) } 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); else diff --git a/output/text/text.c b/output/text/text.c index 10ce0767..4267c5b0 100644 --- a/output/text/text.c +++ b/output/text/text.c @@ -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); 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); if (!(samplerate_s = sr_samplerate_string(samplerate))) { diff --git a/output/vcd.c b/output/vcd.c index c5a6bb20..1d333c6c 100644 --- a/output/vcd.c +++ b/output/vcd.c @@ -84,7 +84,7 @@ static int init(struct sr_output *o) g_string_append_printf(ctx->header, "$version %s %s $end\n", 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( o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) { diff --git a/session_driver.c b/session_driver.c index 7ca8d353..117d6a25 100644 --- a/session_driver.c +++ b/session_driver.c @@ -214,7 +214,7 @@ static int hw_get_status(int device_index) /* Avoid compiler warnings. */ (void)device_index; - if (sr_device_list() != NULL) + if (sr_dev_list() != NULL) return SR_OK; else return SR_ERR; diff --git a/session_file.c b/session_file.c index cb99bf27..e7784222 100644 --- a/session_file.c +++ b/session_file.c @@ -114,7 +114,7 @@ SR_API int sr_session_load(const char *filename) for (j = 0; keys[j]; j++) { val = g_key_file_get_string(kf, sections[i], keys[j], NULL); if (!strcmp(keys[j], "capturefile")) { - device = sr_device_new(&session_driver, devcnt); + device = sr_dev_new(&session_driver, devcnt); if (devcnt == 0) /* first device, init the plugin */ 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); for (p = 0; p < total_probes; 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)) { if (!device) continue; enabled_probes++; 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)) { probenum = strtoul(keys[j]+7, NULL, 10); - sr_device_trigger_set(device, probenum, val); + sr_dev_trigger_set(device, probenum, val); } } g_strfreev(keys); @@ -225,7 +225,7 @@ int sr_session_save(const char *filename) fprintf(meta, "capturefile = logic-%d\n", devcnt); fprintf(meta, "unitsize = %d\n", ds->ds_unitsize); 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( device->plugin_index, SR_DI_CUR_SAMPLERATE)); s = sr_samplerate_string(samplerate); diff --git a/sigrok-proto.h b/sigrok-proto.h index 0efdaeec..daf92c48 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -47,20 +47,20 @@ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data, /*--- device.c --------------------------------------------------------------*/ -SR_API int sr_device_scan(void); -SR_API GSList *sr_device_list(void); -SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin, +SR_API int sr_dev_scan(void); +SR_API GSList *sr_dev_list(void); +SR_API struct sr_device *sr_dev_new(const struct sr_device_plugin *plugin, int plugin_index); -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 int sr_dev_probe_add(struct sr_device *device, const char *name); +SR_API struct sr_probe *sr_dev_probe_find(const struct sr_device *device, 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); -SR_API int sr_device_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_clear(struct sr_device *device); +SR_API int sr_dev_trigger_set(struct sr_device *device, int probenum, const char *trigger); -SR_API gboolean sr_device_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 gboolean sr_dev_has_hwcap(const struct sr_device *device, int hwcap); +SR_API int sr_dev_get_info(const struct sr_device *device, int id, const void **data); /*--- filter.c --------------------------------------------------------------*/