diff options
Diffstat (limited to 'include/osmocom/bsc/signal.h')
| -rw-r--r-- | include/osmocom/bsc/signal.h | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 088d4f29c..4d5080da2 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -68,8 +68,7 @@ enum signal_nm { S_NM_IPACC_RESTART_ACK, /* nanoBTS has send a restart ack */ S_NM_IPACC_RESTART_NACK,/* nanoBTS has send a restart ack */ S_NM_TEST_REP, /* GSM 12.21 Test Report */ - S_NM_STATECHG_OPER, /* Operational State changed*/ - S_NM_STATECHG_ADM, /* Administrative State changed */ + S_NM_STATECHG, /* NM Oper/Admin/Avail State changed. arg is struct nm_statechg_signal_data*/ S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */ S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct msgb *oml_msg */ S_NM_OPSTART_NACK, /* Received OPSTART NACK, arg is struct msgb *oml_msg */ @@ -77,6 +76,7 @@ enum signal_nm { S_NM_SET_RADIO_ATTR_ACK, /* Received Set Radio Carrier Attributes Ack, arg is struct msgb *oml_msg */ S_NM_SET_CHAN_ATTR_ACK, /* Received Set Radio Channel Attributes Ack, arg is struct msgb *oml_msg */ S_NM_SET_BTS_ATTR_ACK, /* Received Set BTS Attributes Ack, arg is struct msgb *oml_msg */ + S_NM_RUNNING_CHG, /* Object moves from/to NM running state (op=Enabled adm=Unlocked avail=OK) */ }; /* SS_LCHAN signals */ @@ -120,23 +120,34 @@ enum signal_rf { }; struct ipacc_ack_signal_data { - struct gsm_bts_trx *trx; - uint8_t msg_type; + /* The BTS which sent the ACK/NACK to us: */ + struct gsm_bts *bts; + /* messge header containing msg_type, obj_class, obj_inst: */ + struct abis_om_fom_hdr *foh; }; struct abis_om2k_mo; +/* data for <SS_NM, S_NM_STATECHG>: */ struct nm_statechg_signal_data { struct gsm_bts *bts; uint8_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; - /* This pointer is vaold for TS 12.21 MO */ + /* This pointer is valid for TS 12.21 MO */ struct abis_om_obj_inst *obj_inst; - /* This pointer is vaold for RBS2000 MO */ - struct abis_om2k_mo *om2k_mo; + /* This pointer is valid for RBS2000 MO */ + const struct abis_om2k_mo *om2k_mo; +}; + +/* data for <SS_NM, S_NM_RUNNING_CHG>: */ +struct nm_running_chg_signal_data { + struct gsm_bts *bts; + uint8_t obj_class; + void *obj; + bool running; }; struct nm_om2k_signal_data { |