X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=ed8e163e4984f7ec3b626cd29e38867f369c5ad5;hb=7c16e74d45b91123206efee2116d86462c8e707c;hp=77cf8b1074755f0888417d221a3e7e5dc10ee35c;hpb=a24da9a81358644265465325d12579cd8aa34ba5;p=libsigrok.git

diff --git a/src/output/analog.c b/src/output/analog.c
index 77cf8b10..ed8e163e 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/analog"
@@ -47,7 +47,7 @@ static int init(struct sr_output *o, GHashTable *options)
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
-	o->priv = ctx = g_try_malloc0(sizeof(struct context));
+	o->priv = ctx = g_malloc0(sizeof(struct context));
 	s = g_variant_get_string(g_hash_table_lookup(options, "digits"), NULL);
 	if (!strcmp(s, "all"))
 		ctx->digits = DIGITS_ALL;
@@ -173,7 +173,7 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 			g_string_append(out, " %oA");
 		break;
 	case SR_UNIT_CONCENTRATION:
-		g_string_append_printf(out, "%f ppm", value * 1000000);
+		g_string_append_printf(out, "%f ppm", value * (1000 * 1000));
 		break;
 	case SR_UNIT_REVOLUTIONS_PER_MINUTE:
 		si_printf(value, out, "RPM");
@@ -344,6 +344,8 @@ SR_PRIV struct sr_output_module output_analog = {
 	.id = "analog",
 	.name = "Analog",
 	.desc = "Analog data and types",
+	.exts = NULL,
+	.flags = 0,
 	.options = get_options,
 	.init = init,
 	.receive = receive,