config.h usage cleanups.

[libsigrok.git] / output / float.c

diff --git a/output/float.c b/output/float.c
index 850b5d435444e8df64eea2fd9186b2158d8c1fec..cd4ef8c36f0cddff67af7ce13708de9d662c0a5d 100644 (file)
--- a/output/float.c
+++ b/output/float.c
@@ -20,9 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 struct context {
        unsigned int num_enabled_probes;
@@ -38,10 +37,10 @@ static int init(struct sr_output *o)
        if (!o)
                return SR_ERR_ARG;
 
-       if (!o->dev)
+       if (!o->sdi)
                return SR_ERR_ARG;
 
-       if (!o->dev->driver)
+       if (!o->sdi->driver)
                return SR_ERR_ARG;
 
        if (!(ctx = g_try_malloc0(sizeof(struct context))))
@@ -51,7 +50,7 @@ static int init(struct sr_output *o)
 
        /* Get the number of probes and their names. */
        ctx->probelist = g_ptr_array_new();
-       for (l = o->dev->probes; l; l = l->next) {
+       for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
                if (!probe || !probe->enabled)
                        continue;
@@ -126,7 +125,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
        max = length_in / sizeof(float);
        for (i = 0; i < max;) {
                for (j = 0; j < ctx->num_enabled_probes; j++) {
-                       g_string_append_printf(outstr, "%s: %f\n",
+                       g_string_append_printf(outstr, "%s: %.12f\n",
                                        (char *)g_ptr_array_index(ctx->probelist, j),
                                        fdata[i++]);
                }