lib: add flag to remove zero-offset

When the ZERO flag is set, the function will remove any zero-offset applied. This is used to reset the auto-clear status Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

lib: add flag to remove zero-offset
When the ZERO flag is set, the function will remove any zero-offset applied. This is used to reset the auto-clear status Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
4abb96c7 · Federico Vaga · 4b79f254 · 4abb96c7 · 4abb96c7 · 4abb96c7
Commit 4abb96c7 authored Oct 22, 2018 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 1 deletion

adc-lib.h lib/adc-lib.h +5 -1

fmc-adc-100m14b4cha.c lib/fmc-adc-100m14b4cha.c +8 -0

adc-acq.c tools/adc-acq.c +3 -0

No files found.
--- a/lib/adc-lib.h
+++ b/lib/adc-lib.h
@@ -295,9 +295,13 @@ enum adc_offset_auto_clear_flags {
 	ADC_OFFSET_AC_F_SOFTWARE=0x00000004, /**< use software mechanism,
 						it implies manual
 						configuration */
+	ADC_OFFSET_AC_F_ZERO=0x00000008, /**< it sets the zero-offset to zero;
+					    which means that it removes any
+					    previously set zero-offset. */
 	__ADC_OFFSET_AC_F_MASK=(ADC_OFFSET_AC_F_MANUAL |
 				ADC_OFFSET_AC_F_RESTORE |
-				ADC_OFFSET_AC_F_SOFTWARE), /**< used internally */
+				ADC_OFFSET_AC_F_SOFTWARE |
+				ADC_OFFSET_AC_F_ZERO), /**< used internally */
 };

 /**

--- a/lib/fmc-adc-100m14b4cha.c
+++ b/lib/fmc-adc-100m14b4cha.c
@@ -988,6 +988,14 @@ static int adc_100m14b4cha_offset_auto_clear(struct adc_dev *dev,
 	int err, err_rst;
 	uint32_t range;

+	if (flags & ADC_OFFSET_AC_F_ZERO) {
+		offset = 0;
+		return adc_100m14b4cha_config_chn(dev, chan,
+						  __ADC_CONF_CHN_OFFSET_ZERO,
+						  (uint32_t *)&offset,
+						  ADC_CONF_SET);
+	}
+
 	flags |= ADC_OFFSET_AC_F_SOFTWARE;

 	err = __cfg_offac_save(dev, chan, &tmpcfg, flags);

--- a/tools/adc-acq.c
+++ b/tools/adc-acq.c
@@ -707,6 +707,9 @@ static int adc_acq_offset_auto_clear(struct adc_dev *adc,
 			case 'a':
 				flags |= ADC_OFFSET_AC_F_RESTORE;
 				break;
+			case 'z':
+				flags |= ADC_OFFSET_AC_F_ZERO;
+				break;
 			default:
 				fprintf(stderr,
 					"%s: invalid offset auto-clear mode '%c' (valid modes: {a: automatic, m: manual})",