* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/hex"
struct context {
unsigned int num_enabled_channels;
- int samples_per_line;
+ int spl;
int bit_cnt;
int spl_cnt;
int trigger;
struct context *ctx;
struct sr_channel *ch;
GSList *l;
- GHashTableIter iter;
- gpointer key, value;
unsigned int i, j;
- uint32_t spl;
if (!o || !o->sdi)
return SR_ERR_ARG;
- spl = DEFAULT_SAMPLES_PER_LINE;
- if (options) {
- g_hash_table_iter_init(&iter, options);
- while (g_hash_table_iter_next(&iter, &key, &value)) {
- if (!strcmp(key, "width")) {
- if (!g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) {
- sr_err("Invalid type for 'width' option.");
- return SR_ERR_ARG;
- }
- if (!(spl = g_variant_get_uint32(value))) {
- sr_err("Invalid width.");
- return SR_ERR_ARG;
- }
- } else {
- sr_err("Unknown option '%s'.", key);
- return SR_ERR_ARG;
- }
- }
- }
-
ctx = g_malloc0(sizeof(struct context));
- o->internal = ctx;
+ o->priv = ctx;
ctx->trigger = -1;
- ctx->samples_per_line = spl;
+ ctx->spl = g_variant_get_uint32(g_hash_table_lookup(options, "width"));
for (l = o->sdi->channels; l; l = l->next) {
ch = l->data;
int num_channels;
char *samplerate_s;
- ctx = o->internal;
+ ctx = o->priv;
if (ctx->samplerate == 0) {
if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
&gvar) == SR_OK) {
}
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);
*out = NULL;
if (!o || !o->sdi)
return SR_ERR_ARG;
- if (!(ctx = o->internal))
+ if (!(ctx = o->priv))
return SR_ERR_ARG;
switch (packet->type) {
ctx->sample_buf[j] = 0;
}
- if (ctx->spl_cnt == ctx->samples_per_line) {
+ if (ctx->spl_cnt == ctx->spl) {
/* Flush line buffers. */
g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
g_string_append_c(*out, '\n');
g_string_printf(ctx->lines[j], "%s:", ctx->channel_names[j]);
}
}
- if (ctx->spl_cnt == ctx->samples_per_line)
+ if (ctx->spl_cnt == ctx->spl)
/* Line buffers were already flushed. */
ctx->spl_cnt = 0;
}
if (!o)
return SR_ERR_ARG;
- if (!(ctx = o->internal))
+ if (!(ctx = o->priv))
return SR_OK;
g_free(ctx->channel_index);
g_string_free(ctx->lines[i], TRUE);
g_free(ctx->lines);
g_free(ctx);
- o->internal = NULL;
+ o->priv = NULL;
return SR_OK;
}
static struct sr_option options[] = {
{ "width", "Width", "Number of samples per line", NULL, NULL },
- { 0 }
+ ALL_ZERO
};
-static struct sr_option *get_options(gboolean cached)
+static const struct sr_option *get_options(void)
{
- if (cached)
- return options;
-
- options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
- g_variant_ref_sink(options[0].def);
+ if (!options[0].def) {
+ options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
+ g_variant_ref_sink(options[0].def);
+ }
return options;
}
.id = "hex",
.name = "Hexadecimal",
.desc = "Hexadecimal digits",
+ .exts = (const char*[]){"txt", NULL},
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,
.cleanup = cleanup,
};
-