aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Willmann <dwillmann@sysmocom.de>2019-05-24 12:31:15 +0200
committerDaniel Willmann <dwillmann@sysmocom.de>2019-05-29 17:35:57 +0200
commit5abae93dadf37a2b4876fc899463185fb04d561c (patch)
tree9a2a4f18676ecd036a138929c96e80f72e47ba9f
parent34711de016d0e074200c543e432fa0fa153d9d1a (diff)
osmo-bts-lc15: Change LED behaviour to be the same as oc2g
It looks like the status LED on the sysmobts2100 never worked correctly since lc15bts-mgr expects osmo-bts-lc15 to create and manage /var/run/osmo-bts/state, but there is nothing to do so in osmo-bts. This patch copies the functions from oc2g to manage the state file in lc15. Change-Id: Iad32a22fc72e2aba45e4f1b9ae585f6e0b8757ed Related: SYS#4493
-rw-r--r--contrib/systemd/osmo-bts-lc15.service5
-rw-r--r--src/osmo-bts-litecell15/main.c40
2 files changed, 31 insertions, 14 deletions
diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service
index 90e7fc2..7c51110 100644
--- a/contrib/systemd/osmo-bts-lc15.service
+++ b/contrib/systemd/osmo-bts-lc15.service
@@ -3,11 +3,8 @@ Description=osmo-bts for LC15 / sysmoBTS 2100
[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-lc15 -t 2 -s -c /etc/osmocom/osmo-bts-lc15.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-litecell15/main.c b/src/osmo-bts-litecell15/main.c
index e4f9a56..c47d76d 100644
--- a/src/osmo-bts-litecell15/main.c
+++ b/src/osmo-bts-litecell15/main.c
@@ -51,6 +51,25 @@
#include <osmo-bts/pcu_if.h>
#include <osmo-bts/l1sap.h>
+static int write_status_file(char *status_file, char *status_str)
+{
+ FILE *outf;
+ char tmp[PATH_MAX+1];
+
+ snprintf(tmp, sizeof(tmp)-1, "/var/run/osmo-bts/%s", status_file);
+ tmp[PATH_MAX-1] = '\0';
+
+ outf = fopen(tmp, "w");
+ if (!outf)
+ return -1;
+
+ fprintf(outf, "%s\n", status_str);
+
+ fclose(outf);
+
+ return 0;
+}
+
/*NTQD: Change how rx_nr is handle in multi-trx*/
#define LC15BTS_RF_LOCK_PATH "/var/lock/bts_rf_lock"
@@ -116,6 +135,9 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst)
int bts_model_oml_estab(struct gsm_bts *bts)
{
+ /* update status file */
+ write_status_file("state", "");
+
return 0;
}
@@ -123,24 +145,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)",
which, on,
- (long long)old_states, (long long)states,
- led_rf_active_on);
-
- lc15bts_led_set(led_rf_active_on ? LED_GREEN : LED_OFF);
+ (long long)old_states, (long long)states);
}
void bts_model_print_help()
@@ -197,11 +211,17 @@ int bts_model_handle_options(int argc, char **argv)
void bts_model_abis_close(struct gsm_bts *bts)
{
+ /* write to status file */
+ write_status_file("state", "ABIS DOWN");
+
/* for now, we simply terminate the program and re-spawn */
bts_shutdown(bts, "Abis close");
}
int main(int argc, char **argv)
{
+ /* create status file with initial state */
+ write_status_file("state", "ABIS DOWN");
+
return bts_main(argc, argv);
}