<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9525">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lc15: Use correct type for hLayer1 field<br><br>It also fixes a compilation warning in which a uint32_t is assigned to a<br>void pointer.<br><br>Change-Id: I21ea42274eabe854f3b236a22aeb70b93a280541<br>---<br>M src/osmo-bts-litecell15/l1_if.h<br>M src/osmo-bts-litecell15/oml.c<br>2 files changed, 11 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.h b/src/osmo-bts-litecell15/l1_if.h</span><br><span>index 7feee56..aac2607 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.h</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.h</span><br><span>@@ -10,6 +10,7 @@</span><br><span> #include <osmo-bts/phy_link.h></span><br><span> </span><br><span> #include <nrw/litecell15/gsml1prim.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <nrw/litecell15/gsml1types.h></span><br><span> </span><br><span> #include <stdbool.h></span><br><span> </span><br><span>@@ -37,7 +38,7 @@</span><br><span> </span><br><span> struct lc15l1_hdl {</span><br><span> struct gsm_time gsm_time;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t hLayer1; /* handle to the L1 instance in the DSP */</span><br><span style="color: hsl(120, 100%, 40%);">+ HANDLE hLayer1; /* handle to the L1 instance in the DSP */</span><br><span> uint32_t dsp_trace_f; /* currently operational DSP trace flags */</span><br><span> struct llist_head wlc_list;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c</span><br><span>index 2c3002b..7a5fa1b 100644</span><br><span>--- a/src/osmo-bts-litecell15/oml.c</span><br><span>+++ b/src/osmo-bts-litecell15/oml.c</span><br><span>@@ -114,31 +114,31 @@</span><br><span> prim->u.mphInitReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphCloseReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphCloseReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphCloseReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphCloseReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphConnectReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphConnectReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphConnectReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphConnectReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphDisconnectReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphDisconnectReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphDisconnectReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphDisconnectReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphActivateReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphActivateReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphActivateReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphActivateReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphDeactivateReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphDeactivateReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphDeactivateReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphDeactivateReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphConfigReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphConfigReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphConfigReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphConfigReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphMeasureReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.mphMeasureReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.mphMeasureReq.hLayer1 = gl1->hLayer1;</span><br><span> prim->u.mphMeasureReq.hLayer3 = hLayer3;</span><br><span> break;</span><br><span> case GsmL1_PrimId_MphInitCnf:</span><br><span>@@ -170,10 +170,10 @@</span><br><span> case GsmL1_PrimId_MphSyncInd:</span><br><span> break;</span><br><span> case GsmL1_PrimId_PhEmptyFrameReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.phEmptyFrameReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.phEmptyFrameReq.hLayer1 = gl1->hLayer1;</span><br><span> break;</span><br><span> case GsmL1_PrimId_PhDataReq:</span><br><span style="color: hsl(0, 100%, 40%);">- prim->u.phDataReq.hLayer1 = (HANDLE)gl1->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->u.phDataReq.hLayer1 = gl1->hLayer1;</span><br><span> break;</span><br><span> case GsmL1_PrimId_PhConnectInd:</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9525">change 9525</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/9525"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I21ea42274eabe854f3b236a22aeb70b93a280541 </div>
<div style="display:none"> Gerrit-Change-Number: 9525 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>