<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22428">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: drop the public prefix gprs_ from all static functions/structs/..<br><br>Change-Id: I6ba0599e5a6d6fabf93851dd3ec7716f2ef2d840<br>---<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_message.c<br>M src/gb/gprs_ns2_vc_fsm.c<br>3 files changed, 53 insertions(+), 53 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/22428/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index cc8500f..5047af0 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -393,9 +393,9 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_find_vc_by_dlci(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t dlci,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_vc **result)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_find_vc_by_dlci(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t dlci,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc **result)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct priv_vc *vcpriv;</span><br><span>@@ -434,7 +434,7 @@</span><br><span> goto out;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = gprs_ns2_find_vc_by_dlci(bind, dlci, &nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns2_find_vc_by_dlci(bind, dlci, &nsvc);</span><br><span> if (rc) {</span><br><span> /* VC not found */</span><br><span> rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);</span><br><span>diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c</span><br><span>index a185f3b..c525dd7 100644</span><br><span>--- a/src/gb/gprs_ns2_message.c</span><br><span>+++ b/src/gb/gprs_ns2_message.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span> {</span><br><span> if (!TLVP_PRES_LEN(tp, NS_IE_CAUSE, 1) ||</span><br><span> !TLVP_PRES_LEN(tp, NS_IE_VCI, 2) || !TLVP_PRES_LEN(tp, NS_IE_NSEI, 2)) {</span><br><span>@@ -74,7 +74,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_validate_reset_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span> {</span><br><span> if (!TLVP_PRES_LEN(tp, NS_IE_VCI, 2) || !TLVP_PRES_LEN(tp, NS_IE_NSEI, 2)) {</span><br><span> *cause = NS_CAUSE_MISSING_ESSENT_IE;</span><br><span>@@ -84,7 +84,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_validate_block(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_validate_block(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span> {</span><br><span> if (!TLVP_PRES_LEN(tp, NS_IE_VCI, 2) || !TLVP_PRES_LEN(tp, NS_IE_CAUSE, 1)) {</span><br><span> *cause = NS_CAUSE_MISSING_ESSENT_IE;</span><br><span>@@ -94,7 +94,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_validate_block_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_validate_block_ack(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span> {</span><br><span> if (!TLVP_PRES_LEN(tp, NS_IE_VCI, 2)) {</span><br><span> *cause = NS_CAUSE_MISSING_ESSENT_IE;</span><br><span>@@ -104,7 +104,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_validate_status(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_validate_status(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause)</span><br><span> {</span><br><span> </span><br><span> if (!TLVP_PRES_LEN(tp, NS_IE_CAUSE, 1)) {</span><br><span>@@ -157,15 +157,15 @@</span><br><span> {</span><br><span> switch (pdu_type) {</span><br><span> case NS_PDUT_RESET:</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns2_validate_reset(nsvc, msg, tp, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_validate_reset(nsvc, msg, tp, cause);</span><br><span> case NS_PDUT_RESET_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns2_validate_reset_ack(nsvc, msg, tp, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_validate_reset_ack(nsvc, msg, tp, cause);</span><br><span> case NS_PDUT_BLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns2_validate_block(nsvc, msg, tp, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_validate_block(nsvc, msg, tp, cause);</span><br><span> case NS_PDUT_BLOCK_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns2_validate_block_ack(nsvc, msg, tp, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_validate_block_ack(nsvc, msg, tp, cause);</span><br><span> case NS_PDUT_STATUS:</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns2_validate_status(nsvc, msg, tp, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_validate_status(nsvc, msg, tp, cause);</span><br><span> </span><br><span> /* following PDUs doesn't have any payloads */</span><br><span> case NS_PDUT_ALIVE:</span><br><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index d18983a..7ee29a1 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -121,7 +121,7 @@</span><br><span> GPRS_NS2_EV_REQ_OM_UNBLOCK, /* vty cmd: unblock*/</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string gprs_ns2_vc_event_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string ns2_vc_event_names[] = {</span><br><span> { GPRS_NS2_EV_REQ_START, "START" },</span><br><span> { GPRS_NS2_EV_RX_RESET, "RESET" },</span><br><span> { GPRS_NS2_EV_RX_RESET_ACK, "RESET_ACK" },</span><br><span>@@ -224,7 +224,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> struct gprs_ns2_inst *nsi = priv->nsvc->nse->nsi;</span><br><span>@@ -250,7 +250,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_reset_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_reset_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span>@@ -265,7 +265,7 @@</span><br><span> ns2_nse_notify_unblocked(priv->nsvc, false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi);</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span>@@ -292,7 +292,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_blocked_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_blocked_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span>@@ -313,7 +313,7 @@</span><br><span> start_test_procedure(priv);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_blocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_blocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span>@@ -364,7 +364,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_unblocked_on_enter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_unblocked_on_enter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> struct gprs_ns2_vc *nsvc = priv->nsvc;</span><br><span>@@ -375,7 +375,7 @@</span><br><span> ns2_prim_status_ind(nse, nsvc, 0, NS_AFF_CAUSE_VC_RECOVERY);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span>@@ -392,7 +392,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_alive(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_alive(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_RX_ALIVE_ACK:</span><br><span>@@ -401,7 +401,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_alive_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_alive_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi);</span><br><span>@@ -416,17 +416,17 @@</span><br><span> ns2_nse_notify_unblocked(priv->nsvc, false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_st_alive_onleave(struct osmo_fsm_inst *fi, uint32_t next_state)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_st_alive_onleave(struct osmo_fsm_inst *fi, uint32_t next_state)</span><br><span> {</span><br><span> start_test_procedure(fi->priv);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_fsm_state gprs_ns2_vc_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct osmo_fsm_state ns2_vc_states[] = {</span><br><span> [GPRS_NS2_ST_UNCONFIGURED] = {</span><br><span> .in_event_mask = S(GPRS_NS2_EV_REQ_START),</span><br><span> .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE),</span><br><span> .name = "UNCONFIGURED",</span><br><span style="color: hsl(0, 100%, 40%);">- .action = gprs_ns2_st_unconfigured,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = ns2_st_unconfigured,</span><br><span> },</span><br><span> [GPRS_NS2_ST_RESET] = {</span><br><span> .in_event_mask = S(GPRS_NS2_EV_RX_RESET_ACK) | S(GPRS_NS2_EV_RX_RESET),</span><br><span>@@ -434,8 +434,8 @@</span><br><span> S(GPRS_NS2_ST_BLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span> .name = "RESET",</span><br><span style="color: hsl(0, 100%, 40%);">- .action = gprs_ns2_st_reset,</span><br><span style="color: hsl(0, 100%, 40%);">- .onenter = gprs_ns2_st_reset_onenter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = ns2_st_reset,</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = ns2_st_reset_onenter,</span><br><span> },</span><br><span> [GPRS_NS2_ST_BLOCKED] = {</span><br><span> .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_BLOCK_ACK) |</span><br><span>@@ -445,8 +445,8 @@</span><br><span> S(GPRS_NS2_ST_BLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span> .name = "BLOCKED",</span><br><span style="color: hsl(0, 100%, 40%);">- .action = gprs_ns2_st_blocked,</span><br><span style="color: hsl(0, 100%, 40%);">- .onenter = gprs_ns2_st_blocked_onenter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = ns2_st_blocked,</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = ns2_st_blocked_onenter,</span><br><span> },</span><br><span> [GPRS_NS2_ST_UNBLOCKED] = {</span><br><span> .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK) |</span><br><span>@@ -455,8 +455,8 @@</span><br><span> S(GPRS_NS2_ST_BLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span> .name = "UNBLOCKED",</span><br><span style="color: hsl(0, 100%, 40%);">- .action = gprs_ns2_st_unblocked,</span><br><span style="color: hsl(0, 100%, 40%);">- .onenter = gprs_ns2_st_unblocked_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = ns2_st_unblocked,</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = ns2_st_unblocked_on_enter,</span><br><span> },</span><br><span> </span><br><span> /* ST_ALIVE is only used on VC without RESET/BLOCK */</span><br><span>@@ -466,13 +466,13 @@</span><br><span> S(GPRS_NS2_ST_UNBLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span> .name = "ALIVE",</span><br><span style="color: hsl(0, 100%, 40%);">- .action = gprs_ns2_st_alive,</span><br><span style="color: hsl(0, 100%, 40%);">- .onenter = gprs_ns2_st_alive_onenter,</span><br><span style="color: hsl(0, 100%, 40%);">- .onleave = gprs_ns2_st_alive_onleave,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = ns2_st_alive,</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = ns2_st_alive_onenter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .onleave = ns2_st_alive_onleave,</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gprs_ns2_vc_fsm_timer_cb(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_vc_fsm_timer_cb(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span> struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi);</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span>@@ -524,7 +524,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_recv_unitdata(struct osmo_fsm_inst *fi,</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_recv_unitdata(struct osmo_fsm_inst *fi,</span><br><span> struct msgb *msg)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span>@@ -558,7 +558,7 @@</span><br><span> nsi->cb(&nsp.oph, nsi->cb_data);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_vc_fsm_allstate_action(struct osmo_fsm_inst *fi,</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_vc_fsm_allstate_action(struct osmo_fsm_inst *fi,</span><br><span> uint32_t event,</span><br><span> void *data)</span><br><span> {</span><br><span>@@ -577,7 +577,7 @@</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET);</span><br><span> }</span><br><span> /* pass the event down into FSM action */</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_st_reset(fi, event, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_st_reset(fi, event, data);</span><br><span> break;</span><br><span> case GPRS_NS2_EV_RX_ALIVE:</span><br><span> switch (fi->state) {</span><br><span>@@ -592,7 +592,7 @@</span><br><span> case GPRS_NS2_EV_RX_ALIVE_ACK:</span><br><span> /* for VCs without RESET/BLOCK/UNBLOCK, the connections comes after ALIVE_ACK unblocked */</span><br><span> if (fi->state == GPRS_NS2_ST_ALIVE)</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_st_alive(fi, event, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_st_alive(fi, event, data);</span><br><span> else</span><br><span> recv_test_procedure(fi);</span><br><span> break;</span><br><span>@@ -606,7 +606,7 @@</span><br><span> case GPRS_NS2_ST_BLOCKED:</span><br><span> /* 7.2.1: the BLOCKED_ACK might be lost */</span><br><span> if (priv->accept_unitdata) {</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_recv_unitdata(fi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_recv_unitdata(fi, msg);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -617,7 +617,7 @@</span><br><span> /* ALIVE can receive UNITDATA if the ALIVE_ACK is lost */</span><br><span> case GPRS_NS2_ST_ALIVE:</span><br><span> case GPRS_NS2_ST_UNBLOCKED:</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_recv_unitdata(fi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_recv_unitdata(fi, msg);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -648,7 +648,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gprs_ns2_vc_fsm_clean(struct osmo_fsm_inst *fi,</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_vc_fsm_clean(struct osmo_fsm_inst *fi,</span><br><span> enum osmo_fsm_term_cause cause)</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span>@@ -656,10 +656,10 @@</span><br><span> osmo_timer_del(&priv->alive.timer);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_fsm gprs_ns2_vc_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_fsm ns2_vc_fsm = {</span><br><span> .name = "GPRS-NS2-VC",</span><br><span style="color: hsl(0, 100%, 40%);">- .states = gprs_ns2_vc_states,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_states = ARRAY_SIZE(gprs_ns2_vc_states),</span><br><span style="color: hsl(120, 100%, 40%);">+ .states = ns2_vc_states,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_states = ARRAY_SIZE(ns2_vc_states),</span><br><span> .allstate_event_mask = S(GPRS_NS2_EV_RX_UNITDATA) |</span><br><span> S(GPRS_NS2_EV_RX_RESET) |</span><br><span> S(GPRS_NS2_EV_RX_ALIVE) |</span><br><span>@@ -667,11 +667,11 @@</span><br><span> S(GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED) |</span><br><span> S(GPRS_NS2_EV_REQ_OM_BLOCK) |</span><br><span> S(GPRS_NS2_EV_REQ_OM_UNBLOCK),</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_action = gprs_ns2_vc_fsm_allstate_action,</span><br><span style="color: hsl(0, 100%, 40%);">- .cleanup = gprs_ns2_vc_fsm_clean,</span><br><span style="color: hsl(0, 100%, 40%);">- .timer_cb = gprs_ns2_vc_fsm_timer_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = ns2_vc_fsm_allstate_action,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cleanup = ns2_vc_fsm_clean,</span><br><span style="color: hsl(120, 100%, 40%);">+ .timer_cb = ns2_vc_fsm_timer_cb,</span><br><span> /* .log_subsys = DNS, "is not constant" */</span><br><span style="color: hsl(0, 100%, 40%);">- .event_names = gprs_ns2_vc_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .event_names = ns2_vc_event_names,</span><br><span> .pre_term = NULL,</span><br><span> .log_subsys = DLNS,</span><br><span> };</span><br><span>@@ -690,7 +690,7 @@</span><br><span> struct osmo_fsm_inst *fi;</span><br><span> struct gprs_ns2_vc_priv *priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fi = osmo_fsm_inst_alloc(&gprs_ns2_vc_fsm, nsvc, NULL, LOGL_DEBUG, id);</span><br><span style="color: hsl(120, 100%, 40%);">+ fi = osmo_fsm_inst_alloc(&ns2_vc_fsm, nsvc, NULL, LOGL_DEBUG, id);</span><br><span> if (!fi)</span><br><span> return fi;</span><br><span> </span><br><span>@@ -839,5 +839,5 @@</span><br><span> /* initialize osmo_ctx on main tread */</span><br><span> static __attribute__((constructor)) void on_dso_load_ctx(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(osmo_fsm_register(&gprs_ns2_vc_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(osmo_fsm_register(&ns2_vc_fsm) == 0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22428">change 22428</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/22428"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6ba0599e5a6d6fabf93851dd3ec7716f2ef2d840 </div>
<div style="display:none"> Gerrit-Change-Number: 22428 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>