<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12611">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/l1ctl_link.c: use TRXCON_EV_L1CTL_REQ event<br><br>Change-Id: I9ad19c158397f73ab1b6639a34ce20fc7a7431b3<br>---<br>M src/host/trxcon/l1ctl_link.c<br>M src/host/trxcon/trxcon_fsm.c<br>2 files changed, 14 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/11/12611/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c</span><br><span>index 5a22c7e..aea23bd 100644</span><br><span>--- a/src/host/trxcon/l1ctl_link.c</span><br><span>+++ b/src/host/trxcon/l1ctl_link.c</span><br><span>@@ -113,8 +113,13 @@</span><br><span>       LOGP(DL1D, LOGL_DEBUG, "RX: '%s'\n",</span><br><span>               osmo_hexdump(msg->data, msg->len));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Call L1CTL handler */</span><br><span style="color: hsl(0, 100%, 40%);">-        l1ctl_rx_cb(l1l, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+        /* Pass a message to the parent FSM */</span><br><span style="color: hsl(120, 100%, 40%);">+        rc = osmo_fsm_inst_dispatch(l1l->fsm->proc.parent,</span><br><span style="color: hsl(120, 100%, 40%);">+              TRXCON_EV_L1CTL_REQ, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+             msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        return 0;</span><br><span> }</span><br><span>diff --git a/src/host/trxcon/trxcon_fsm.c b/src/host/trxcon/trxcon_fsm.c</span><br><span>index 69a2da1..f90f88b 100644</span><br><span>--- a/src/host/trxcon/trxcon_fsm.c</span><br><span>+++ b/src/host/trxcon/trxcon_fsm.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> </span><br><span> #include <logging.h></span><br><span> #include <trxcon.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <l1ctl.h></span><br><span> </span><br><span> static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi,</span><br><span>         uint32_t event, void *data)</span><br><span>@@ -44,6 +45,8 @@</span><br><span> static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi,</span><br><span>   uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+      struct trxcon_inst *trxcon = (struct trxcon_inst *) fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   switch ((enum trxcon_event_type) event) {</span><br><span>    case TRXCON_EV_L1CTL_DISCONNECT:</span><br><span>             /* TODO: reset TRX interface */</span><br><span>@@ -53,6 +56,10 @@</span><br><span>                 /* TODO: notify L1CTL interface */</span><br><span>           osmo_fsm_inst_state_chg(fi, TRXCON_ST_IDLE, 0, 0);</span><br><span>           break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case TRXCON_EV_L1CTL_REQ:</span><br><span style="color: hsl(120, 100%, 40%);">+             OSMO_ASSERT(data != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+            l1ctl_rx_cb(trxcon->l1l, (struct msgb *) data);</span><br><span style="color: hsl(120, 100%, 40%);">+            break;</span><br><span>       default:</span><br><span>             LOGPFSML(fi, LOGL_ERROR, "Unhandled event '%s'\n",</span><br><span>                         osmo_fsm_event_name(&trxcon_fsm_def, event));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12611">change 12611</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/12611"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9ad19c158397f73ab1b6639a34ce20fc7a7431b3 </div>
<div style="display:none"> Gerrit-Change-Number: 12611 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>