paulmataruso/osmo-sgsn
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn.git synced 2025-11-03 21:53:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

abis: Pass the abis_om_obj_inst in the nm_state_event..

Browse Source
This commit is contained in:
Holger Hans Peter Freyther
2010-05-13 00:37:48 +08:00
parent b4d5b17a8d
commit aa0db809e2
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openbsc/include/openbsc/abis_nm.h
View File

@@ -164,7 +164,8 @@ enum nm_evt {
EVT_STATECHG_ADM, EVT_STATECHG_ADM,
}; };
int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, 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_opstate_name(u_int8_t os);
const char *nm_avail_name(u_int8_t avail); const char *nm_avail_name(u_int8_t avail);

4
openbsc/src/abis_nm.c
View File

@@ -678,7 +678,7 @@ static int update_admstate(struct gsm_bts *bts, u_int8_t obj_class,
new_state = *nm_state; new_state = *nm_state;
new_state.administrative = adm_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; 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 /* Update the operational state of a given object in our in-memory data
* structures and send an event to the higher layer */ * structures and send an event to the higher layer */
void *obj = objclass2obj(bts, foh->obj_class, &foh->obj_inst); 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->operational = new_state.operational;
nm_state->availability = new_state.availability; nm_state->availability = new_state.availability;
if (nm_state->administrative == 0) if (nm_state->administrative == 0)

3
openbsc/src/bs11_config.c
View File

@@ -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, 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; return 0;
} }

3
openbsc/src/bsc_init.c
View File

@@ -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 */ /* 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, 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 *bts;
struct gsm_bts_trx *trx; struct gsm_bts_trx *trx;

3
openbsc/src/ipaccess/ipaccess-config.c
View File

@@ -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, 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 && if (evt == EVT_STATECHG_OPER &&
obj_class == NM_OC_RADIO_CARRIER && obj_class == NM_OC_RADIO_CARRIER &&