lib: add timing base configuration

implements zio timing configuration Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

lib: add timing base configuration
implements zio timing configuration Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
4501db1b · Federico Vaga · 59929742 · 4501db1b · 4501db1b · 4501db1b
Commit 4501db1b authored May 21, 2014 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 1 deletion

boards.c lib/boards.c +3 -1

config-zio.c lib/config-zio.c +16 -0

fmc-adc-100m14b4cha.h lib/fmc-adc-100m14b4cha.h +2 -0

fmcadc-lib.h lib/fmcadc-lib.h +3 -0

No files found.
--- a/lib/boards.c
+++ b/lib/boards.c
@@ -32,7 +32,9 @@
 			    (1LL << FMCADC_CONF_CHN_TERMINATION) | \
 			    (1LL << FMCADC_CONF_CHN_OFFSET)
 #define FMCADC_ZIO_BRD_MASK (1LL << FMCADC_CONF_BRD_STATE_MACHINE_STATUS) | \
-			    (1LL << FMCADC_CONF_BRD_N_CHAN)
+			    (1LL << FMCADC_CONF_BRD_N_CHAN) | \
+			    (1LL << FMCADC_CONF_UTC_TIMING_BASE_S) | \
+			    (1LL << FMCADC_CONF_UTC_TIMING_BASE_T)

 struct fmcadc_operations fa_100ms_4ch_14bit_op = {
 	.open =			fmcadc_zio_open,

--- a/lib/config-zio.c
+++ b/lib/config-zio.c
@@ -319,6 +319,22 @@ static int fmcadc_zio_config_brd(struct __fmcadc_dev_zio *fa,
 		unsigned int index, uint32_t *value, unsigned int direction)
 {
 	switch (index) {
+	case FMCADC_CONF_UTC_TIMING_BASE_S:
+		if (direction)
+			return fa_zio_sysfs_set(fa, "cset0/tstamp-base-s",
+						value);
+		else
+			return fa_zio_sysfs_get(fa, "cset0/tstamp-base-s",
+						value);
+		break;
+	case FMCADC_CONF_UTC_TIMING_BASE_T:
+		if (direction)
+			return fa_zio_sysfs_set(fa, "cset0/tstamp-base-t",
+						value);
+		else
+			return fa_zio_sysfs_get(fa, "cset0/tstamp-base-t",
+						value);
+		break;
 	case FMCADC_CONF_BRD_STATE_MACHINE_STATUS:
 		if (!direction)
 			return fa_zio_sysfs_get(fa, "cset0/fsm-state",

--- a/lib/fmc-adc-100m14b4cha.h
+++ b/lib/fmc-adc-100m14b4cha.h
@@ -13,6 +13,8 @@
 #ifndef FMCA_ADC_100MA4B4CHA_H_
 #define FMCA_ADC_100MA4B4CHA_H_

+#define FA_UTC_CLOCK_NS  8
+
 /*
 * Trigger Extended Attribute Enumeration
 */

--- a/lib/fmcadc-lib.h
+++ b/lib/fmcadc-lib.h
@@ -83,6 +83,9 @@ enum fmcadc_board_status {
 	FMCADC_CONF_BRD_MIN_FREQ_HZ,
 	FMCADC_CONF_BRD_STATE_MACHINE_STATUS,
 	FMCADC_CONF_BRD_N_CHAN,
+	FMCADC_CONF_UTC_TIMING_BASE_S,
+	FMCADC_CONF_UTC_TIMING_BASE_T,
+	FMCADC_CONF_UTC_TIMING_BASE_B,
 	__FMCADC_CONF_BRD_ATTRIBUTE_LAST_INDEX,
 };
 enum fmcadc_configuration_type {