<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9531">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lc15: Fix several u32 vs HANDLE compile warnings<br><br>Change-Id: I4193ad5fdb70ea01acb7c33656ea7bfd3fe62916<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-litecell15/l1_if.h<br>M src/osmo-bts-litecell15/oml.c<br>3 files changed, 23 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/9531/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index e6cdfd4..c20d3a5 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -946,7 +946,7 @@</span><br><span> </span><br><span> </span><br><span> DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(lc15bts_l1sapi_names, data_ind->sapi), (uint32_t)data_ind->hLayer2,</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(lc15bts_l1sapi_names, data_ind->sapi), (uint32_t)(intptr_t)data_ind->hLayer2,</span><br><span> osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size));</span><br><span> dump_meas_res(LOGL_DEBUG, &data_ind->measParam);</span><br><span> </span><br><span>@@ -1027,7 +1027,7 @@</span><br><span> .acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ra_ind->hLayer2);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = l1if_hLayer_to_lchan(trx, ra_ind->hLayer2);</span><br><span> if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||</span><br><span> lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span> lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.h b/src/osmo-bts-litecell15/l1_if.h</span><br><span>index aac2607..07fbb42 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>@@ -86,8 +86,8 @@</span><br><span> struct msgb *l1p_msgb_alloc(void);</span><br><span> struct msgb *sysp_msgb_alloc(void);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t l1if_lchan_to_hLayer(struct gsm_lchan *lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_lchan *l1if_hLayer_to_lchan(struct gsm_bts_trx *trx, uint32_t hLayer);</span><br><span style="color: hsl(120, 100%, 40%);">+HANDLE l1if_lchan_to_hLayer(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_lchan *l1if_hLayer_to_lchan(struct gsm_bts_trx *trx, HANDLE hLayer);</span><br><span> </span><br><span> /* tch.c */</span><br><span> int l1if_tch_encode(struct gsm_lchan *lchan, uint8_t *data, uint8_t *len,</span><br><span>diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c</span><br><span>index da6c60e..56f6dd3 100644</span><br><span>--- a/src/osmo-bts-litecell15/oml.c</span><br><span>+++ b/src/osmo-bts-litecell15/oml.c</span><br><span>@@ -23,6 +23,8 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> #include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span>@@ -106,7 +108,7 @@</span><br><span> prim->id = id;</span><br><span> </span><br><span> osmo_static_assert(sizeof(HANDLE) >= 4, l1p_handle_is_at_least_32bit);</span><br><span style="color: hsl(0, 100%, 40%);">- hLayer3 = (void*)hLayer3_uint32;</span><br><span style="color: hsl(120, 100%, 40%);">+ hLayer3 = (void*)(intptr_t)hLayer3_uint32;</span><br><span> </span><br><span> switch (id) {</span><br><span> case GsmL1_PrimId_MphInitReq:</span><br><span>@@ -425,7 +427,7 @@</span><br><span> {</span><br><span> struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(trx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return fl1h->hLayer1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return (uint32_t)(intptr_t)fl1h->hLayer1;</span><br><span> }</span><br><span> </span><br><span> static int trx_close_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,</span><br><span>@@ -793,10 +795,10 @@</span><br><span> GsmL1_MphActivateCnf_t *ic = &l1p->u.mphActivateCnf;</span><br><span> </span><br><span> /* get the lchan from the information we supplied */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ic->hLayer3);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = l1if_hLayer_to_lchan(trx, ic->hLayer3);</span><br><span> if (!lchan) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Failed to find lchan for hLayer3=0x%x\n", (uint32_t)ic->hLayer3);</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to find lchan for hLayer3=0x%"PRIx32"\n", (uint32_t)(intptr_t)ic->hLayer3);</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span>@@ -847,21 +849,22 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t l1if_lchan_to_hLayer(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+HANDLE l1if_lchan_to_hLayer(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return 0xBB</span><br><span style="color: hsl(120, 100%, 40%);">+ return (HANDLE)(intptr_t)(0xBB</span><br><span> | (lchan->nr << 8)</span><br><span> | (lchan->ts->nr << 16)</span><br><span style="color: hsl(0, 100%, 40%);">- | (lchan->ts->trx->nr << 24);</span><br><span style="color: hsl(120, 100%, 40%);">+ | (lchan->ts->trx->nr << 24));</span><br><span> }</span><br><span> </span><br><span> /* obtain a ptr to the lapdm_channel for a given hLayer */</span><br><span> struct gsm_lchan *</span><br><span style="color: hsl(0, 100%, 40%);">-l1if_hLayer_to_lchan(struct gsm_bts_trx *trx, uint32_t hLayer2)</span><br><span style="color: hsl(120, 100%, 40%);">+l1if_hLayer_to_lchan(struct gsm_bts_trx *trx, HANDLE hLayer2)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t magic = hLayer2 & 0xff;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts_nr = (hLayer2 >> 16) & 0xff;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t lchan_nr = (hLayer2 >> 8)& 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t hLayer2_u32 = (uint32_t)(intptr_t)hLayer2;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t magic = hLayer2_u32 & 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts_nr = (hLayer2_u32 >> 16) & 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lchan_nr = (hLayer2_u32 >> 8)& 0xff;</span><br><span> struct gsm_bts_trx_ts *ts;</span><br><span> </span><br><span> if (magic != 0xBB)</span><br><span>@@ -1062,7 +1065,7 @@</span><br><span> }</span><br><span> </span><br><span> LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.req (hL2=0x%08x, %s ",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), (uint32_t)act_req->hLayer2,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), (uint32_t)(intptr_t)act_req->hLayer2,</span><br><span> get_value_string(lc15bts_l1sapi_names, act_req->sapi));</span><br><span> LOGPC(DL1C, LOGL_INFO, "%s)\n",</span><br><span> get_value_string(lc15bts_dir_names, act_req->dir));</span><br><span>@@ -1235,10 +1238,10 @@</span><br><span> GsmL1_MphConfigCnf_t *cc = &l1p->u.mphConfigCnf;</span><br><span> </span><br><span> /* get the lchan from the information we supplied */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = l1if_hLayer_to_lchan(trx, (uint32_t)cc->hLayer3);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = l1if_hLayer_to_lchan(trx, cc->hLayer3);</span><br><span> if (!lchan) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Failed to find lchan for hLayer3=0x%x\n", (uint32_t)cc->hLayer3);</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to find lchan for hLayer3=0x%"PRIx32"\n", (uint32_t)(intptr_t)cc->hLayer3);</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span>@@ -1470,10 +1473,10 @@</span><br><span> GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg);</span><br><span> GsmL1_MphDeactivateCnf_t *ic = &l1p->u.mphDeactivateCnf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ic->hLayer3);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = l1if_hLayer_to_lchan(trx, ic->hLayer3);</span><br><span> if (!lchan) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Failed to find lchan for hLayer3=0x%x\n", (uint32_t)ic->hLayer3);</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to find lchan for hLayer3=0x%"PRIx32"\n", (uint32_t)(intptr_t)ic->hLayer3);</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9531">change 9531</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/9531"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4193ad5fdb70ea01acb7c33656ea7bfd3fe62916 </div>
<div style="display:none"> Gerrit-Change-Number: 9531 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>