diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-02 15:10:36 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-02 16:30:10 +0200 |
| commit | 061787878ceac939ed6b6882f4d810b53774d24b (patch) | |
| tree | 9ca63d139f4cc4eaacd952080d2540ff587e63b6 /openbsc/src | |
| parent | 00007897d42232db0c29ebe543b2483311e56785 (diff) | |
gsm_04_08 mscsplit: subscr_request_channel() -> subscr_request_conn()
Rename subscr_request_channel() to _conn() and remove the channel_type arg.
The "channel" is a term from closely tied MSC+BSC code, after separation we
shall call it a "connection", i.e. over IuCS or A.
The channel_type arg is already unused from a previous MSCSPLIT commit.
Diffstat (limited to 'openbsc/src')
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_08.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_11.c | 3 | ||||
| -rw-r--r-- | openbsc/src/libmsc/gsm_subscriber.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libmsc/silent_call.c | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 0bfd42c1f..e7b561eeb 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -3430,8 +3430,8 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) memcpy(&trans->cc.msg, data, sizeof(struct gsm_mncc)); /* Request a channel */ - trans->paging_request = subscr_request_channel(subscr, - RSL_CHANNEED_TCH_F, setup_trig_pag_evt, + trans->paging_request = subscr_request_conn(subscr, + setup_trig_pag_evt, trans); if (!trans->paging_request) { LOGP(DCC, LOGL_ERROR, "Failed to allocate paging token.\n"); diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 45d614a0f..22d4f6708 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -993,8 +993,7 @@ int gsm411_send_sms_subscr(struct gsm_subscriber *subscr, /* if not, we have to start paging */ LOGP(DLSMS, LOGL_DEBUG, "Sending SMS: no connection open, start paging %s\n", subscr_name(subscr)); - res = subscr_request_channel(subscr, RSL_CHANNEED_SDCCH, - paging_cb_send_sms, sms); + res = subscr_request_conn(subscr, paging_cb_send_sms, sms); if (!res) { send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, GSM_PAGING_BUSY); sms_free(sms); diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 428fad847..ddaf32c28 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -165,8 +165,8 @@ int msc_paging_request(struct gsm_network *network, struct gsm_subscriber *subsc subscr->lac); } -struct subscr_request *subscr_request_channel(struct gsm_subscriber *subscr, - int channel_type, gsm_cbfn *cbfn, void *param) +struct subscr_request *subscr_request_conn(struct gsm_subscriber *subscr, + gsm_cbfn *cbfn, void *param) { int rc; struct subscr_request *request; diff --git a/openbsc/src/libmsc/silent_call.c b/openbsc/src/libmsc/silent_call.c index 5d0b6ef19..0c7b519aa 100644 --- a/openbsc/src/libmsc/silent_call.c +++ b/openbsc/src/libmsc/silent_call.c @@ -123,7 +123,7 @@ int gsm_silent_call_start(struct gsm_subscriber *subscr, void *data, int type) { struct subscr_request *req; - req = subscr_request_channel(subscr, type, paging_cb_silent, data); + req = subscr_request_conn(subscr, paging_cb_silent, data); return req != NULL; } |