pespin has uploaded this change for review.
oml: Get rid of unused tlv_parsed param in bts_model_apply_oml()
This way we simplify the common lower level interface. It can be added
in the future again if it is really required at any point to pass/use
specific TLV values in the device-specific code.
Change-Id: I64c6c6834e277b1d75a97d6f408e7e1b7ca85832
---
M include/osmo-bts/bts_model.h
M include/osmo-bts/nm_common_fsm.h
M src/common/nm_bb_transc_fsm.c
M src/common/nm_bts_fsm.c
M src/common/nm_channel_fsm.c
M src/common/nm_radio_carrier_fsm.c
M src/common/oml.c
M src/osmo-bts-lc15/oml.c
M src/osmo-bts-oc2g/oml.c
M src/osmo-bts-octphy/l1_oml.c
M src/osmo-bts-omldummy/bts_model.c
M src/osmo-bts-sysmo/oml.c
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-virtual/bts_model.c
M tests/stubs.c
15 files changed, 27 insertions(+), 28 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/32203/1
diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h
index ef93fda..168930e 100644
--- a/include/osmo-bts/bts_model.h
+++ b/include/osmo-bts/bts_model.h
@@ -20,8 +20,7 @@
struct tlv_parsed *old_attr, struct tlv_parsed *new_attr,
void *obj);
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int obj_kind, void *obj);
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int obj_kind, void *obj);
int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
void *obj);
diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h
index 9a77d0e..8861a93 100644
--- a/include/osmo-bts/nm_common_fsm.h
+++ b/include/osmo-bts/nm_common_fsm.h
@@ -50,7 +50,6 @@
struct nm_fsm_ev_setattr_data {
struct msgb *msg;
- struct tlv_parsed *tp;
};
diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c
index 9b01c23..5aee911 100644
--- a/src/common/nm_bb_transc_fsm.c
+++ b/src/common/nm_bb_transc_fsm.c
@@ -127,7 +127,7 @@
switch (event) {
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
- rc = bts_model_apply_oml(trx->bts, setattr_data->msg, setattr_data->tp,
+ rc = bts_model_apply_oml(trx->bts, setattr_data->msg,
NM_OC_BASEB_TRANSC, bb_transc);
bb_transc->mo.setattr_success = rc == 0;
oml_mo_fom_ack_nack(&bb_transc->mo,
diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c
index 442aab8..4d5d10a 100644
--- a/src/common/nm_bts_fsm.c
+++ b/src/common/nm_bts_fsm.c
@@ -116,8 +116,7 @@
switch (event) {
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
- rc = bts_model_apply_oml(bts, setattr_data->msg, setattr_data->tp,
- NM_OC_BTS, bts);
+ rc = bts_model_apply_oml(bts, setattr_data->msg, NM_OC_BTS, bts);
bts->mo.setattr_success = rc == 0;
oml_mo_fom_ack_nack(&bts->mo,
((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type,
diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c
index b6e2a91..995b13c 100644
--- a/src/common/nm_channel_fsm.c
+++ b/src/common/nm_channel_fsm.c
@@ -99,7 +99,7 @@
switch (event) {
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
- rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp,
+ rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg,
NM_OC_CHANNEL, ts);
ts->mo.setattr_success = rc == 0;
oml_mo_fom_ack_nack(&ts->mo,
@@ -147,7 +147,7 @@
switch (event) {
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
- rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp,
+ rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg,
NM_OC_CHANNEL, ts);
ts->mo.setattr_success = rc == 0;
oml_mo_fom_ack_nack(&ts->mo,
diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c
index 452bf3e..5780ebb 100644
--- a/src/common/nm_radio_carrier_fsm.c
+++ b/src/common/nm_radio_carrier_fsm.c
@@ -108,7 +108,7 @@
switch (event) {
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
- rc = bts_model_apply_oml(trx->bts, setattr_data->msg, setattr_data->tp,
+ rc = bts_model_apply_oml(trx->bts, setattr_data->msg,
NM_OC_RADIO_CARRIER, trx);
trx->mo.setattr_success = rc == 0;
oml_mo_fom_ack_nack(&trx->mo,
diff --git a/src/common/oml.c b/src/common/oml.c
index b552e96..5ef3978 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -746,7 +746,6 @@
ev_data = (struct nm_fsm_ev_setattr_data){
.msg = msg,
- .tp = tp_merged,
};
rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_RX_SETATTR, &ev_data);
@@ -843,7 +842,6 @@
ev_data = (struct nm_fsm_ev_setattr_data){
.msg = msg,
- .tp = tp_merged,
};
rc = osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_RX_SETATTR, &ev_data);
@@ -1057,7 +1055,6 @@
ev_data = (struct nm_fsm_ev_setattr_data){
.msg = msg,
- .tp = tp_merged,
};
rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_RX_SETATTR, &ev_data);
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index 9370738..1402483 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -1801,8 +1801,7 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index 4de93b4..ac4fe46 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -1810,8 +1810,7 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index 28281f8..f51252e 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1742,8 +1742,7 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c
index c010508..55e43d3 100644
--- a/src/osmo-bts-omldummy/bts_model.c
+++ b/src/osmo-bts-omldummy/bts_model.c
@@ -93,8 +93,7 @@
return 0;
}
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 1d5b18c..8b2669f 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1714,8 +1714,7 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index afa917e..5e6a22c 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -548,8 +548,7 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c
index bcf66be..91a1ec8 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -128,8 +128,7 @@
return 0;
}
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/tests/stubs.c b/tests/stubs.c
index b24dfc9..00617cd 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -18,8 +18,7 @@
{ return 0; }
int bts_model_trx_init(struct gsm_bts_trx *trx)
{ return 0; }
-int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
- struct tlv_parsed *new_attr, int kind, void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj)
{ return 0; }
int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)
To view, visit change 32203. To unsubscribe, or for help writing mail filters, visit settings.