[osmo-bts] 01/04: Patch in order to make it build with newer versions of openbsc

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osmo-bts.

commit 60b1adeb433263e23c634b47c43c33e56fd4f8c5
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Feb 21 09:38:47 2016 +0100

    Patch in order to make it build with newer versions of openbsc
---
 debian/patches/keep_up_with_openbscs_amr.patch | 62 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 63 insertions(+)

diff --git a/debian/patches/keep_up_with_openbscs_amr.patch b/debian/patches/keep_up_with_openbscs_amr.patch
new file mode 100644
index 0000000..858fe02
--- /dev/null
+++ b/debian/patches/keep_up_with_openbscs_amr.patch
@@ -0,0 +1,62 @@
+Description: This patch has been cherry picked from the upstream
+ git repo for making it compatible with newer versions of
+ openbsc.
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+
+--- osmo-bts-0.4.0.orig/src/common/amr.c
++++ osmo-bts-0.4.0/src/common/amr.c
+@@ -16,9 +16,9 @@ void amr_log_mr_conf(int ss, int logl, c
+ 
+ 	for (i = 0; i < amr_mrc->num_modes; i++)
+ 		LOGPC(ss, logl, ", mode[%u] = %u/%u/%u",
+-			i, amr_mrc->mode[i].mode,
+-			amr_mrc->mode[i].threshold_bts,
+-			amr_mrc->mode[i].hysteresis_bts);
++			i, amr_mrc->bts_mode[i].mode,
++			amr_mrc->bts_mode[i].threshold,
++			amr_mrc->bts_mode[i].hysteresis);
+ 	LOGPC(ss, logl, "\n");
+ }
+ 
+@@ -64,23 +64,23 @@ int amr_parse_mr_conf(struct amr_multira
+ 
+ 	for (i = 0; i < 8; i++) {
+ 		if (mr_conf[1] & (1 << i)) {
+-			amr_mrc->mode[j++].mode = i;
++			amr_mrc->bts_mode[j++].mode = i;
+ 		}
+ 	}
+ 
+ 	if (num_codecs >= 2) {
+-		amr_mrc->mode[0].threshold_bts = mr_conf[1] & 0x3F;
+-		amr_mrc->mode[0].hysteresis_bts = mr_conf[2] >> 4;
++		amr_mrc->bts_mode[0].threshold = mr_conf[1] & 0x3F;
++		amr_mrc->bts_mode[0].hysteresis = mr_conf[2] >> 4;
+ 	}
+ 	if (num_codecs >= 3) {
+-		amr_mrc->mode[1].threshold_bts =
++		amr_mrc->bts_mode[1].threshold =
+ 			((mr_conf[2] & 0xF) << 2) | (mr_conf[3] >> 6);
+-		amr_mrc->mode[1].hysteresis_bts = (mr_conf[3] >> 2) & 0xF;
++		amr_mrc->bts_mode[1].hysteresis = (mr_conf[3] >> 2) & 0xF;
+ 	}
+ 	if (num_codecs >= 4) {
+-		amr_mrc->mode[2].threshold_bts =
++		amr_mrc->bts_mode[2].threshold =
+ 			((mr_conf[3] & 0x3) << 4) | (mr_conf[4] >> 4);
+-		amr_mrc->mode[2].hysteresis_bts = mr_conf[4] & 0xF;
++		amr_mrc->bts_mode[2].hysteresis = mr_conf[4] & 0xF;
+ 	}
+ 
+ 	return num_codecs;
+--- osmo-bts-0.4.0.orig/src/osmo-bts-sysmo/tch.c
++++ osmo-bts-0.4.0/src/osmo-bts-sysmo/tch.c
+@@ -313,7 +313,7 @@ int get_amr_mode_idx(const struct amr_mu
+ {
+ 	unsigned int i;
+ 	for (i = 0; i < amr_mrc->num_modes; i++) {
+-		if (amr_mrc->mode[i].mode == cmi)
++		if (amr_mrc->bts_mode[i].mode == cmi)
+ 			return i;
+ 	}
+ 	return -EINVAL;
diff --git a/debian/patches/series b/debian/patches/series
index b7561ae..cf8b7df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_location_of_gsm_data_shared.patch
+keep_up_with_openbscs_amr.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/osmo-bts.git