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

input/binary: Use uint64 for samplerate option.

This commit is contained in:
Bert Vermeulen 2014-08-30 20:13:13 +02:00
parent 4edba404b0
commit 10288172be
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/binary.c
View File

@ -30,7 +30,7 @@
#define MAX_CHUNK_SIZE 4096 #define MAX_CHUNK_SIZE 4096
#define DEFAULT_NUM_CHANNELS 8 #define DEFAULT_NUM_CHANNELS 8
#define DEFAULT_SAMPLERATE "0" #define DEFAULT_SAMPLERATE 0
struct context { struct context {
gboolean started; gboolean started;
@ -41,9 +41,7 @@ static int init(struct sr_input *in, GHashTable *options)
{ {
struct sr_channel *ch; struct sr_channel *ch;
struct context *inc; struct context *inc;
uint64_t samplerate;
int num_channels, i; int num_channels, i;
const char *s;
char name[16]; char name[16];
num_channels = g_variant_get_int32(g_hash_table_lookup(options, "numchannels")); num_channels = g_variant_get_int32(g_hash_table_lookup(options, "numchannels"));
@ -52,15 +50,10 @@ static int init(struct sr_input *in, GHashTable *options)
return SR_ERR_ARG; return SR_ERR_ARG;
} }
s = g_variant_get_string(g_hash_table_lookup(options, "samplerate"), NULL);
if (sr_parse_sizestring(s, &samplerate) != SR_OK) {
sr_err("Invalid samplerate '%s'.", s);
return SR_ERR_ARG;
}
in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL); in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
in->priv = inc = g_malloc0(sizeof(struct context)); in->priv = inc = g_malloc0(sizeof(struct context));
inc->samplerate = samplerate;
inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
for (i = 0; i < num_channels; i++) { for (i = 0; i < num_channels; i++) {
snprintf(name, 16, "%d", i); snprintf(name, 16, "%d", i);
@ -145,7 +138,7 @@ static struct sr_option *get_options(void)
{ {
if (!options[0].def) { if (!options[0].def) {
options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS)); options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));
options[1].def = g_variant_ref_sink(g_variant_new_string(DEFAULT_SAMPLERATE)); options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE));
} }
return options; return options;