aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-03-26 18:00:40 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-03-26 18:01:55 +0100
commita276b9823627fcc3279bd005cc64f63edbeb4819 (patch)
tree174d5994b215275515088fcfb6b85c9dafcbe1a8
parent71d98050f38840f61d37ddb5f7e4efd5d5f0bab4 (diff)
oml: Indicate the kind of object passed as the void*
These routines do not pass the gsm_abis_mo and parsing the FOM header of the msg does not seem to be a good idea either. Pass in the OML object so that the model code can determine what the void pointer is.
-rw-r--r--include/osmo-bts/bts_model.h2
-rw-r--r--src/common/oml.c6
-rw-r--r--src/osmo-bts-sysmo/oml.c2
-rw-r--r--tests/stubs.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h
index cb5433b..2641db7 100644
--- a/include/osmo-bts/bts_model.h
+++ b/include/osmo-bts/bts_model.h
@@ -19,7 +19,7 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
void *obj);
int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, void *obj);
+ struct tlv_parsed *new_attr, int obj_kind, void *obj);
int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
void *obj);
diff --git a/src/common/oml.c b/src/common/oml.c
index 5fa2d85..9ec773b 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -532,7 +532,7 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg)
bts->bsic = *TLVP_VAL(&tp, NM_ATT_BSIC);
/* call into BTS driver to apply new attributes to hardware */
- return bts_model_apply_oml(bts, msg, tp_merged, bts);
+ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_BTS, bts);
}
/* 8.6.2 Set Radio Attributes has been received */
@@ -594,7 +594,7 @@ static int oml_rx_set_radio_attr(struct gsm_bts_trx *trx, struct msgb *msg)
trx->arfcn_num = 0;
#endif
/* call into BTS driver to apply new attributes to hardware */
- return bts_model_apply_oml(trx->bts, msg, tp_merged, trx);
+ return bts_model_apply_oml(trx->bts, msg, tp_merged, NM_OC_RADIO_CARRIER, trx);
}
static int conf_lchans_for_pchan(struct gsm_bts_trx_ts *ts)
@@ -704,7 +704,7 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg)
gsm_abis_mo_name(&ts->mo), ts->tsc);
/* call into BTS driver to apply new attributes to hardware */
- return bts_model_apply_oml(bts, msg, tp_merged, ts);
+ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts);
}
/* 8.9.2 Opstart has been received */
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 7fcd4c6..c52d80c 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1533,7 +1533,7 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,
/* callback from OML */
int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, void *obj)
+ struct tlv_parsed *new_attr, int kind, void *obj)
{
/* FIXME: we actaully need to send a ACK or NACK for the OML message */
return oml_fom_ack_nack(msg, 0);
diff --git a/tests/stubs.c b/tests/stubs.c
index 53aa434..99961aa 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -14,7 +14,7 @@ int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
int bts_model_init(struct gsm_bts *bts)
{ return 0; }
int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, void *obj)
+ struct tlv_parsed *new_attr, int kind, void *obj)
{ return 0; }
int bts_model_rsl_chan_rel(struct gsm_lchan *lchan)
{ return 0;}