Commit 4d9ea740 authored by Federico Vaga's avatar Federico Vaga

sw:drv: reduce delta_temp scope

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 8eae0ecf
......@@ -143,22 +143,29 @@ void fa_calib_adc_config_chan(struct fa_dev *fa, unsigned int chan,
{
int range = fa->range[chan];
struct fa_calib_stanza *cal = &fa->calib.dac[range];
int32_t delta_temp;
int gain;
int err;
if (temperature == 0xFFFFFFFF)
temperature = fa_temperature_read(fa);
delta_temp = (temperature / 10) - cal->temperature;
if (unlikely((fa->flags & FA_DEV_F_PATTERN_DATA)))
if (unlikely((fa->flags & FA_DEV_F_PATTERN_DATA))) {
gain = cal->gain[chan];
else
dev_dbg(&fa->pdev->dev,
"%s: {chan: %d, range: %d, gain: 0x%x, offset: 0x%x}\n",
__func__, chan, range, gain, cal->offset[chan]);
} else {
int32_t delta_temp;
if (temperature == 0xFFFFFFFF)
temperature = fa_temperature_read(fa);
delta_temp = (temperature / 10) - cal->temperature;
gain = fa_calib_adc_gain_fix(range, cal->gain[chan],
delta_temp);
dev_dbg(&fa->pdev->dev,
"%s: {delta-temperature: %d, chan: %d, range: %d, gain: 0x%x, offset: 0x%x}\n",
__func__, delta_temp, chan, range, gain,
cal->offset[chan]);
dev_dbg(&fa->pdev->dev,
"%s: {delta-temperature: %d, chan: %d, range: %d, gain: 0x%x, offset: 0x%x}\n",
__func__, delta_temp, chan, range, gain, cal->offset[chan]);
}
fa_calib_gain_set(fa, chan, gain);
fa_calib_offset_set(fa, chan, cal->offset[chan]);
......@@ -239,22 +246,28 @@ int fa_calib_dac_config_chan(struct fa_dev *fa, unsigned int chan,
int32_t off_uv_raw = fa_dac_offset_raw_get(off_uv);
int range = fa->range[chan];
struct fa_calib_stanza *cal = &fa->calib.dac[range];
int32_t delta_temp;
int gain;
int hwval;
if (temperature == 0xFFFFFFFF)
temperature = fa_temperature_read(fa);
delta_temp = (temperature / 10) - cal->temperature;
if (unlikely((fa->flags & FA_DEV_F_PATTERN_DATA)))
if (unlikely((fa->flags & FA_DEV_F_PATTERN_DATA))) {
gain = cal->gain[chan];
else
dev_dbg(&fa->pdev->dev,
"%s: {chan: %d, range: %d, gain: 0x%x, offset: 0x%x}\n",
__func__, chan, range, gain, cal->offset[chan]);
} else {
int32_t delta_temp;
if (temperature == 0xFFFFFFFF)
temperature = fa_temperature_read(fa);
delta_temp = (temperature / 10) - cal->temperature;
gain = fa_calib_dac_gain_fix(range, cal->gain[chan],
delta_temp);
dev_dbg(&fa->pdev->dev,
"%s: {delta-temperature: %d, chan: %d, range: %d, gain: 0x%x, offset: 0x%x}\n",
__func__, delta_temp, chan, range, gain, cal->offset[chan]);
}
dev_dbg(&fa->pdev->dev,
"%s: {delta-temperature: %d, chan: %d, range: %d, gain: 0x%x, offset: 0x%x}\n",
__func__, delta_temp, chan, range, gain, cal->offset[chan]);
hwval = fa_dac_offset_raw_calibrate(off_uv_raw, gain,
cal->offset[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