From 0008777c0305426e91230a31160a1aa26563abfa Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 23 Jun 2017 03:26:59 +0200 Subject: apply function renames in merged libosmocore patches Change-Id: Ic659d6d79a6284732e1837f8b0947e8a128ddd87 --- openbsc/src/libmsc/a_iface.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_audio.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbsc/src/libmsc/a_iface.c b/openbsc/src/libmsc/a_iface.c index d64710f84..bd25b79d5 100644 --- a/openbsc/src/libmsc/a_iface.c +++ b/openbsc/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/openbsc/src/osmo-bsc/osmo_bsc_audio.c b/openbsc/src/osmo-bsc/osmo_bsc_audio.c index ffba754d3..03cfce21a 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_audio.c +++ b/openbsc/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/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index afa81b0e5..d6ae7dc0c 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/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; -- cgit v1.2.3