X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fhex.c;h=8fcfcea456357c149fa80967356ef772b611383e;hb=0f523f2b45e84114add85cec5a97aed3f85f95e6;hp=1d4196381d3a706440eb1b52c468c6c20d6e4703;hpb=dcc55fe91aadf4396ce4a3b5db2898da39e1a6be;p=libsigrok.git
diff --git a/src/output/hex.c b/src/output/hex.c
index 1d419638..8fcfcea4 100644
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -17,10 +17,11 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/hex"
@@ -106,7 +107,7 @@ static GString *gen_header(const struct sr_output *o)
}
header = g_string_sized_new(512);
- g_string_printf(header, "%s\n", PACKAGE_STRING);
+ g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);
@@ -179,7 +180,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
/* Flush line buffers. */
g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
g_string_append_c(*out, '\n');
- if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
+ if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
offset = ctx->trigger + ctx->trigger / 8;
g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
ctx->trigger = -1;
@@ -235,10 +236,10 @@ static int cleanup(struct sr_output *o)
static struct sr_option options[] = {
{ "width", "Width", "Number of samples per line", NULL, NULL },
- { 0 }
+ ALL_ZERO
};
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
{
if (!options[0].def) {
options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
@@ -251,10 +252,11 @@ static struct sr_option *get_options(void)
SR_PRIV struct sr_output_module output_hex = {
.id = "hex",
.name = "Hexadecimal",
- .desc = "Hexadecimal digits",
+ .desc = "Hexadecimal digits logic data",
+ .exts = (const char*[]){"txt", NULL},
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,
.cleanup = cleanup,
};
-