diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2019-05-23 17:59:12 +0200 |
|---|---|---|
| committer | Daniel Willmann <dwillmann@sysmocom.de> | 2019-05-24 12:45:33 +0200 |
| commit | e7f35eec80ce9f939d9f78717640d63c35f171fd (patch) | |
| tree | 0f22af4c3d4c9b23c2fc5c57c8dda8846e51190d | |
| parent | 482564b422096115aa9eaa2c6599fea9168b49e2 (diff) | |
osmo-bts-oc2g: Fix status LED responsibilities
osmo-bts-oc2g no longer modifies the status LED and instead leaves that
to the bts manager. The service file now also creates a directory in
/var/run needed for osmo-bts to communicate with oc2gbts-mgr. This
status file is used by oc2gbts-mgr to figure out when the bts is
operational.
Related: SYS#4493
Change-Id: Ifae634c6c2ecec7d32298c0f266f91f3e81308f5
| -rw-r--r-- | contrib/systemd/osmo-bts-oc2g.service | 5 | ||||
| -rw-r--r-- | src/osmo-bts-oc2g/main.c | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index 7b0168ad..860aeb1f 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -3,11 +3,8 @@ Description=osmo-bts for OC-2G [Service] Type=simple -ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' -ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts-oc2g.cfg -M -ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' -ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' +RuntimeDirectory=osmo-bts Restart=always RestartSec=2 RestartPreventExitStatus=1 diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 29fab474..5b66c6f3 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -151,24 +151,16 @@ void bts_update_status(enum bts_global_status which, int on) { static uint64_t states = 0; uint64_t old_states = states; - int led_rf_active_on; if (on) states |= (1ULL << which); else states &= ~(1ULL << which); - led_rf_active_on = - (states & (1ULL << BTS_STATUS_RF_ACTIVE)) && - !(states & (1ULL << BTS_STATUS_RF_MUTE)); - LOGP(DL1C, LOGL_INFO, - "Set global status #%d to %d (%04llx -> %04llx), LEDs: ACT %d\n", + "Set global status #%d to %d (%04llx -> %04llx)\n", which, on, - (long long)old_states, (long long)states, - led_rf_active_on); - - oc2gbts_led_set(led_rf_active_on ? LED_GREEN : LED_OFF); + (long long)old_states, (long long)states); } void bts_model_print_help() |