Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/9525
Change subject: lc15: Use correct type got hLayer1 field
......................................................................
lc15: Use correct type got hLayer1 field
It also fixes a compilation warning in which a uint32_t is assigned to a
void pointer.
Change-Id: I21ea42274eabe854f3b236a22aeb70b93a280541
---
M src/osmo-bts-litecell15/l1_if.h
M src/osmo-bts-litecell15/oml.c
2 files changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/9525/1
diff --git a/src/osmo-bts-litecell15/l1_if.h b/src/osmo-bts-litecell15/l1_if.h
index 7feee56..aac2607 100644
--- a/src/osmo-bts-litecell15/l1_if.h
+++ b/src/osmo-bts-litecell15/l1_if.h
@@ -10,6 +10,7 @@
#include <osmo-bts/phy_link.h>
#include <nrw/litecell15/gsml1prim.h>
+#include <nrw/litecell15/gsml1types.h>
#include <stdbool.h>
@@ -37,7 +38,7 @@
struct lc15l1_hdl {
struct gsm_time gsm_time;
- uint32_t hLayer1; /* handle to the L1 instance in
the DSP */
+ HANDLE hLayer1; /* handle to the L1 instance in
the DSP */
uint32_t dsp_trace_f; /* currently operational DSP
trace flags */
struct llist_head wlc_list;
diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c
index 2c3002b..7a5fa1b 100644
--- a/src/osmo-bts-litecell15/oml.c
+++ b/src/osmo-bts-litecell15/oml.c
@@ -114,31 +114,31 @@
prim->u.mphInitReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphCloseReq:
- prim->u.mphCloseReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphCloseReq.hLayer1 = gl1->hLayer1;
prim->u.mphCloseReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphConnectReq:
- prim->u.mphConnectReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphConnectReq.hLayer1 = gl1->hLayer1;
prim->u.mphConnectReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphDisconnectReq:
- prim->u.mphDisconnectReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphDisconnectReq.hLayer1 = gl1->hLayer1;
prim->u.mphDisconnectReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphActivateReq:
- prim->u.mphActivateReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphActivateReq.hLayer1 = gl1->hLayer1;
prim->u.mphActivateReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphDeactivateReq:
- prim->u.mphDeactivateReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphDeactivateReq.hLayer1 = gl1->hLayer1;
prim->u.mphDeactivateReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphConfigReq:
- prim->u.mphConfigReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphConfigReq.hLayer1 = gl1->hLayer1;
prim->u.mphConfigReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphMeasureReq:
- prim->u.mphMeasureReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.mphMeasureReq.hLayer1 = gl1->hLayer1;
prim->u.mphMeasureReq.hLayer3 = hLayer3;
break;
case GsmL1_PrimId_MphInitCnf:
@@ -170,10 +170,10 @@
case GsmL1_PrimId_MphSyncInd:
break;
case GsmL1_PrimId_PhEmptyFrameReq:
- prim->u.phEmptyFrameReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.phEmptyFrameReq.hLayer1 = gl1->hLayer1;
break;
case GsmL1_PrimId_PhDataReq:
- prim->u.phDataReq.hLayer1 = (HANDLE)gl1->hLayer1;
+ prim->u.phDataReq.hLayer1 = gl1->hLayer1;
break;
case GsmL1_PrimId_PhConnectInd:
break;
--
To view, visit https://gerrit.osmocom.org/9525
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21ea42274eabe854f3b236a22aeb70b93a280541
Gerrit-Change-Number: 9525
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de>
