X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=output%2Foutput_analog.c;h=663b8df3ae9c77581c40a1522868c36fe57b602b;hb=548b08e55cf05aeb8f57b26b29035c3fb153f0f5;hp=0f60dd35795912fc2a775eae30d0546ef27d84b7;hpb=9688b443f65c7779a07b0e3ef2b9f9721ff742cd;p=libsigrok.git

diff --git a/output/output_analog.c b/output/output_analog.c
index 0f60dd35..663b8df3 100644
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -274,7 +274,7 @@ static int data_bits(struct sr_output *o, const char *data_in,
 			}
 		}
 	} else {
-		g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+		sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
 	}
 
 	*data_out = outbuf;
@@ -428,7 +428,7 @@ static int data_ascii(struct sr_output *o, const char *data_in,
 			ctx->prevsample = sample;
 		}
 	} else {
-		g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+		sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
 	}
 
 	*data_out = outbuf;
@@ -439,29 +439,29 @@ static int data_ascii(struct sr_output *o, const char *data_in,
 #endif
 
 struct sr_output_format output_analog_bits = {
-	"analog_bits",
-	"Bits (takes argument, default 64)",
-	SR_DF_ANALOG,
-	init_bits,
-	data_bits,
-	event,
+	.id = "analog_bits",
+	.description = "Bits (takes argument, default 64)",
+	.df_type = SR_DF_ANALOG,
+	.init = init_bits,
+	.data = data_bits,
+	.event = event,
 };
 #if 0
 struct sr_output_format output_analog_hex = {
-	"analog_hex",
-	"Hexadecimal (takes argument, default 192)",
-	SR_DF_ANALOG,
-	init_hex,
-	data_hex,
-	event,
+	.id = "analog_hex",
+	.description = "Hexadecimal (takes argument, default 192)",
+	.df_type = SR_DF_ANALOG,
+	.init = init_hex,
+	.data = data_hex,
+	.event = event,
 };
 
 struct sr_output_format output_analog_ascii = {
-	"analog_ascii",
-	"ASCII (takes argument, default 74)",
-	SR_DF_ANALOG,
-	init_ascii,
-	data_ascii,
-	event,
+	.id = "analog_ascii",
+	.description = "ASCII (takes argument, default 74)",
+	.df_type = SR_DF_ANALOG,
+	.init = init_ascii,
+	.data = data_ascii,
+	.event = event,
 };
 #endif