From 3cc91746a3d93824e248c67dda3b69e2eec81281 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 6 Sep 2016 15:15:07 +0200 Subject: octphy: fix build with OCTSDR-OPENBSC-02.07.00-B708: name changed There was an apparent change of name from cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_IDLE to cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNUSED in: git://git.osmocom.org/octphy-2g-headers commit 953a258aadf18c05e8128a339f15b1c5bb377cfd "Import headers from OCTSDR-OPENBSC-02.07.00-B708.tgz" In order to build octphy with these headers, apply the same rename in osmo-bts-octphy/*. Change-Id: Ic07055860035a7c1b83ab923817423eeb39f33d3 --- src/osmo-bts-octphy/l1_utils.c | 2 +- src/osmo-bts-octphy/octphy_hw_api.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osmo-bts-octphy/l1_utils.c b/src/osmo-bts-octphy/l1_utils.c index fd399a65..682865bb 100644 --- a/src/osmo-bts-octphy/l1_utils.c +++ b/src/osmo-bts-octphy/l1_utils.c @@ -62,7 +62,7 @@ const struct value_string octphy_dir_names[5] = const struct value_string octphy_clkmgr_state_vals[8] = { { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNINITIALIZE, "UNINITIALIZED" }, - { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_IDLE, "IDLE" }, + { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNUSED, "UNUSED" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_NO_EXT_CLOCK, "NO_EXT_CLOCK" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_LOCKED, "LOCKED" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNLOCKED, "UNLOCKED" }, diff --git a/src/osmo-bts-octphy/octphy_hw_api.c b/src/osmo-bts-octphy/octphy_hw_api.c index ec7c4be3..d0d5ec74 100644 --- a/src/osmo-bts-octphy/octphy_hw_api.c +++ b/src/osmo-bts-octphy/octphy_hw_api.c @@ -279,7 +279,7 @@ static const struct value_string clocksync_source_state_vals[] = { static const struct value_string clocksync_state_vals[] = { { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNINITIALIZE, "Uninitialized" }, - { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_IDLE, "Idle" }, + { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNUSED, "Unused" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_NO_EXT_CLOCK, "No External Clock" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_LOCKED, "Locked" }, -- cgit v1.2.3