<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14259">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-oc2g: Fix status LED responsibilities<br><br>osmo-bts-oc2g no longer modifies the status LED and instead leaves that<br>to the bts manager. The service file now also creates a directory in<br>/var/run needed for osmo-bts to communicate with oc2gbts-mgr. This<br>status file is used by oc2gbts-mgr to figure out when the bts is<br>operational.<br><br>Related: SYS#4493<br>Change-Id: Ifae634c6c2ecec7d32298c0f266f91f3e81308f5<br>---<br>M contrib/systemd/osmo-bts-oc2g.service<br>M src/osmo-bts-oc2g/main.c<br>2 files changed, 3 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service</span><br><span>index 7b0168a..860aeb1 100644</span><br><span>--- a/contrib/systemd/osmo-bts-oc2g.service</span><br><span>+++ b/contrib/systemd/osmo-bts-oc2g.service</span><br><span>@@ -3,11 +3,8 @@</span><br><span> </span><br><span> [Service]</span><br><span> Type=simple</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness'</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness'</span><br><span> ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts-oc2g.cfg -M</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness'</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness'</span><br><span style="color: hsl(120, 100%, 40%);">+RuntimeDirectory=osmo-bts</span><br><span> Restart=always</span><br><span> RestartSec=2</span><br><span> RestartPreventExitStatus=1</span><br><span>diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c</span><br><span>index 29fab47..5b66c6f 100644</span><br><span>--- a/src/osmo-bts-oc2g/main.c</span><br><span>+++ b/src/osmo-bts-oc2g/main.c</span><br><span>@@ -151,24 +151,16 @@</span><br><span> {</span><br><span>        static uint64_t states = 0;</span><br><span>  uint64_t old_states = states;</span><br><span style="color: hsl(0, 100%, 40%);">-   int led_rf_active_on;</span><br><span> </span><br><span>    if (on)</span><br><span>              states |= (1ULL << which);</span><br><span>     else</span><br><span>                 states &= ~(1ULL << which);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       led_rf_active_on =</span><br><span style="color: hsl(0, 100%, 40%);">-              (states & (1ULL << BTS_STATUS_RF_ACTIVE)) &&</span><br><span style="color: hsl(0, 100%, 40%);">-          !(states & (1ULL << BTS_STATUS_RF_MUTE));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>  LOGP(DL1C, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">-        "Set global status #%d to %d (%04llx -> %04llx), LEDs: ACT %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+        "Set global status #%d to %d (%04llx -> %04llx)\n",</span><br><span>             which, on,</span><br><span style="color: hsl(0, 100%, 40%);">-      (long long)old_states, (long long)states,</span><br><span style="color: hsl(0, 100%, 40%);">-       led_rf_active_on);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oc2gbts_led_set(led_rf_active_on ? LED_GREEN : LED_OFF);</span><br><span style="color: hsl(120, 100%, 40%);">+           (long long)old_states, (long long)states);</span><br><span> }</span><br><span> </span><br><span> void bts_model_print_help()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14259">change 14259</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/14259"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifae634c6c2ecec7d32298c0f266f91f3e81308f5 </div>
<div style="display:none"> Gerrit-Change-Number: 14259 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daniel Willmann <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Daniel Willmann <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>