#define LOG_PREFIX "input/raw_analog"
/* How many bytes at a time to process and send to the session bus. */
-#define CHUNK_SIZE 4096
-#define DEFAULT_NUM_CHANNELS 1
-#define DEFAULT_SAMPLERATE 0
+#define CHUNK_SIZE (4 * 1024 * 1024)
+#define DEFAULT_NUM_CHANNELS 1
+#define DEFAULT_SAMPLERATE 0
struct context {
gboolean started;
};
struct sample_format {
- const char const* fmt_name;
- // same as struct sr_analog_encoding
- uint8_t unitsize;
- gboolean is_signed;
- gboolean is_float;
- gboolean is_bigendian;
+ const char *fmt_name;
+ struct sr_analog_encoding encoding;
};
-static const struct sample_format const sample_formats[] =
+static const struct sample_format sample_formats[] =
{
- { "S8", 1, TRUE, FALSE, FALSE },
- { "U8", 1, FALSE, FALSE, FALSE },
- { "S16_LE", 2, TRUE, FALSE, FALSE },
- { "U16_LE", 2, FALSE, FALSE, FALSE },
- { "S16_BE", 2, TRUE, FALSE, TRUE },
- { "U16_BE", 2, FALSE, FALSE, TRUE },
- { "S32_LE", 4, TRUE, FALSE, FALSE },
- { "U32_LE", 4, FALSE, FALSE, FALSE },
- { "S32_BE", 4, TRUE, FALSE, TRUE },
- { "U32_BE", 4, FALSE, FALSE, TRUE },
- { "FLOAT_LE", 4, TRUE, TRUE, FALSE },
- { "FLOAT_BE", 4, TRUE, TRUE, TRUE },
- { "FLOAT64_LE", 8, TRUE, TRUE, FALSE },
- { "FLOAT64_BE", 8, TRUE, TRUE, TRUE },
+ // bytes, signed, floating, bigendian, digits, digits decimal, scale, offset
+ { "S8 (-1..1)", { 1, TRUE, FALSE, FALSE, 7, FALSE, { 1, 128}, { 0, 1}}},
+ { "S8 (-128..127)", { 1, TRUE, FALSE, FALSE, 7, FALSE, { 1, 1}, { 0, 1}}},
+ { "U8 (0..1)", { 1, FALSE, FALSE, FALSE, 8, FALSE, { 1, 255}, {-1, 2}}},
+ { "U8 (0..255)", { 1, FALSE, FALSE, FALSE, 8, FALSE, { 1, 1}, { 0, 1}}},
+ { "S16_LE (-1..1)", { 2, TRUE, FALSE, FALSE, 15, FALSE, { 1, INT16_MAX + 1}, { 0, 1}}},
+ { "S16_LE (-32768..32767)", { 2, TRUE, FALSE, FALSE, 15, FALSE, { 1, 1}, { 0, 1}}},
+ { "U16_LE (0..1)", { 2, FALSE, FALSE, FALSE, 16, FALSE, { 1, UINT16_MAX}, {-1, 2}}},
+ { "U16_LE (0..65535)", { 2, FALSE, FALSE, FALSE, 16, FALSE, { 1, 1}, { 0, 1}}},
+ { "S16_BE (-1..1)", { 2, TRUE, FALSE, TRUE, 15, FALSE, { 1, INT16_MAX + 1}, { 0, 1}}},
+ { "S16_BE (-32768..32767)", { 2, TRUE, FALSE, TRUE, 15, FALSE, { 1, 1}, { 0, 1}}},
+ { "U16_BE (0..1)", { 2, FALSE, FALSE, TRUE, 16, FALSE, { 1, UINT16_MAX}, {-1, 2}}},
+ { "U16_BE (0..65535)", { 2, FALSE, FALSE, TRUE, 16, FALSE, { 1, 1}, { 0, 1}}},
+ { "S32_LE (-1..1)", { 4, TRUE, FALSE, FALSE, 31, FALSE, { 1, (uint64_t)INT32_MAX + 1}, { 0, 1}}},
+ { "S32_LE (-2147483648..2147483647)", { 4, TRUE, FALSE, FALSE, 31, FALSE, { 1, 1}, { 0, 1}}},
+ { "U32_LE (0..1)", { 4, FALSE, FALSE, FALSE, 32, FALSE, { 1, UINT32_MAX}, {-1, 2}}},
+ { "U32_LE (0..4294967295)", { 4, FALSE, FALSE, FALSE, 32, FALSE, { 1, 1}, { 0, 1}}},
+ { "S32_BE (-1..1)", { 4, TRUE, FALSE, TRUE, 31, FALSE, { 1, (uint64_t)INT32_MAX + 1}, { 0, 1}}},
+ { "S32_BE (-2147483648..2147483647)", { 4, TRUE, FALSE, TRUE, 31, FALSE, { 1, 1}, { 0, 1}}},
+ { "U32_BE (0..1)", { 4, FALSE, FALSE, TRUE, 32, FALSE, { 1, UINT32_MAX}, {-1, 2}}},
+ { "U32_BE (0..4294967295)", { 4, FALSE, FALSE, TRUE, 32, FALSE, { 1, 1}, { 0, 1}}},
+ { "FLOAT_LE", { 4, TRUE, TRUE, FALSE, 6, TRUE, { 1, 1}, { 0, 1}}},
+ { "FLOAT_BE", { 4, TRUE, TRUE, TRUE, 6, TRUE, { 1, 1}, { 0, 1}}},
+ { "FLOAT64_LE", { 8, TRUE, TRUE, FALSE, 15, TRUE, { 1, 1}, { 0, 1}}},
+ { "FLOAT64_BE", { 8, TRUE, TRUE, TRUE, 15, TRUE, { 1, 1}, { 0, 1}}},
};
static int parse_format_string(const char *format)
{
- int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
- for (int i = 0; i < num_formats; i++) {
+ for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++) {
if (!strcmp(format, sample_formats[i].fmt_name))
return i;
}
inc->analog.meaning = &inc->meaning;
inc->analog.spec = &inc->spec;
- inc->encoding.unitsize = fmt->unitsize;
- inc->encoding.is_signed = fmt->is_signed;
- inc->encoding.is_float = fmt->is_float;
- inc->encoding.is_bigendian = fmt->is_bigendian;
- inc->encoding.digits = 0;
- inc->encoding.is_digits_decimal = TRUE;
- inc->encoding.scale.p = 1;
- inc->encoding.scale.q = 1;
- inc->encoding.offset.p = 0;
- inc->encoding.offset.q = 1;
+ memcpy(&inc->encoding, &fmt->encoding, sizeof(inc->encoding));
inc->meaning.mq = 0;
inc->meaning.unit = 0;
{
struct context *inc;
int num_channels;
- char channelname[8];
+ char channelname[16];
const char *format;
int fmt_index;
format = g_variant_get_string(g_hash_table_lookup(options, "format"), NULL);
if ((fmt_index = parse_format_string(format)) == -1) {
GString *formats = g_string_sized_new(200);
- int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
- for (int i = 0; i < num_formats; i++)
+ for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++)
g_string_append_printf(formats, "%s ", sample_formats[i].fmt_name);
sr_err("Invalid format '%s': must be one of: %s.",
format, formats->str);
in->priv = inc = g_malloc0(sizeof(struct context));
for (int i = 0; i < num_channels; i++) {
- snprintf(channelname, 8, "CH%d", i + 1);
+ snprintf(channelname, sizeof(channelname) - 1, "CH%d", i + 1);
sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
}
inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
- inc->samplesize = sample_formats[fmt_index].unitsize * num_channels;
+ inc->samplesize = sample_formats[fmt_index].encoding.unitsize * num_channels;
init_context(inc, &sample_formats[fmt_index], in->sdi->channels);
return SR_OK;
static int process_buffer(struct sr_input *in)
{
struct context *inc;
- struct sr_datafeed_meta meta;
- struct sr_datafeed_packet packet;
- struct sr_config *src;
unsigned int offset, chunk_size;
inc = in->priv;
if (!inc->started) {
- std_session_send_df_header(in->sdi, LOG_PREFIX);
+ std_session_send_df_header(in->sdi);
if (inc->samplerate) {
- packet.type = SR_DF_META;
- packet.payload = &meta;
- src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
- meta.config = g_slist_append(NULL, src);
- sr_session_send(in->sdi, &packet);
- g_slist_free(meta.config);
- sr_config_free(src);
+ (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+ g_variant_new_uint64(inc->samplerate));
}
inc->started = TRUE;
static int end(struct sr_input *in)
{
- struct sr_datafeed_packet packet;
struct context *inc;
int ret;
ret = SR_OK;
inc = in->priv;
- if (inc->started) {
- packet.type = SR_DF_END;
- sr_session_send(in->sdi, &packet);
- }
+ if (inc->started)
+ std_session_send_df_end(in->sdi);
return ret;
}
static struct sr_option options[] = {
- { "numchannels", "Number of channels", "Number of channels", NULL, NULL },
- { "samplerate", "Sample rate", "Sample rate", NULL, NULL },
- { "format", "Format", "Numeric format", NULL, NULL },
+ { "numchannels", "Number of analog channels", "The number of (analog) channels in the data", NULL, NULL },
+ { "samplerate", "Sample rate (Hz)", "The sample rate of the (analog) data in Hz", NULL, NULL },
+ { "format", "Data format", "The format of the data (data type, signedness, endianness)", NULL, NULL },
ALL_ZERO
};
static const struct sr_option *get_options(void)
{
- int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
if (!options[0].def) {
options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));
options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE));
options[2].def = g_variant_ref_sink(g_variant_new_string(sample_formats[0].fmt_name));
- for (int i = 0; i < num_formats; i++) {
+ for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++) {
options[2].values = g_slist_append(options[2].values,
g_variant_ref_sink(g_variant_new_string(sample_formats[i].fmt_name)));
}
static void cleanup(struct sr_input *in)
{
- struct context *inc;
+ g_free(in->priv);
+ in->priv = NULL;
- inc = in->priv;
g_variant_unref(options[0].def);
g_variant_unref(options[1].def);
g_variant_unref(options[2].def);
g_slist_free_full(options[2].values, (GDestroyNotify)g_variant_unref);
- g_free(inc);
- in->priv = NULL;
+}
+
+static int reset(struct sr_input *in)
+{
+ struct context *inc = in->priv;
+
+ inc->started = FALSE;
+
+ g_string_truncate(in->buf, 0);
+
+ return SR_OK;
}
SR_PRIV struct sr_input_module input_raw_analog = {
.id = "raw_analog",
.name = "RAW analog",
- .desc = "analog signals without header",
+ .desc = "Raw analog data without header",
.exts = (const char*[]){"raw", "bin", NULL},
.options = get_options,
.init = init,
.receive = receive,
.end = end,
.cleanup = cleanup,
+ .reset = reset,
};