device: Add Doxygen comments, improve error handling.

[libsigrok.git] / output / output_analog.c

diff --git a/output/output_analog.c b/output/output_analog.c
index e45100ca491aad4d66c99f60621ac0bbe529ab91..663b8df3ae9c77581c40a1522868c36fe57b602b 100644 (file)
--- 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,7 +439,7 @@ static int data_ascii(struct sr_output *o, const char *data_in,
 #endif
 
 struct sr_output_format output_analog_bits = {
-       .extension = "analog_bits",
+       .id = "analog_bits",
        .description = "Bits (takes argument, default 64)",
        .df_type = SR_DF_ANALOG,
        .init = init_bits,
@@ -448,7 +448,7 @@ struct sr_output_format output_analog_bits = {
 };
 #if 0
 struct sr_output_format output_analog_hex = {
-       .extension = "analog_hex",
+       .id = "analog_hex",
        .description = "Hexadecimal (takes argument, default 192)",
        .df_type = SR_DF_ANALOG,
        .init = init_hex,
@@ -457,7 +457,7 @@ struct sr_output_format output_analog_hex = {
 };
 
 struct sr_output_format output_analog_ascii = {
-       .extension = "analog_ascii",
+       .id = "analog_ascii",
        .description = "ASCII (takes argument, default 74)",
        .df_type = SR_DF_ANALOG,
        .init = init_ascii,