summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2017-11-19 15:41:19 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2017-11-19 15:55:34 +0700
commitfb06462d3c9c93f730c4234f9f062fd18b0bf5f2 (patch)
tree4c11edd6cd0a4d80ea21326ad6a78f934220efef
parentd7afb9f8d71b89474b2c37095c4b938efbbcf3fc (diff)
host/trxcon: fix: use valid names for FSM instances
Since 8c4f5457 in libosmocore there are some limitations on FSM and FSM instance names. This change adjusts the names of both l1ctl_fsm and trx_fsm instances. Change-Id: Icaaac3f51bdcfe4f7723060179b8730c3a06529b
-rw-r--r--src/host/trxcon/l1ctl_link.c2
-rw-r--r--src/host/trxcon/trx_if.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c
index 3bbdf34..3905654 100644
--- a/src/host/trxcon/l1ctl_link.c
+++ b/src/host/trxcon/l1ctl_link.c
@@ -268,7 +268,7 @@ int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path)
/* Allocate a new dedicated state machine */
osmo_fsm_register(&l1ctl_fsm);
l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new,
- NULL, LOGL_DEBUG, sock_path);
+ NULL, LOGL_DEBUG, "l1ctl_link");
*l1l = l1l_new;
diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c
index 6a84af6..d7f496e 100644
--- a/src/host/trxcon/trx_if.c
+++ b/src/host/trxcon/trx_if.c
@@ -628,7 +628,6 @@ int trx_if_tx_burst(struct trx_instance *trx, uint8_t tn, uint32_t fn,
int trx_if_open(struct trx_instance **trx, const char *host, uint16_t port)
{
struct trx_instance *trx_new;
- char *inst_name;
int rc;
LOGP(DTRX, LOGL_NOTICE, "Init transceiver interface\n");
@@ -656,10 +655,8 @@ int trx_if_open(struct trx_instance **trx, const char *host, uint16_t port)
/* Allocate a new dedicated state machine */
osmo_fsm_register(&trx_fsm);
- inst_name = talloc_asprintf(trx_new, "%s:%u", host, port);
trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new,
- NULL, LOGL_DEBUG, inst_name);
- talloc_free(inst_name);
+ NULL, LOGL_DEBUG, "trx_interface");
*trx = trx_new;