pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/32204 )
Change subject: bts_model_apply_oml(): Improve definition of parameter
......................................................................
bts_model_apply_oml(): Improve definition of parameter
The param is usually called obj_class, but here it is called kind.
In any case, change the param to pass the related struct gsm_abis_mo
(which still contains mo->obj_class), similar to what's done in other
bts_model functions such as bts_model_opstart().
Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185
---
M include/osmo-bts/bts_model.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/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
13 files changed, 38 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h
index a8d25c1..673eb5b 100644
--- a/include/osmo-bts/bts_model.h
+++ b/include/osmo-bts/bts_model.h
@@ -5,6 +5,7 @@
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/gsm/protocol/gsm_12_21.h>
#include <osmo-bts/gsm_data.h>
@@ -20,7 +21,8 @@
struct tlv_parsed *old_attr, struct tlv_parsed
*new_attr,
void *obj);
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int
obj_kind, void *obj);
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj);
int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
void *obj);
diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c
index a14c869..e4711dd 100644
--- a/src/common/nm_bb_transc_fsm.c
+++ b/src/common/nm_bb_transc_fsm.c
@@ -128,7 +128,7 @@
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
rc = bts_model_apply_oml(trx->bts, setattr_data->msg,
- NM_OC_BASEB_TRANSC, bb_transc);
+ &bb_transc->mo, bb_transc);
bb_transc->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
break;
diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c
index b37a871..6e2cd63 100644
--- a/src/common/nm_bts_fsm.c
+++ b/src/common/nm_bts_fsm.c
@@ -116,7 +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, NM_OC_BTS,
bts);
+ rc = bts_model_apply_oml(bts, setattr_data->msg, &bts->mo, bts);
bts->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
break;
diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c
index 7a3cb84..31ba33a 100644
--- a/src/common/nm_channel_fsm.c
+++ b/src/common/nm_channel_fsm.c
@@ -100,7 +100,7 @@
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,
- NM_OC_CHANNEL, ts);
+ &ts->mo, ts);
ts->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
break;
@@ -146,7 +146,7 @@
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,
- NM_OC_CHANNEL, ts);
+ &ts->mo, ts);
ts->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
break;
diff --git a/src/common/nm_radio_carrier_fsm.c
b/src/common/nm_radio_carrier_fsm.c
index 5e152b8..500b489 100644
--- a/src/common/nm_radio_carrier_fsm.c
+++ b/src/common/nm_radio_carrier_fsm.c
@@ -109,7 +109,7 @@
case NM_EV_RX_SETATTR:
setattr_data = (struct nm_fsm_ev_setattr_data *)data;
rc = bts_model_apply_oml(trx->bts, setattr_data->msg,
- NM_OC_RADIO_CARRIER, trx);
+ &trx->mo, trx);
trx->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
break;
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index 3c1a67a..9f0be48 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -1801,7 +1801,8 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
struct gsm_bts_trx *trx;
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index ead78fa..dd4053c 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -1810,7 +1810,8 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
struct gsm_bts_trx *trx;
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index eaff105..a729784 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1742,7 +1742,8 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
struct gsm_bts_trx *trx;
diff --git a/src/osmo-bts-omldummy/bts_model.c
b/src/osmo-bts-omldummy/bts_model.c
index dad8ad9..60edcf1 100644
--- a/src/osmo-bts-omldummy/bts_model.c
+++ b/src/osmo-bts-omldummy/bts_model.c
@@ -93,7 +93,8 @@
return 0;
}
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, 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 aa63888..3d6f048 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1714,7 +1714,8 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
struct gsm_bts_trx *trx;
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 298d979..ee3bcae 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -548,7 +548,8 @@
}
/* callback from OML */
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, 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 04f2fc5..5b4fa21 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -128,7 +128,8 @@
return 0;
}
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj)
{
struct abis_om_fom_hdr *foh = msgb_l3(msg);
int rc;
diff --git a/tests/stubs.c b/tests/stubs.c
index d6fe643..72a77a5 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -18,7 +18,8 @@
{ return 0; }
int bts_model_trx_init(struct gsm_bts_trx *trx)
{ return 0; }
-int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg, int kind,
void *obj)
+int bts_model_apply_oml(struct gsm_bts *bts, const struct msgb *msg,
+ struct gsm_abis_mo *mo, void *obj)
{ return 0; }
int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32204
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185
Gerrit-Change-Number: 32204
Gerrit-PatchSet: 6
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
