compilation_with_new_header

3 files changed, 113 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index 1d7379f1..8792d4e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,13 +152,6 @@ if test "$enable_octphy" = "yes" ; then
 			[],
 			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
 
-	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulSyncLossCnt],
-			AC_DEFINE([OCTPHY_USE_SYNC_LOSS_CNT],
-			[1],
-			[Define to 1 if your octphy header files renamed ulSyncLosseCnt to ulSyncLossCnt]),
-			[],
-			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
-
 	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP.TxConfig],
 			AC_DEFINE([OCTPHY_USE_TX_CONFIG],
 			[1],
@@ -180,6 +173,69 @@ if test "$enable_octphy" = "yes" ; then
 			[],
 			[#include <octphy/octvc1/gsm/octvc1_gsm_api.h>])
 
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP.ulClkSourceSelection],
+			AC_DEFINE([OCTPHY_USE_CLK_SOURCE_SELECTION],
+			[1],
+			[Define to 1 if your octphy header files supports ulClkSourceSelection in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.lClockError],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_CLOCK_ERROR],
+			[1],
+			[Define to 1 if your octphy header files supports lClockError in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.lDroppedCycles],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_DROPPED_CYCLES],
+			[1],
+			[Define to 1 if your octphy header files supports lDroppedCycles in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulPllFreqHz],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_PLL_FREQ_HZ],
+			[1],
+			[Define to 1 if your octphy header files supports ulPllFreqHz in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulPllFractionalFreqHz],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_PLL_FRACTIONAL_FREQ_HZ],
+			[1],
+			[Define to 1 if your octphy header files supports ulPllFractionalFreqHz in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulSlipCnt],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SLIP_CNT],
+			[1],
+			[Define to 1 if your octphy header files supports ulSlipCnt in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulSyncLosseCnt],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SYNC_LOSSE_CNT],
+			[1],
+			[Define to 1 if your octphy header files supports ulSyncLosseCnt in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulSyncLossCnt],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SYNC_LOSS_CNT],
+			[1],
+			[Define to 1 if your octphy header files supports ulSyncLossCnt in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
+	AC_CHECK_MEMBER([tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP.ulSourceState],
+			AC_DEFINE([OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SOURCE_STATE],
+			[1],
+			[Define to 1 if your octphy header files supports ulSourceState in tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP]),
+			[],
+			[#include <octphy/octvc1/hw/octvc1_hw_api.h>])
+
 	CPPFLAGS=$oldCPPFLAGS
 fi
 
diff --git a/src/osmo-bts-octphy/octphy_hw_api.c b/src/osmo-bts-octphy/octphy_hw_api.c
index 7b988fe1..ec8ccf54 100644
--- a/src/osmo-bts-octphy/octphy_hw_api.c
+++ b/src/osmo-bts-octphy/octphy_hw_api.c
@@ -275,6 +275,7 @@ static const struct value_string clocksync_source_vals[] = {
 	{ 0, NULL }
 };
 
+#if OCTPHY_USE_CLK_SOURCE_SELECTION == 1
 static const struct value_string clocksync_sel_vals[] = {
 	{ cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_AUTOSELECT,
 		"Autoselect" },
@@ -284,6 +285,7 @@ static const struct value_string clocksync_sel_vals[] = {
 		"Host Application" },
 	{ 0, NULL }
 };
+#endif
 
 static const struct value_string clocksync_source_state_vals[] = {
 	{ cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_INVALID, "Invalid" },
@@ -304,8 +306,13 @@ static int get_clock_sync_compl_cb(struct octphy_hdl *fl1, struct msgb *resp,
 
 	LOGP(DL1C, LOGL_INFO, "CLOCK-SYNC-MGR-INFO.resp Reference=%s ",
 		get_value_string(clocksync_source_vals, cir->ulClkSourceRef));
+
+#if OCTPHY_USE_CLK_SOURCE_SELECTION == 1
 	LOGPC(DL1C, LOGL_INFO, "Selection=%s)\n",
 		get_value_string(clocksync_sel_vals, cir->ulClkSourceSelection));
+#else
+	LOGPC(DL1C, LOGL_INFO, "Clock Drift= %u Us\n", cir->ulMaxDriftDurationUs);
+#endif
 
 	msgb_free(resp);
 	return 0;
@@ -338,18 +345,35 @@ static int get_clock_sync_stats_cb(struct octphy_hdl *fl1, struct msgb *resp,
 
 	mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP_SWAP(csr);
 
-	LOGP(DL1C, LOGL_INFO, "CLOCK-SYNC-MGR-STATS.resp State=%s, "
-		"ClockError=%d DroppedCycles=%d, PllFreqHz=%u, PllFract=%u, "
-		"SlipCnt=%u SyncLosses=%u SourceState=%u, DacValue=%u\n",
-		get_value_string(clocksync_state_vals, csr->ulState),
-	       	csr->lClockError, csr->lDroppedCycles, csr->ulPllFreqHz,
-		csr->ulPllFractionalFreqHz, csr->ulSlipCnt,
-#if OCTPHY_USE_SYNC_LOSS_CNT == 1
-		csr->ulSyncLossCnt,
-#else
-		csr->ulSyncLosseCnt,
+	LOGP(DL1C, LOGL_INFO, "CLOCK-SYNC-MGR-STATS.resp");
+	LOGPC(DL1C, LOGL_INFO, " State=%s,", get_value_string(clocksync_state_vals, csr->ulState));
+
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_CLOCK_ERROR == 1
+	LOGPC(DL1C, LOGL_INFO, " ClockError=%d,", csr->lClockError);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_DROPPED_CYCLES == 1
+	LOGPC(DL1C, LOGL_INFO, " DroppedCycles=%d,", csr->lDroppedCycles);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_PLL_FREQ_HZ == 1
+	LOGPC(DL1C, LOGL_INFO, " PllFreqHz=%u,", csr->ulPllFreqHz);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_PLL_FRACTIONAL_FREQ_HZ == 1
+	LOGPC(DL1C, LOGL_INFO, " PllFract=%u,", csr->ulPllFractionalFreqHz);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SLIP_CNT == 1
+	LOGPC(DL1C, LOGL_INFO, " SlipCnt=%u,", csr->ulSlipCnt);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SYNC_LOSS_CNT == 1
+	LOGPC(DL1C, LOGL_INFO, " SyncLosses=%u,", csr->ulSyncLossCnt);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SYNC_LOSSE_CNT == 1
+	LOGPC(DL1C, LOGL_INFO, " SyncLosses=%u,", csr->ulSyncLosseCnt);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SOURCE_STATE == 1
+	LOGPC(DL1C, LOGL_INFO, " SourceState=%u,", csr->ulSourceState);
 #endif
-		csr->ulSourceState, csr->ulDacValue);
+	LOGPC(DL1C, LOGL_INFO, " DacValue=%u,", csr->ulDacValue);
+	LOGPC(DL1C, LOGL_INFO, "\n");
 
 	get_cb_data = (struct octphy_hw_get_cb_data*) data;
 	get_cb_data->cb(resp,get_cb_data->data);
diff --git a/src/osmo-bts-octphy/octphy_vty.c b/src/osmo-bts-octphy/octphy_vty.c
index fb36493f..f090e6eb 100644
--- a/src/osmo-bts-octphy/octphy_vty.c
+++ b/src/osmo-bts-octphy/octphy_vty.c
@@ -282,17 +282,30 @@ void show_clk_sync_stats_cb(struct msgb *resp, void *data)
 	vty_out(vty, "State=%s%s",
 		get_value_string(clocksync_state_vals, csr->ulState),
 		VTY_NEWLINE);
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_CLOCK_ERROR == 1
 	vty_out(vty, "ClockError=%d%s", csr->lClockError, VTY_NEWLINE);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_DROPPED_CYCLES == 1
 	vty_out(vty, "DroppedCycles=%d%s", csr->lDroppedCycles, VTY_NEWLINE);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_PLL_FREQ_HZ == 1
 	vty_out(vty, "PllFreqHz=%u%s", csr->ulPllFreqHz, VTY_NEWLINE);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_PLL_FRACTIONAL_FREQ_HZ == 1
 	vty_out(vty, "PllFract=%u%s", csr->ulPllFractionalFreqHz, VTY_NEWLINE);
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SLIP_CNT == 1
 	vty_out(vty, "SlipCnt=%u%s", csr->ulSlipCnt, VTY_NEWLINE);
-#if OCTPHY_USE_SYNC_LOSS_CNT == 1
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SYNC_LOSS_CNT == 1
 	vty_out(vty, "SyncLosses=%u%s", csr->ulSyncLossCnt, VTY_NEWLINE);
-#else
+#endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SYNC_LOSSE_CNT == 1
 	vty_out(vty, "SyncLosses=%u%s", csr->ulSyncLosseCnt, VTY_NEWLINE);
 #endif
+#if OCTPHY_USE_CLOCK_SYNC_MGR_STATS_SOURCE_STATE == 1
 	vty_out(vty, "SourceState=%u%s", csr->ulSourceState, VTY_NEWLINE);
+#endif
 	vty_out(vty, "DacValue=%u%s", csr->ulDacValue, VTY_NEWLINE);
 }