BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input/raw_analog: set scale and offset appropriately

This commit is contained in:
Stefan Brüns 2015-11-29 08:03:57 +01:00 committed by Uwe Hermann
parent e6b15cb5e6
commit 221cec31fc
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/input/raw_analog.c
View File

@ -49,29 +49,25 @@ struct context {
struct sample_format { struct sample_format {
const char const* fmt_name; const char const* fmt_name;
// same as struct sr_analog_encoding struct sr_analog_encoding encoding;
uint8_t unitsize;
gboolean is_signed;
gboolean is_float;
gboolean is_bigendian;
}; };
static const struct sample_format const sample_formats[] = static const struct sample_format const sample_formats[] =
{ {
{ "S8", 1, TRUE, FALSE, FALSE }, { "S8", { 1, TRUE, FALSE, FALSE, 0, TRUE, { 1, 128}, { 0, 1}}},
{ "U8", 1, FALSE, FALSE, FALSE }, { "U8", { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1, 255}, {-1, 2}}},
{ "S16_LE", 2, TRUE, FALSE, FALSE }, { "S16_LE", { 2, TRUE, FALSE, FALSE, 0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
{ "U16_LE", 2, FALSE, FALSE, FALSE }, { "U16_LE", { 2, FALSE, FALSE, FALSE, 0, TRUE, { 1, UINT16_MAX}, {-1, 2}}},
{ "S16_BE", 2, TRUE, FALSE, TRUE }, { "S16_BE", { 2, TRUE, FALSE, TRUE, 0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
{ "U16_BE", 2, FALSE, FALSE, TRUE }, { "U16_BE", { 2, FALSE, FALSE, TRUE, 0, TRUE, { 1, UINT16_MAX}, {-1, 2}}},
{ "S32_LE", 4, TRUE, FALSE, FALSE }, { "S32_LE", { 4, TRUE, FALSE, FALSE, 0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
{ "U32_LE", 4, FALSE, FALSE, FALSE }, { "U32_LE", { 4, FALSE, FALSE, FALSE, 0, TRUE, { 1, UINT32_MAX}, {-1, 2}}},
{ "S32_BE", 4, TRUE, FALSE, TRUE }, { "S32_BE", { 4, TRUE, FALSE, TRUE, 0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
{ "U32_BE", 4, FALSE, FALSE, TRUE }, { "U32_BE", { 4, FALSE, FALSE, TRUE, 0, TRUE, { 1, UINT32_MAX}, {-1, 2}}},
{ "FLOAT_LE", 4, TRUE, TRUE, FALSE }, { "FLOAT_LE", { 4, TRUE, TRUE, FALSE, 0, TRUE, { 1, 1}, { 0, 1}}},
{ "FLOAT_BE", 4, TRUE, TRUE, TRUE }, { "FLOAT_BE", { 4, TRUE, TRUE, TRUE, 0, TRUE, { 1, 1}, { 0, 1}}},
{ "FLOAT64_LE", 8, TRUE, TRUE, FALSE }, { "FLOAT64_LE", { 8, TRUE, TRUE, FALSE, 0, TRUE, { 1, 1}, { 0, 1}}},
{ "FLOAT64_BE", 8, TRUE, TRUE, TRUE }, { "FLOAT64_BE", { 8, TRUE, TRUE, TRUE, 0, TRUE, { 1, 1}, { 0, 1}}},
}; };
static int parse_format_string(const char *format) static int parse_format_string(const char *format)
@ -96,16 +92,7 @@ static void init_context(struct context *inc, const struct sample_format *fmt, G
inc->analog.meaning = &inc->meaning; inc->analog.meaning = &inc->meaning;
inc->analog.spec = &inc->spec; inc->analog.spec = &inc->spec;
inc->encoding.unitsize = fmt->unitsize; memcpy(&inc->encoding, &fmt->encoding, sizeof(inc->encoding));
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;
inc->meaning.mq = 0; inc->meaning.mq = 0;
inc->meaning.unit = 0; inc->meaning.unit = 0;
@ -150,7 +137,7 @@ static int init(struct sr_input *in, GHashTable *options)
} }
inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate")); 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); init_context(inc, &sample_formats[fmt_index], in->sdi->channels);
return SR_OK; return SR_OK;