diff options
author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-11-19 15:41:19 +0700 |
---|---|---|
committer | Vadim Yanitskiy <axilirator@gmail.com> | 2017-11-19 17:35:07 +0700 |
commit | e8cf6c4eefbd7429b76da0878672d00143412ae1 (patch) | |
tree | 554b4e960d82fb2f22f6296ac1c7c9c36a6a9554 /src | |
parent | ac764e78fd1f14e29b7a686697a5c459c58f3f8b (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
Diffstat (limited to 'src')
-rw-r--r-- | src/host/trxcon/l1ctl_link.c | 2 | ||||
-rw-r--r-- | src/host/trxcon/trx_if.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index 3bbdf34b..39056547 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 6a84af62..d7f496eb 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; |