diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-06-10 19:48:22 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-06-10 19:52:00 +0200 |
commit | f926d9549c5cc346c62e66a68305464a82ecfa48 (patch) | |
tree | 8612beef74e34e7aa7905fe3595e3e18edba2ff1 /src/osmo-bts-litecell15 | |
parent | db330522eaa14b667594e58aec2b7f3899903fb5 (diff) |
lc15: Use correct type for hLayer1 field
It also fixes a compilation warning in which a uint32_t is assigned to a
void pointer.
Change-Id: I21ea42274eabe854f3b236a22aeb70b93a280541
Diffstat (limited to 'src/osmo-bts-litecell15')
-rw-r--r-- | src/osmo-bts-litecell15/l1_if.h | 3 | ||||
-rw-r--r-- | src/osmo-bts-litecell15/oml.c | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/osmo-bts-litecell15/l1_if.h b/src/osmo-bts-litecell15/l1_if.h index 7feee560..aac26075 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 calib_send_state { 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 2c3002bf..7a5fa1bb 100644 --- a/src/osmo-bts-litecell15/oml.c +++ b/src/osmo-bts-litecell15/oml.c @@ -114,31 +114,31 @@ static void *prim_init(GsmL1_Prim_t *prim, GsmL1_PrimId_t id, struct lc15l1_hdl 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 @@ static void *prim_init(GsmL1_Prim_t *prim, GsmL1_PrimId_t id, struct lc15l1_hdl 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; |