diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-06 12:12:31 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-06 12:12:31 +0200 |
commit | bbc5b99a6bf9f02ac65937e566287651bcd3269f (patch) | |
tree | 1e665df36dcc42b3e3a5d49bc5bbcda8ba17d6e9 /openbsc/src/libbsc | |
parent | 4db92992865e1548e32ba2e95a9dc074dd90847b (diff) |
src: use namespace prefix osmo_signal*
Summary of changes:
s/signal_cbfn/osmo_signal_cbfn/g
s/register_signal_handler/osmo_signal_register_handler/g
s/unregister_signal_handler/osmo_signal_unregister_handler/g
s/dispatch_signal/osmo_signal_dispatch/g
Diffstat (limited to 'openbsc/src/libbsc')
-rw-r--r-- | openbsc/src/libbsc/abis_nm.c | 20 | ||||
-rw-r--r-- | openbsc/src/libbsc/abis_om2000.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/abis_rsl.c | 8 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_api.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_init.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_rll.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/bts_ericsson_rbs2000.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/bts_hsl_femtocell.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/bts_ipaccess_nanobts.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/bts_siemens_bs11.c | 4 | ||||
-rw-r--r-- | openbsc/src/libbsc/chan_alloc.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/handover_decision.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/handover_logic.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/meas_proc.c | 2 |
14 files changed, 37 insertions, 37 deletions
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 000781617..6ca45f7d7 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -701,7 +701,7 @@ static int update_admstate(struct gsm_bts *bts, uint8_t obj_class, nsd.old_state = nm_state; nsd.new_state = &new_state; nsd.obj_inst = obj_inst; - dispatch_signal(SS_NM, S_NM_STATECHG_ADM, &nsd); + osmo_signal_dispatch(SS_NM, S_NM_STATECHG_ADM, &nsd); nm_state->administrative = adm_state; @@ -760,7 +760,7 @@ static int abis_nm_rx_statechg_rep(struct msgb *mb) nsd.new_state = &new_state; nsd.obj_inst = &foh->obj_inst; nsd.bts = bts; - dispatch_signal(SS_NM, S_NM_STATECHG_OPER, &nsd); + osmo_signal_dispatch(SS_NM, S_NM_STATECHG_OPER, &nsd); nm_state->operational = new_state.operational; nm_state->availability = new_state.availability; if (nm_state->administrative == 0) @@ -827,15 +827,15 @@ static int abis_nm_rcvmsg_report(struct msgb *mb) break; case NM_MT_SW_ACTIVATED_REP: DEBUGPC(DNM, "Software Activated Report\n"); - dispatch_signal(SS_NM, S_NM_SW_ACTIV_REP, mb); + osmo_signal_dispatch(SS_NM, S_NM_SW_ACTIV_REP, mb); break; case NM_MT_FAILURE_EVENT_REP: rx_fail_evt_rep(mb); - dispatch_signal(SS_NM, S_NM_FAIL_REP, mb); + osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, mb); break; case NM_MT_TEST_REP: DEBUGPC(DNM, "Test Report\n"); - dispatch_signal(SS_NM, S_NM_TEST_REP, mb); + osmo_signal_dispatch(SS_NM, S_NM_TEST_REP, mb); break; default: DEBUGPC(DNM, "reporting NM MT 0x%02x\n", mt); @@ -1043,7 +1043,7 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) nack_data.msg = mb; nack_data.mt = mt; - dispatch_signal(SS_NM, S_NM_NACK, &nack_data); + osmo_signal_dispatch(SS_NM, S_NM_NACK, &nack_data); abis_nm_queue_send_next(mb->trx->bts); return 0; } @@ -1078,10 +1078,10 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) DEBUGP(DNM, "CONN MDROP LINK ACK\n"); break; case NM_MT_IPACC_RESTART_ACK: - dispatch_signal(SS_NM, S_NM_IPACC_RESTART_ACK, NULL); + osmo_signal_dispatch(SS_NM, S_NM_IPACC_RESTART_ACK, NULL); break; case NM_MT_IPACC_RESTART_NACK: - dispatch_signal(SS_NM, S_NM_IPACC_RESTART_NACK, NULL); + osmo_signal_dispatch(SS_NM, S_NM_IPACC_RESTART_NACK, NULL); break; case NM_MT_SET_BTS_ATTR_ACK: /* The HSL wants an OPSTART _after_ the SI has been set */ @@ -2884,12 +2884,12 @@ static int abis_nm_rx_ipacc(struct msgb *msg) case NM_MT_IPACC_GET_NVATTR_NACK: signal.trx = gsm_bts_trx_by_nr(msg->trx->bts, foh->obj_inst.trx_nr); signal.msg_type = foh->msg_type; - dispatch_signal(SS_NM, S_NM_IPACC_NACK, &signal); + osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal); break; case NM_MT_IPACC_SET_NVATTR_ACK: signal.trx = gsm_bts_trx_by_nr(msg->trx->bts, foh->obj_inst.trx_nr); signal.msg_type = foh->msg_type; - dispatch_signal(SS_NM, S_NM_IPACC_ACK, &signal); + osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal); break; default: break; diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c index 7743cd803..19d204212 100644 --- a/openbsc/src/libbsc/abis_om2000.c +++ b/openbsc/src/libbsc/abis_om2000.c @@ -753,7 +753,7 @@ static void update_mo_state(struct gsm_bts *bts, struct abis_om2k_mo *mo, nsd.new_state = &new_state; nsd.om2k_mo = mo; - dispatch_signal(SS_NM, S_NM_STATECHG_ADM, &nsd); + osmo_signal_dispatch(SS_NM, S_NM_STATECHG_ADM, &nsd); nm_state->availability = new_state.availability; } @@ -794,7 +794,7 @@ static void signal_op_state(struct gsm_bts *bts, struct abis_om2k_mo *mo) nsd.new_state = nm_state; nsd.om2k_mo = mo; - dispatch_signal(SS_NM, S_NM_STATECHG_OPER, &nsd); + osmo_signal_dispatch(SS_NM, S_NM_STATECHG_OPER, &nsd); } static int abis_om2k_sendmsg(struct gsm_bts *bts, struct msgb *msg) @@ -1434,7 +1434,7 @@ static int process_conf_res(struct gsm_bts *bts, struct msgb *msg) nsd.obj = mo2obj(bts, &o2h->mo); nsd.om2k_mo = &o2h->mo; nsd.accordance_ind = acc; - dispatch_signal(SS_NM, S_NM_OM2K_CONF_RES, &nsd); + osmo_signal_dispatch(SS_NM, S_NM_OM2K_CONF_RES, &nsd); return ret; } diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index 941a4ba78..4d61dc05d 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -55,7 +55,7 @@ static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan, struct lchan_signal_data sig; sig.lchan = lchan; sig.mr = resp; - dispatch_signal(SS_LCHAN, sig_no, &sig); + osmo_signal_dispatch(SS_LCHAN, sig_no, &sig); } static uint8_t mdisc_by_msgtype(uint8_t msg_type) @@ -1806,7 +1806,7 @@ static int abis_rsl_rx_ipacc_crcx_ack(struct msgb *msg) ipac_parse_rtp(lchan, &tv); - dispatch_signal(SS_ABISIP, S_ABISIP_CRCX_ACK, msg->lchan); + osmo_signal_dispatch(SS_ABISIP, S_ABISIP_CRCX_ACK, msg->lchan); return 0; } @@ -1823,7 +1823,7 @@ static int abis_rsl_rx_ipacc_mdcx_ack(struct msgb *msg) rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); ipac_parse_rtp(lchan, &tv); - dispatch_signal(SS_ABISIP, S_ABISIP_MDCX_ACK, msg->lchan); + osmo_signal_dispatch(SS_ABISIP, S_ABISIP_MDCX_ACK, msg->lchan); return 0; } @@ -1839,7 +1839,7 @@ static int abis_rsl_rx_ipacc_dlcx_ind(struct msgb *msg) print_rsl_cause(LOGL_DEBUG, TLVP_VAL(&tv, RSL_IE_CAUSE), TLVP_LEN(&tv, RSL_IE_CAUSE)); - dispatch_signal(SS_ABISIP, S_ABISIP_DLCX_IND, msg->lchan); + osmo_signal_dispatch(SS_ABISIP, S_ABISIP_DLCX_IND, msg->lchan); return 0; } diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index 09e9de485..70d641396 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -671,5 +671,5 @@ static void handle_chan_nack(struct gsm_subscriber_connection *conn, static __attribute__((constructor)) void on_dso_load_bsc(void) { - register_signal_handler(SS_LCHAN, bsc_handle_lchan_signal, NULL); + osmo_signal_register_handler(SS_LCHAN, bsc_handle_lchan_signal, NULL); } diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 1d14df1a7..0056bb07e 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -82,7 +82,7 @@ int bsc_shutdown_net(struct gsm_network *net) llist_for_each_entry(bts, &net->bts_list, list) { LOGP(DNM, LOGL_NOTICE, "shutting down OML for BTS %u\n", bts->nr); - dispatch_signal(SS_GLOBAL, S_GLOBAL_BTS_CLOSE_OM, bts); + osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_BTS_CLOSE_OM, bts); } return 0; @@ -434,8 +434,8 @@ int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *), if (rc < 0) return rc; - register_signal_handler(SS_NM, nm_sig_cb, NULL); - register_signal_handler(SS_INPUT, inp_sig_cb, NULL); + osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); + osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL); llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) { rc = bootstrap_bts(bts); diff --git a/openbsc/src/libbsc/bsc_rll.c b/openbsc/src/libbsc/bsc_rll.c index 9fbe7c6e7..d12aeeec9 100644 --- a/openbsc/src/libbsc/bsc_rll.c +++ b/openbsc/src/libbsc/bsc_rll.c @@ -137,5 +137,5 @@ static int rll_lchan_signal(unsigned int subsys, unsigned int signal, static __attribute__((constructor)) void on_dso_load_rll(void) { - register_signal_handler(SS_CHALLOC, rll_lchan_signal, NULL); + osmo_signal_register_handler(SS_CHALLOC, rll_lchan_signal, NULL); } diff --git a/openbsc/src/libbsc/bts_ericsson_rbs2000.c b/openbsc/src/libbsc/bts_ericsson_rbs2000.c index 95bf38bad..c2ae0e7ae 100644 --- a/openbsc/src/libbsc/bts_ericsson_rbs2000.c +++ b/openbsc/src/libbsc/bts_ericsson_rbs2000.c @@ -257,9 +257,9 @@ int bts_model_rbs2k_init(void) gsm_btsmodel_set_feature(&model_rbs2k, BTS_FEAT_HOPPING); gsm_btsmodel_set_feature(&model_rbs2k, BTS_FEAT_HSCSD); - register_signal_handler(SS_INPUT, inp_sig_cb, NULL); - register_signal_handler(SS_GLOBAL, gbl_sig_cb, NULL); - register_signal_handler(SS_NM, nm_sig_cb, NULL); + osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL); + osmo_signal_register_handler(SS_GLOBAL, gbl_sig_cb, NULL); + osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); return gsm_bts_model_register(&model_rbs2k); } diff --git a/openbsc/src/libbsc/bts_hsl_femtocell.c b/openbsc/src/libbsc/bts_hsl_femtocell.c index 9bbf6d2cc..7264a21a6 100644 --- a/openbsc/src/libbsc/bts_hsl_femtocell.c +++ b/openbsc/src/libbsc/bts_hsl_femtocell.c @@ -156,7 +156,7 @@ int bts_model_hslfemto_init(void) gsm_btsmodel_set_feature(&model_hslfemto, BTS_FEAT_GPRS); gsm_btsmodel_set_feature(&model_hslfemto, BTS_FEAT_EGPRS); - register_signal_handler(SS_INPUT, inp_sig_cb, NULL); + osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL); return gsm_bts_model_register(&model_hslfemto); } diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index 097a88988..13bed2260 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -443,7 +443,7 @@ int bts_model_nanobts_init(void) gsm_btsmodel_set_feature(&model_nanobts, BTS_FEAT_GPRS); gsm_btsmodel_set_feature(&model_nanobts, BTS_FEAT_EGPRS); - register_signal_handler(SS_NM, nm_sig_cb, NULL); + osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); return gsm_bts_model_register(&model_nanobts); } diff --git a/openbsc/src/libbsc/bts_siemens_bs11.c b/openbsc/src/libbsc/bts_siemens_bs11.c index 57625cdd0..44f935857 100644 --- a/openbsc/src/libbsc/bts_siemens_bs11.c +++ b/openbsc/src/libbsc/bts_siemens_bs11.c @@ -583,8 +583,8 @@ int bts_model_bs11_init(void) gsm_btsmodel_set_feature(&model_bs11, BTS_FEAT_HOPPING); gsm_btsmodel_set_feature(&model_bs11, BTS_FEAT_HSCSD); - register_signal_handler(SS_INPUT, inp_sig_cb, NULL); - register_signal_handler(SS_GLOBAL, gbl_sig_cb, NULL); + osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL); + osmo_signal_register_handler(SS_GLOBAL, gbl_sig_cb, NULL); return gsm_bts_model_register(&model_bs11); } diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index ff745f575..cfd387404 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -284,7 +284,7 @@ struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type, struct challoc_signal_data sig; sig.bts = bts; sig.type = type; - dispatch_signal(SS_CHALLOC, S_CHALLOC_ALLOC_FAIL, &sig); + osmo_signal_dispatch(SS_CHALLOC, S_CHALLOC_ALLOC_FAIL, &sig); } return lchan; @@ -306,7 +306,7 @@ void lchan_free(struct gsm_lchan *lchan) /* We might kill an active channel... */ sig.lchan = lchan; sig.mr = NULL; - dispatch_signal(SS_LCHAN, S_LCHAN_UNEXPECTED_RELEASE, &sig); + osmo_signal_dispatch(SS_LCHAN, S_LCHAN_UNEXPECTED_RELEASE, &sig); } @@ -330,7 +330,7 @@ void lchan_free(struct gsm_lchan *lchan) sig.lchan = lchan; sig.bts = lchan->ts->trx->bts; - dispatch_signal(SS_CHALLOC, S_CHALLOC_FREED, &sig); + osmo_signal_dispatch(SS_CHALLOC, S_CHALLOC_FREED, &sig); if (lchan->conn) { LOGP(DRLL, LOGL_ERROR, "the subscriber connection should be gone.\n"); diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c index d6fd4f471..24c0f79cb 100644 --- a/openbsc/src/libbsc/handover_decision.c +++ b/openbsc/src/libbsc/handover_decision.c @@ -293,5 +293,5 @@ static int ho_dec_sig_cb(unsigned int subsys, unsigned int signal, void on_dso_load_ho_dec(void) { - register_signal_handler(SS_LCHAN, ho_dec_sig_cb, NULL); + osmo_signal_register_handler(SS_LCHAN, ho_dec_sig_cb, NULL); } diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index bf9588bc0..1aa8fdeb9 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -344,7 +344,7 @@ static int ho_ipac_crcx_ack(struct gsm_lchan *new_lchan) sig_ho.old_lchan = ho->old_lchan; sig_ho.new_lchan = new_lchan; - dispatch_signal(SS_HO, S_HANDOVER_ACK, &sig_ho); + osmo_signal_dispatch(SS_HO, S_HANDOVER_ACK, &sig_ho); return 0; } @@ -388,6 +388,6 @@ static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal, static __attribute__((constructor)) void on_dso_load_ho_logic(void) { - register_signal_handler(SS_LCHAN, ho_logic_sig_cb, NULL); - register_signal_handler(SS_ABISIP, ho_logic_sig_cb, NULL); + osmo_signal_register_handler(SS_LCHAN, ho_logic_sig_cb, NULL); + osmo_signal_register_handler(SS_ABISIP, ho_logic_sig_cb, NULL); } diff --git a/openbsc/src/libbsc/meas_proc.c b/openbsc/src/libbsc/meas_proc.c index 5ca013d3f..5b97e74ee 100644 --- a/openbsc/src/libbsc/meas_proc.c +++ b/openbsc/src/libbsc/meas_proc.c @@ -80,5 +80,5 @@ static int meas_proc_sig_cb(unsigned int subsys, unsigned int signal, static __attribute__((constructor)) void on_dso_load_meas(void) { - register_signal_handler(SS_LCHAN, meas_proc_sig_cb, NULL); + osmo_signal_register_handler(SS_LCHAN, meas_proc_sig_cb, NULL); } |