sr: Fix/document probe names.

[libsigrok.git] / output / chronovu_la8.c

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 830f42695552c1ac0d702d84008a114acf91c139..91ad56e6ed315357abaae2496088b2abeef3deec 100644 (file)
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -36,6 +36,7 @@ struct context {
  * Check if the given samplerate is supported by the LA8 hardware.
  *
  * @param samplerate The samplerate (in Hz) to check.
+ *
  * @return 1 if the samplerate is supported/valid, 0 otherwise.
  */
 static int is_valid_samplerate(uint64_t samplerate)
@@ -61,6 +62,7 @@ static int is_valid_samplerate(uint64_t samplerate)
  * Max. value for divcount: 0xfe (2550ns sample period, 392.15kHz samplerate).
  *
  * @param samplerate The samplerate in Hz.
+ *
  * @return The divcount value as needed by the hardware, or 0xff upon errors.
  */
 static uint8_t samplerate_to_divcount(uint64_t samplerate)
@@ -92,13 +94,13 @@ static int init(struct sr_output *o)
                return SR_ERR_ARG;
        }
 
-       if (!o->device) {
-               sr_warn("la8 out: %s: o->device was NULL", __func__);
+       if (!o->dev) {
+               sr_warn("la8 out: %s: o->dev was NULL", __func__);
                return SR_ERR_ARG;
        }
 
-       if (!o->device->plugin) {
-               sr_warn("la8 out: %s: o->device->plugin was NULL", __func__);
+       if (!o->dev->plugin) {
+               sr_warn("la8 out: %s: o->dev->plugin was NULL", __func__);
                return SR_ERR_ARG;
        }
 
@@ -111,7 +113,7 @@ static int init(struct sr_output *o)
 
        /* Get the number of probes, their names, and the unitsize. */
        /* TODO: Error handling. */
-       for (l = o->device->probes; l; l = l->next) {
+       for (l = o->dev->probes; l; l = l->next) {
                probe = l->data;
                if (!probe->enabled)
                        continue;
@@ -120,11 +122,11 @@ static int init(struct sr_output *o)
        ctx->probelist[ctx->num_enabled_probes] = 0;
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-       num_probes = g_slist_length(o->device->probes);
+       num_probes = g_slist_length(o->dev->probes);
 
-       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 (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
+               samplerate = *((uint64_t *) o->dev->plugin->dev_info_get(
+                               o->dev->plugin_index, SR_DI_CUR_SAMPLERATE));
                /* TODO: Error checks. */
        } else {
                samplerate = 0; /* TODO: Error or set some value? */