aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-23 03:26:59 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-12 23:42:46 +0200
commit5dfa825b22b2071121d3eea9c7f96852e6c52255 (patch)
treed8ad828900a60f31253d902ec3928f0607037381
parent15cc54e85c114c9063e9ca2fda2d6f7c1ea2370a (diff)
apply function renames in merged libosmocore patches
-rw-r--r--src/libmsc/a_iface.c2
-rw-r--r--src/osmo-bsc/osmo_bsc_audio.c2
-rw-r--r--src/osmo-bsc/osmo_bsc_bssap.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c
index d64710f8..bd25b79d 100644
--- a/src/libmsc/a_iface.c
+++ b/src/libmsc/a_iface.c
@@ -249,7 +249,7 @@ static int enc_speeach_codec_list(struct gsm0808_speech_codec_list *scl, const s
memset(scl, 0, sizeof(*scl));
for (i = 0; i < ct->perm_spch_len; i++) {
- rc = gsm0808_extrapolate_speech_codec(&scl->codec[i], ct->perm_spch[i]);
+ rc = gsm0808_speech_codec_from_chan_type(&scl->codec[i], ct->perm_spch[i]);
if (rc != 0)
return -EINVAL;
}
diff --git a/src/osmo-bsc/osmo_bsc_audio.c b/src/osmo-bsc/osmo_bsc_audio.c
index ffba754d..03cfce21 100644
--- a/src/osmo-bsc/osmo_bsc_audio.c
+++ b/src/osmo-bsc/osmo_bsc_audio.c
@@ -51,7 +51,7 @@ static int send_aoip_ass_compl(struct gsm_subscriber_connection *conn, struct gs
memcpy(&rtp_addr, &rtp_addr_in, sizeof(rtp_addr_in));
/* Extrapolate speech codec from speech mode */
- gsm0808_extrapolate_speech_codec(&sc, lchan->abis_ip.ass_compl.speech_mode);
+ gsm0808_speech_codec_from_chan_type(&sc, lchan->abis_ip.ass_compl.speech_mode);
/* Generate message */
resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause,
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index afa81b0e..d6ae7dc0 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -137,7 +137,7 @@ static bool test_codec_pref(const struct gsm0808_channel_type *ct,
return false;
/* Extrapolate speech codec data */
- rc = gsm0808_extrapolate_speech_codec(&sc, perm_spch);
+ rc = gsm0808_speech_codec_from_chan_type(&sc, perm_spch);
if (rc < 0)
return false;