Simplify WRS calibration functions

As WR extension share now the same servo than L1Sync extension, the only service required from HAL is the value of the bit-slide. Then a simplification can be done by removing some functions and some obsolete function parameters

Simplify WRS calibration functions
As WR extension share now the same servo than L1Sync extension, the only service required from HAL is the value of the bit-slide. Then a simplification can be done by removing some functions and some obsolete function parameters
f0227345 · baujc · 0e593d58 · f0227345 · f0227345
Commit f0227345 authored Apr 09, 2019 by baujc
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 105 deletions

wrs-calibration.c arch-wrs/wrs-calibration.c +1 -92

wrh.h include/hw-specific/wrh.h +1 -13

No files found.
--- a/arch-wrs/wrs-calibration.c
+++ b/arch-wrs/wrs-calibration.c
@@ -13,14 +13,9 @@
 #include <hal_exports.h>
-int wrs_read_calibration_data(struct pp_instance *ppi,
+int wrs_read_calibration_data(struct pp_instance *ppi,int32_t *clock_period, uint32_t *bit_slide_ps)
-	uint32_t *delta_tx, uint32_t *delta_rx, int32_t *fix_alpha,
-	int32_t *clock_period, uint32_t *bit_slide_ps)
 {
 	struct hal_port_state *p;
-	/* The following fields come from struct hexp_port_state */
-	uint32_t port_delta_tx, port_delta_rx;
-	int32_t port_fix_alpha;
 	p = pp_wrs_lookup_port(ppi->iface_name);
 	if (!p)
@@ -29,95 +24,9 @@ int wrs_read_calibration_data(struct pp_instance *ppi,
 	if(!p->calib.tx_calibrated || !p->calib.rx_calibrated)
 		return WRH_HW_CALIB_NOT_FOUND;
-	/*
-	 * Like in wrs_net_init, we build fields that were in
-	 * hexp_port_state from the "real" hal_port_state in the same
-	 * way as the HAL itself was doing to fill the RPC structure.
-	 * Formulas copied from libwr/hal_shmem.c (get_exported_state).
-	 */
-     if ( CONFIG_HAS_PROFILE_WR  ) {
-		port_fix_alpha =  FIX_ALPHA_TWO_POW_FRACBITS *
-			((p->calib.sfp.alpha + 1.0) / (p->calib.sfp.alpha + 2.0)
-			 - 0.5);
-     } else {
-    	 port_fix_alpha =0;
-     }
-	if ( delta_tx || delta_rx) {
-		port_delta_tx = p->calib.delta_tx_phy
-			+ p->calib.sfp.delta_tx_ps + p->calib.delta_tx_board;
-		port_delta_rx = p->calib.delta_rx_phy
-			+ p->calib.sfp.delta_rx_ps + p->calib.delta_rx_board;
-		pp_diag(ppi, servo, 1, "deltas: tx=%d, rx=%d\n",
-				port_delta_tx, port_delta_rx);
-	}
 	if ( bit_slide_ps )
 		*bit_slide_ps=p->calib.bitslide_ps;
-	if(delta_tx)
-		*delta_tx = port_delta_tx;
-	if(delta_rx)
-		*delta_rx = port_delta_rx;
-	if(fix_alpha)
-		*fix_alpha = port_fix_alpha;
 	if(clock_period)
 		*clock_period =  16000; /* REF_CLOCK_PERIOD_PS */
 	return WRH_HW_CALIB_OK;
 }
-int wrs_read_correction_data(struct pp_instance *ppi, int64_t *fiber_fix_alpha,
-		int32_t *clock_period_ps, uint32_t *bit_slide_ps) {
-	int32_t port_cP;
-	wrs_read_calibration_data(ppi, NULL, NULL,NULL, &port_cP, bit_slide_ps);
-	if(fiber_fix_alpha) {
-		if ( CONFIG_HAS_PROFILE_WR ) {
-			double alpha;
-			alpha  = ((double) ppi->asymmetryCorrectionPortDS.scaledDelayCoefficient)/REL_DIFF_TWO_POW_FRACBITS;
-			*fiber_fix_alpha = FIX_ALPHA_TWO_POW_FRACBITS * ((alpha + 1.0) / (alpha + 2.0) - 0.5);
-		} else {
-			*fiber_fix_alpha=0;
-		}
-	}
-	if(clock_period_ps)
-		*clock_period_ps     =  port_cP; /* REF_CLOCK_PERIOD_PS */
-	return WRH_HW_CALIB_OK;
-}
-int wrs_calibrating_disable(struct pp_instance *ppi, int txrx)
-{
-	return 0;
-}
-int wrs_calibrating_enable(struct pp_instance *ppi, int txrx)
-{
-	return 0;
-}
-int wrs_calibrating_poll(struct pp_instance *ppi, int txrx, uint32_t *delta)
-{
-	uint32_t delta_tx, delta_rx;
-	wrs_read_calibration_data(ppi, &delta_tx, &delta_rx, NULL, NULL, NULL);
-	*delta = (txrx == WRH_HW_CALIB_TX) ? delta_tx : delta_rx;
-	return WRH_HW_CALIB_READY;
-}
-int wrs_calibration_pattern_enable(struct pp_instance *ppi,
-				    unsigned int calib_period,
-				    unsigned int calib_pattern,
-				    unsigned int calib_pattern_len)
-{
-	return WRH_HW_CALIB_OK;
-}
-int wrs_calibration_pattern_disable(struct pp_instance *ppi)
-{
-	return WRH_HW_CALIB_OK;
-}
--- a/include/hw-specific/wrh.h
+++ b/include/hw-specific/wrh.h
@@ -56,20 +56,8 @@ struct wrh_operations {
 	int (*adjust_counters)(int64_t adjust_sec, int32_t adjust_nsec);
 	int (*adjust_phase)(int32_t phase_ps);
-	int (*read_calib_data)(struct pp_instance *ppi,
+	int (*read_calib_data)(struct pp_instance *ppi,int32_t *clock_period, uint32_t *bit_slide_ps);
-			      uint32_t *deltaTx, uint32_t *deltaRx,
-			      int32_t *fix_alpha, int32_t *clock_period, uint32_t *bit_slide_ps);
-	int (*calib_disable)(struct pp_instance *ppi, int txrx);
-	int (*calib_enable)(struct pp_instance *ppi, int txrx);
-	int (*calib_poll)(struct pp_instance *ppi, int txrx, uint32_t *delta);
-	int (*calib_pattern_enable)(struct pp_instance *ppi,
-				    unsigned int calibrationPeriod,
-				    unsigned int calibrationPattern,
-				    unsigned int calibrationPatternLen);
-	int (*calib_pattern_disable)(struct pp_instance *ppi);
 	int (*enable_timing_output)(struct pp_globals *,int enable);
-	int (*read_corr_data)(struct pp_instance *ppi, int64_t *fixAlpha,
-			int32_t *clock_period, uint32_t *bit_slide_ps);
 	timing_mode_t (*get_timing_mode)(struct pp_globals *);
 	timing_mode_state_t (*get_timing_mode_state)(struct pp_globals *);
 	int (*set_timing_mode)(struct pp_globals *, timing_mode_t tm);