Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit bb859ef7 authored by Federico Vaga's avatar Federico Vaga
1 Browse files
Options

drv bugfix according to ZIO offset is uV 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent e9efa126
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
kernel/fa-core.c
View file @ bb859ef7
...@@ -112,7 +112,7 @@ static int zfad_offset_to_dac(struct zio_channel *chan, ...@@ -112,7 +112,7 @@ static int zfad_offset_to_dac(struct zio_channel *chan,
struct fa_dev *fa = get_zfadc(&chan->cset->zdev->head.dev); struct fa_dev *fa = get_zfadc(&chan->cset->zdev->head.dev);
int offset, gain, hwval; int offset, gain, hwval;
hwval = uval * 0x8000 / 5000; hwval = uval * 0x8000 / 5000000;
if (hwval == 0x8000) if (hwval == 0x8000)
hwval = 0x7fff; /* -32768 .. 32767 */ hwval = 0x7fff; /* -32768 .. 32767 */
...@@ -144,9 +144,9 @@ int zfad_apply_user_offset(struct fa_dev *fa, struct zio_channel *chan, ...@@ -144,9 +144,9 @@ int zfad_apply_user_offset(struct fa_dev *fa, struct zio_channel *chan,
{ {
uint32_t range_reg; uint32_t range_reg;
int32_t uval = (int32_t)usr_val; int32_t uval = (int32_t)usr_val;
int offset, gain, hwval, i, range; int hwval, i, range;
if (uval < -5000 || uval > 5000) if (uval < -5000000 || uval > 5000000)
return -EINVAL; return -EINVAL;
i = zfad_get_chx_index(ZFA_CHx_CTL_RANGE, chan); i = zfad_get_chx_index(ZFA_CHx_CTL_RANGE, chan);
......
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