diff options
| author | Rafael Diniz <rafael@riseup.net> | 2020-04-14 04:16:57 -0300 |
|---|---|---|
| committer | Rafael Diniz <rafael@riseup.net> | 2020-04-18 09:13:28 -0300 |
| commit | a02d121222744f923e70e7cd337d4c3c85b5656f (patch) | |
| tree | 7c480010c95c113c0db6bfdbefbcf091a9016a8e | |
| parent | 8fd72d84273739ba15fdca08f2e6202c3271538f (diff) | |
| parent | 3784850c76457a2a7fd0150ab12b1755f0a585fc (diff) | |
Merge branch 'rafael2k/litecell15_missing_features' of ssh://gerrit.osmocom.org:29418/osmo-bts into rafael2k/litecell15_missing_features
Change-Id: I363656e55fe7828cc452df14c0ff0420180e2af5
| -rw-r--r-- | src/osmo-bts-litecell15/l1_if.c | 4 | ||||
| -rw-r--r-- | src/osmo-bts-litecell15/lc15bts.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index 75f4fa72..6a8cb3cc 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -1265,7 +1265,7 @@ static int activate_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp, get_value_string(lc15bts_l1status_names, status)); bts_shutdown(trx->bts, "RF-ACT failure"); } else { - if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS) + if (bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS) bts_update_status(BTS_STATUS_RF_ACTIVE, 1); } @@ -1278,7 +1278,7 @@ static int activate_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp, for (i = 0; i < ARRAY_SIZE(trx->ts); i++) oml_mo_state_chg(&trx->ts[i].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); } else { - if(bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS) + if (bts_lc15->led_ctrl_mode == LC15_LED_CONTROL_BTS) bts_update_status(BTS_STATUS_RF_ACTIVE, 0); oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); oml_mo_state_chg(&trx->bb_transc.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); diff --git a/src/osmo-bts-litecell15/lc15bts.c b/src/osmo-bts-litecell15/lc15bts.c index 8ebc3a22..773e6d36 100644 --- a/src/osmo-bts-litecell15/lc15bts.c +++ b/src/osmo-bts-litecell15/lc15bts.c @@ -123,10 +123,12 @@ enum l1prim_type lc15bts_get_sysprim_type(Litecell15_PrimId_t id) case Litecell15_PrimId_SetRxAttenCnf: return L1P_T_CONF; case Litecell15_PrimId_IsAliveReq: return L1P_T_REQ; case Litecell15_PrimId_IsAliveCnf: return L1P_T_CONF; +#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7) case Litecell15_PrimId_SetMaxCellSizeReq: return L1P_T_REQ; case Litecell15_PrimId_SetMaxCellSizeCnf: return L1P_T_CONF; case Litecell15_PrimId_SetC0IdleSlotPowerReductionReq: return L1P_T_REQ; case Litecell15_PrimId_SetC0IdleSlotPowerReductionCnf: return L1P_T_CONF; +#endif default: return L1P_T_INVALID; } } @@ -150,10 +152,12 @@ const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1] = { { Litecell15_PrimId_SetRxAttenCnf, "SET-RX-ATTEN-CNF.cnf" }, { Litecell15_PrimId_IsAliveReq, "IS-ALIVE.req" }, { Litecell15_PrimId_IsAliveCnf, "IS-ALIVE-CNF.cnf" }, +#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7) { Litecell15_PrimId_SetMaxCellSizeReq, "SET-MAX-CELL-SIZE.req" }, { Litecell15_PrimId_SetMaxCellSizeCnf, "SET-MAX-CELL-SIZE.cnf" }, { Litecell15_PrimId_SetC0IdleSlotPowerReductionReq, "SET-C0-IDLE-PWR-RED.req" }, { Litecell15_PrimId_SetC0IdleSlotPowerReductionCnf, "SET-C0-IDLE-PWR-RED.cnf" }, +#endif { 0, NULL } }; @@ -168,8 +172,10 @@ Litecell15_PrimId_t lc15bts_get_sysprim_conf(Litecell15_PrimId_t id) case Litecell15_PrimId_MuteRfReq: return Litecell15_PrimId_MuteRfCnf; case Litecell15_PrimId_SetRxAttenReq: return Litecell15_PrimId_SetRxAttenCnf; case Litecell15_PrimId_IsAliveReq: return Litecell15_PrimId_IsAliveCnf; +#if LITECELL15_API_VERSION >= LITECELL15_API(2,1,7) case Litecell15_PrimId_SetMaxCellSizeReq: return Litecell15_PrimId_SetMaxCellSizeCnf; case Litecell15_PrimId_SetC0IdleSlotPowerReductionReq: return Litecell15_PrimId_SetC0IdleSlotPowerReductionCnf; +#endif default: return -1; // Weak } } |