Skip to content

A
adc-lib
Commit 4c4ec71a authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'hotfix/library' into develop

parents 1312277e f36a5ebf
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
lib/buffer-zio.c
View file @ 4c4ec71a
......@@ -179,7 +179,7 @@ int adc_zio_fill_buffer(struct adc_dev *dev,
if (!to)
to_ms = -1;
else
to_ms = to->tv_sec / 1000 + (to->tv_usec + 500) / 1000;
to_ms = to->tv_sec * 1000 + (to->tv_usec + 500) / 1000;
ret = poll(&p, 1, to_ms);
switch (ret) {
case 0:
......
lib/fmc-adc-100m14b4cha.c
View file @ 4c4ec71a
......@@ -750,6 +750,10 @@ static int adc_100m14b4cha_buffer_get_sample(struct adc_buffer *buf,
(1LL << ADC_CONF_BRD_N_TRG_EXT) | \
(1LL << ADC_CONF_BRD_N_TRG_THR) | \
(1LL << ADC_CONF_BRD_N_TRG_TIM)
#define ADC_100M_4CH_14BIT_CUS_MASK (1ULL << ADC_CONF_100M14B4CHA_BUF_TYPE) | \
(1ULL << ADC_CONF_100M14B4CHA_TRG_SW_EN) | \
(1ULL << ADC_CONF_100M14B4CHA_ACQ_MSHOT_MAX) | \
(1ULL << ADC_CONF_100M14B4CHA_BUF_SIZE_KB)
#define ADC_100M_4CH_14BIT_TRG_EXT_MASK (1LL << ADC_CONF_TRG_EXT_ENABLE) | \
(1LL << ADC_CONF_TRG_EXT_POLARITY) | \
(1LL << ADC_CONF_TRG_EXT_DELAY)
......@@ -791,6 +795,7 @@ struct adc_board_type fmcadc_100ms_4ch_14bit = {
[ADC_CONF_TYPE_BRD] = ADC_100M_4CH_14BIT_BRD_MASK,
[ADC_CONF_TYPE_CHN] = ADC_100M_4CH_14BIT_CHN_MASK,
[ADC_CONF_TYPE_ACQ] = ADC_100M_4CH_14BIT_ACQ_MASK,
[ADC_CONF_TYPE_CUS] = ADC_100M_4CH_14BIT_CUS_MASK,
[ADC_CONF_TYPE_TRG_EXT] = ADC_100M_4CH_14BIT_TRG_EXT_MASK,
[ADC_CONF_TYPE_TRG_THR] = ADC_100M_4CH_14BIT_TRG_THR_MASK,
[ADC_CONF_TYPE_TRG_TIM] = ADC_100M_4CH_14BIT_TRG_TIM_MASK,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment