diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-13 00:37:48 +0800 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-13 00:37:48 +0800 |
commit | aa0db809e23bedd7bfac278c8a7d5f127a15e00b (patch) | |
tree | f0df773dd2b9a1162d165cd1e8f410ca19e14b0a | |
parent | b4d5b17a8d87d5ec5c15c3376a51154532f81017 (diff) |
abis: Pass the abis_om_obj_inst in the nm_state_event..
-rw-r--r-- | openbsc/include/openbsc/abis_nm.h | 3 | ||||
-rw-r--r-- | openbsc/src/abis_nm.c | 4 | ||||
-rw-r--r-- | openbsc/src/bs11_config.c | 3 | ||||
-rw-r--r-- | openbsc/src/bsc_init.c | 3 | ||||
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-config.c | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h index 45307e3c8..1b6a8fe5d 100644 --- a/openbsc/include/openbsc/abis_nm.h +++ b/openbsc/include/openbsc/abis_nm.h @@ -164,7 +164,8 @@ enum nm_evt { EVT_STATECHG_ADM, }; int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state); + struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, + struct abis_om_obj_inst *obj_inst); const char *nm_opstate_name(u_int8_t os); const char *nm_avail_name(u_int8_t avail); diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c index c78ee5699..42f610d82 100644 --- a/openbsc/src/abis_nm.c +++ b/openbsc/src/abis_nm.c @@ -678,7 +678,7 @@ static int update_admstate(struct gsm_bts *bts, u_int8_t obj_class, new_state = *nm_state; new_state.administrative = adm_state; - rc = nm_state_event(EVT_STATECHG_ADM, obj_class, obj, nm_state, &new_state); + rc = nm_state_event(EVT_STATECHG_ADM, obj_class, obj, nm_state, &new_state, obj_inst); nm_state->administrative = adm_state; @@ -732,7 +732,7 @@ static int abis_nm_rx_statechg_rep(struct msgb *mb) /* Update the operational state of a given object in our in-memory data * structures and send an event to the higher layer */ void *obj = objclass2obj(bts, foh->obj_class, &foh->obj_inst); - rc = nm_state_event(EVT_STATECHG_OPER, foh->obj_class, obj, nm_state, &new_state); + rc = nm_state_event(EVT_STATECHG_OPER, foh->obj_class, obj, nm_state, &new_state, &foh->obj_inst); nm_state->operational = new_state.operational; nm_state->availability = new_state.availability; if (nm_state->administrative == 0) diff --git a/openbsc/src/bs11_config.c b/openbsc/src/bs11_config.c index a7493b422..d8819d391 100644 --- a/openbsc/src/bs11_config.c +++ b/openbsc/src/bs11_config.c @@ -697,7 +697,8 @@ int handle_serial_msg(struct msgb *rx_msg) } int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state) + struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, + struct abis_om_obj_inst *obj_ins) { return 0; } diff --git a/openbsc/src/bsc_init.c b/openbsc/src/bsc_init.c index 38f5dfbba..77446a2c1 100644 --- a/openbsc/src/bsc_init.c +++ b/openbsc/src/bsc_init.c @@ -401,7 +401,8 @@ static unsigned char nanobts_attr_nsvc0[] = { /* Callback function to be called whenever we get a GSM 12.21 state change event */ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state) + struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, + struct abis_om_obj_inst *obj_inst) { struct gsm_bts *bts; struct gsm_bts_trx *trx; diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index 075a264fc..0dab9cbe3 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -392,7 +392,8 @@ void input_event(int event, enum e1inp_sign_type type, struct gsm_bts_trx *trx) } int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state) + struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, + struct abis_om_obj_inst *obj_inst) { if (evt == EVT_STATECHG_OPER && obj_class == NM_OC_RADIO_CARRIER && |