[MERGED] osmocom-bb[fixeria/trx]: trxcon: Define event names for osmo_fsm's

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Mar 1 10:48:13 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: trxcon: Define event names for osmo_fsm's
......................................................................


trxcon: Define event names for osmo_fsm's

Change-Id: Id3279e99966a0ab236923c497ac0abbc9ed2c93c
---
M src/host/trxcon/l1ctl_link.c
M src/host/trxcon/trx_if.c
M src/host/trxcon/trxcon.c
3 files changed, 19 insertions(+), 0 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c
index 3905654..596a9d1 100644
--- a/src/host/trxcon/l1ctl_link.c
+++ b/src/host/trxcon/l1ctl_link.c
@@ -45,6 +45,10 @@
 #include "l1ctl_link.h"
 #include "l1ctl.h"
 
+static struct value_string l1ctl_evt_names[] = {
+	{ 0, NULL } /* no events? */
+};
+
 static struct osmo_fsm_state l1ctl_fsm_states[] = {
 	[L1CTL_STATE_IDLE] = {
 		.out_state_mask = GEN_MASK(L1CTL_STATE_CONNECTED),
@@ -61,6 +65,7 @@
 	.states = l1ctl_fsm_states,
 	.num_states = ARRAY_SIZE(l1ctl_fsm_states),
 	.log_subsys = DL1C,
+	.event_names = l1ctl_evt_names,
 };
 
 static int l1ctl_link_read_cb(struct osmo_fd *bfd)
diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c
index 6ee75d3..98e3cdd 100644
--- a/src/host/trxcon/trx_if.c
+++ b/src/host/trxcon/trx_if.c
@@ -45,6 +45,10 @@
 #include "logging.h"
 #include "scheduler.h"
 
+static struct value_string trx_evt_names[] = {
+	{ 0, NULL } /* no events? */
+};
+
 static struct osmo_fsm_state trx_fsm_states[] = {
 	[TRX_STATE_OFFLINE] = {
 		.out_state_mask = (
@@ -76,6 +80,7 @@
 	.states = trx_fsm_states,
 	.num_states = ARRAY_SIZE(trx_fsm_states),
 	.log_subsys = DTRX,
+	.event_names = trx_evt_names,
 };
 
 static int trx_udp_open(void *priv, struct osmo_fd *ofd, const char *host,
diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c
index 0250b72..60db887 100644
--- a/src/host/trxcon/trxcon.c
+++ b/src/host/trxcon/trxcon.c
@@ -125,11 +125,20 @@
 	},
 };
 
+static const struct value_string app_evt_names[] = {
+	OSMO_VALUE_STRING(L1CTL_EVENT_CONNECT),
+	OSMO_VALUE_STRING(L1CTL_EVENT_DISCONNECT),
+	OSMO_VALUE_STRING(TRX_EVENT_OFFLINE),
+	OSMO_VALUE_STRING(TRX_EVENT_RSP_ERROR),
+	{ 0, NULL }
+};
+
 static struct osmo_fsm trxcon_fsm_def = {
 	.name = "trxcon_app_fsm",
 	.states = trxcon_fsm_states,
 	.num_states = ARRAY_SIZE(trxcon_fsm_states),
 	.log_subsys = DAPP,
+	.event_names = app_evt_names,
 };
 
 static void print_usage(const char *app)

-- 
To view, visit https://gerrit.osmocom.org/7009
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3279e99966a0ab236923c497ac0abbc9ed2c93c
Gerrit-PatchSet: 2
Gerrit-Project: osmocom-bb
Gerrit-Branch: fixeria/trx
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>



More information about the gerrit-log mailing list