<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20955">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-lc15: use consistent name for containing directory<br><br>The binary is called 'osmo-bts-lc15', while the containing folder<br>is named 'osmo-bts-litecell15'.  This inconsistency complicates<br>automatic generation of the XML VTY reference - fix it.<br><br>Change-Id: I55c073fbd01aee42871101401d76d87e7c91832e<br>Related: SYS#4937, OS#3036<br>---<br>M .gitignore<br>M configure.ac<br>M src/Makefile.am<br>R src/osmo-bts-lc15/Makefile.am<br>R src/osmo-bts-lc15/calib_file.c<br>R src/osmo-bts-lc15/hw_misc.c<br>R src/osmo-bts-lc15/hw_misc.h<br>R src/osmo-bts-lc15/l1_if.c<br>R src/osmo-bts-lc15/l1_if.h<br>R src/osmo-bts-lc15/l1_transp.h<br>R src/osmo-bts-lc15/l1_transp_hw.c<br>R src/osmo-bts-lc15/lc15bts.c<br>R src/osmo-bts-lc15/lc15bts.h<br>R src/osmo-bts-lc15/lc15bts_vty.c<br>R src/osmo-bts-lc15/main.c<br>R src/osmo-bts-lc15/misc/lc15bts_bid.c<br>R src/osmo-bts-lc15/misc/lc15bts_bid.h<br>R src/osmo-bts-lc15/misc/lc15bts_bts.c<br>R src/osmo-bts-lc15/misc/lc15bts_bts.h<br>R src/osmo-bts-lc15/misc/lc15bts_clock.c<br>R src/osmo-bts-lc15/misc/lc15bts_clock.h<br>R src/osmo-bts-lc15/misc/lc15bts_led.c<br>R src/osmo-bts-lc15/misc/lc15bts_led.h<br>R src/osmo-bts-lc15/misc/lc15bts_mgr.c<br>R src/osmo-bts-lc15/misc/lc15bts_mgr.h<br>R src/osmo-bts-lc15/misc/lc15bts_mgr_calib.c<br>R src/osmo-bts-lc15/misc/lc15bts_mgr_nl.c<br>R src/osmo-bts-lc15/misc/lc15bts_mgr_temp.c<br>R src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c<br>R src/osmo-bts-lc15/misc/lc15bts_misc.c<br>R src/osmo-bts-lc15/misc/lc15bts_misc.h<br>R src/osmo-bts-lc15/misc/lc15bts_nl.c<br>R src/osmo-bts-lc15/misc/lc15bts_nl.h<br>R src/osmo-bts-lc15/misc/lc15bts_par.c<br>R src/osmo-bts-lc15/misc/lc15bts_par.h<br>R src/osmo-bts-lc15/misc/lc15bts_power.c<br>R src/osmo-bts-lc15/misc/lc15bts_power.h<br>R src/osmo-bts-lc15/misc/lc15bts_swd.c<br>R src/osmo-bts-lc15/misc/lc15bts_swd.h<br>R src/osmo-bts-lc15/misc/lc15bts_temp.c<br>R src/osmo-bts-lc15/misc/lc15bts_temp.h<br>R src/osmo-bts-lc15/misc/lc15bts_util.c<br>R src/osmo-bts-lc15/oml.c<br>R src/osmo-bts-lc15/tch.c<br>R src/osmo-bts-lc15/utils.c<br>R src/osmo-bts-lc15/utils.h<br>46 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 9c2ff78..d996503 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -35,10 +35,10 @@</span><br><span> src/osmo-bts-sysmo/sysmobts-mgr</span><br><span> src/osmo-bts-sysmo/sysmobts-util</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-src/osmo-bts-litecell15/lc15bts-mgr</span><br><span style="color: hsl(0, 100%, 40%);">-src/osmo-bts-litecell15/lc15bts-util</span><br><span style="color: hsl(0, 100%, 40%);">-src/osmo-bts-litecell15/misc/.dirstamp</span><br><span style="color: hsl(0, 100%, 40%);">-src/osmo-bts-litecell15/osmo-bts-lc15</span><br><span style="color: hsl(120, 100%, 40%);">+src/osmo-bts-lc15/lc15bts-mgr</span><br><span style="color: hsl(120, 100%, 40%);">+src/osmo-bts-lc15/lc15bts-util</span><br><span style="color: hsl(120, 100%, 40%);">+src/osmo-bts-lc15/misc/.dirstamp</span><br><span style="color: hsl(120, 100%, 40%);">+src/osmo-bts-lc15/osmo-bts-lc15</span><br><span> </span><br><span> src/osmo-bts-trx/osmo-bts-trx</span><br><span> </span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 7ea97d1..58a7e38 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -374,7 +374,7 @@</span><br><span>     src/osmo-bts-virtual/Makefile</span><br><span>     src/osmo-bts-omldummy/Makefile</span><br><span>     src/osmo-bts-sysmo/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">-    src/osmo-bts-litecell15/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+    src/osmo-bts-lc15/Makefile</span><br><span>     src/osmo-bts-oc2g/Makefile</span><br><span>     src/osmo-bts-trx/Makefile</span><br><span>     src/osmo-bts-octphy/Makefile</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 70e4d96..b287026 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -13,7 +13,7 @@</span><br><span> endif</span><br><span> </span><br><span> if ENABLE_LC15BTS</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS += osmo-bts-litecell15</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS += osmo-bts-lc15</span><br><span> endif</span><br><span> </span><br><span> if ENABLE_OC2GBTS</span><br><span>diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-lc15/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/Makefile.am</span><br><span>rename to src/osmo-bts-lc15/Makefile.am</span><br><span>diff --git a/src/osmo-bts-litecell15/calib_file.c b/src/osmo-bts-lc15/calib_file.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/calib_file.c</span><br><span>rename to src/osmo-bts-lc15/calib_file.c</span><br><span>diff --git a/src/osmo-bts-litecell15/hw_misc.c b/src/osmo-bts-lc15/hw_misc.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/hw_misc.c</span><br><span>rename to src/osmo-bts-lc15/hw_misc.c</span><br><span>diff --git a/src/osmo-bts-litecell15/hw_misc.h b/src/osmo-bts-lc15/hw_misc.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/hw_misc.h</span><br><span>rename to src/osmo-bts-lc15/hw_misc.h</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-lc15/l1_if.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/l1_if.c</span><br><span>rename to src/osmo-bts-lc15/l1_if.c</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.h b/src/osmo-bts-lc15/l1_if.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/l1_if.h</span><br><span>rename to src/osmo-bts-lc15/l1_if.h</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_transp.h b/src/osmo-bts-lc15/l1_transp.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/l1_transp.h</span><br><span>rename to src/osmo-bts-lc15/l1_transp.h</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_transp_hw.c b/src/osmo-bts-lc15/l1_transp_hw.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>rename to src/osmo-bts-lc15/l1_transp_hw.c</span><br><span>diff --git a/src/osmo-bts-litecell15/lc15bts.c b/src/osmo-bts-lc15/lc15bts.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/lc15bts.c</span><br><span>rename to src/osmo-bts-lc15/lc15bts.c</span><br><span>diff --git a/src/osmo-bts-litecell15/lc15bts.h b/src/osmo-bts-lc15/lc15bts.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/lc15bts.h</span><br><span>rename to src/osmo-bts-lc15/lc15bts.h</span><br><span>diff --git a/src/osmo-bts-litecell15/lc15bts_vty.c b/src/osmo-bts-lc15/lc15bts_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/lc15bts_vty.c</span><br><span>rename to src/osmo-bts-lc15/lc15bts_vty.c</span><br><span>diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-lc15/main.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/main.c</span><br><span>rename to src/osmo-bts-lc15/main.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-lc15/misc/lc15bts_bid.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_bid.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_bid.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.h b/src/osmo-bts-lc15/misc/lc15bts_bid.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_bid.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_bid.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bts.c b/src/osmo-bts-lc15/misc/lc15bts_bts.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_bts.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_bts.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bts.h b/src/osmo-bts-lc15/misc/lc15bts_bts.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_bts.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_bts.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_clock.c b/src/osmo-bts-lc15/misc/lc15bts_clock.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_clock.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_clock.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_clock.h b/src/osmo-bts-lc15/misc/lc15bts_clock.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_clock.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_clock.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_led.c b/src/osmo-bts-lc15/misc/lc15bts_led.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_led.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_led.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_led.h b/src/osmo-bts-lc15/misc/lc15bts_led.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_led.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_led.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr.c b/src/osmo-bts-lc15/misc/lc15bts_mgr.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_mgr.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_mgr.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr.h b/src/osmo-bts-lc15/misc/lc15bts_mgr.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_mgr.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_mgr.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c b/src/osmo-bts-lc15/misc/lc15bts_mgr_calib.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_mgr_calib.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c b/src/osmo-bts-lc15/misc/lc15bts_mgr_nl.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_mgr_nl.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c b/src/osmo-bts-lc15/misc/lc15bts_mgr_temp.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_mgr_temp.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c b/src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_misc.c b/src/osmo-bts-lc15/misc/lc15bts_misc.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_misc.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_misc.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_misc.h b/src/osmo-bts-lc15/misc/lc15bts_misc.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_misc.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_misc.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_nl.c b/src/osmo-bts-lc15/misc/lc15bts_nl.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_nl.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_nl.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_nl.h b/src/osmo-bts-lc15/misc/lc15bts_nl.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_nl.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_nl.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.c b/src/osmo-bts-lc15/misc/lc15bts_par.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_par.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_par.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.h b/src/osmo-bts-lc15/misc/lc15bts_par.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_par.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_par.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_power.c b/src/osmo-bts-lc15/misc/lc15bts_power.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_power.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_power.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_power.h b/src/osmo-bts-lc15/misc/lc15bts_power.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_power.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_power.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_swd.c b/src/osmo-bts-lc15/misc/lc15bts_swd.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_swd.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_swd.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_swd.h b/src/osmo-bts-lc15/misc/lc15bts_swd.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_swd.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_swd.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_temp.c b/src/osmo-bts-lc15/misc/lc15bts_temp.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_temp.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_temp.c</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_temp.h b/src/osmo-bts-lc15/misc/lc15bts_temp.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_temp.h</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_temp.h</span><br><span>diff --git a/src/osmo-bts-litecell15/misc/lc15bts_util.c b/src/osmo-bts-lc15/misc/lc15bts_util.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/misc/lc15bts_util.c</span><br><span>rename to src/osmo-bts-lc15/misc/lc15bts_util.c</span><br><span>diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-lc15/oml.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/oml.c</span><br><span>rename to src/osmo-bts-lc15/oml.c</span><br><span>diff --git a/src/osmo-bts-litecell15/tch.c b/src/osmo-bts-lc15/tch.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/tch.c</span><br><span>rename to src/osmo-bts-lc15/tch.c</span><br><span>diff --git a/src/osmo-bts-litecell15/utils.c b/src/osmo-bts-lc15/utils.c</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/utils.c</span><br><span>rename to src/osmo-bts-lc15/utils.c</span><br><span>diff --git a/src/osmo-bts-litecell15/utils.h b/src/osmo-bts-lc15/utils.h</span><br><span>similarity index 100%</span><br><span>rename from src/osmo-bts-litecell15/utils.h</span><br><span>rename to src/osmo-bts-lc15/utils.h</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20955">change 20955</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/20955"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I55c073fbd01aee42871101401d76d87e7c91832e </div>
<div style="display:none"> Gerrit-Change-Number: 20955 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>