[osmo-bts] 03/04: More to patch

[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 11f7b319f0bb537eaa9772a8716fb17ed85dee16
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Feb 21 10:00:37 2016 +0100

    More to patch
---
 debian/patches/keep_up_with_openbscs_amr.patch | 76 +++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/debian/patches/keep_up_with_openbscs_amr.patch b/debian/patches/keep_up_with_openbscs_amr.patch
index 858fe02..38d1d46 100644
--- a/debian/patches/keep_up_with_openbscs_amr.patch
+++ b/debian/patches/keep_up_with_openbscs_amr.patch
@@ -3,9 +3,11 @@ Description: This patch has been cherry picked from the upstream
  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
+Index: osmo-bts/src/common/amr.c
+===================================================================
+--- osmo-bts.orig/src/common/amr.c	2016-02-21 09:59:46.298277208 +0100
++++ osmo-bts/src/common/amr.c	2016-02-21 09:59:46.294277057 +0100
+@@ -16,9 +16,9 @@
  
  	for (i = 0; i < amr_mrc->num_modes; i++)
  		LOGPC(ss, logl, ", mode[%u] = %u/%u/%u",
@@ -18,7 +20,7 @@ Author: Ruben Undheim <ruben.undheim at gmail.com>
  	LOGPC(ss, logl, "\n");
  }
  
-@@ -64,23 +64,23 @@ int amr_parse_mr_conf(struct amr_multira
+@@ -64,23 +64,23 @@
  
  	for (i = 0; i < 8; i++) {
  		if (mr_conf[1] & (1 << i)) {
@@ -49,9 +51,11 @@ Author: Ruben Undheim <ruben.undheim at gmail.com>
  	}
  
  	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
+Index: osmo-bts/src/osmo-bts-sysmo/tch.c
+===================================================================
+--- osmo-bts.orig/src/osmo-bts-sysmo/tch.c	2016-02-21 09:59:46.298277208 +0100
++++ osmo-bts/src/osmo-bts-sysmo/tch.c	2016-02-21 09:59:46.294277057 +0100
+@@ -313,7 +313,7 @@
  {
  	unsigned int i;
  	for (i = 0; i < amr_mrc->num_modes; i++) {
@@ -60,3 +64,61 @@ Author: Ruben Undheim <ruben.undheim at gmail.com>
  			return i;
  	}
  	return -EINVAL;
+Index: osmo-bts/src/osmo-bts-trx/l1_if.c
+===================================================================
+--- osmo-bts.orig/src/osmo-bts-trx/l1_if.c	2016-02-21 09:59:44.646216742 +0100
++++ osmo-bts/src/osmo-bts-trx/l1_if.c	2016-02-21 10:00:07.655276973 +0100
+@@ -549,10 +549,10 @@
+ 				trx_sched_set_mode(l1h, chan_nr,
+ 					lchan->rsl_cmode, lchan->tch_mode,
+ 					lchan->tch.amr_mr.num_modes,
+-					lchan->tch.amr_mr.mode[0].mode,
+-					lchan->tch.amr_mr.mode[1].mode,
+-					lchan->tch.amr_mr.mode[2].mode,
+-					lchan->tch.amr_mr.mode[3].mode,
++					lchan->tch.amr_mr.bts_mode[0].mode,
++					lchan->tch.amr_mr.bts_mode[1].mode,
++					lchan->tch.amr_mr.bts_mode[2].mode,
++					lchan->tch.amr_mr.bts_mode[3].mode,
+ 					amr_get_initial_mode(lchan),
+ 					(lchan->ho.active == 1));
+ 				/* init lapdm */
+@@ -577,10 +577,10 @@
+ 				trx_sched_set_mode(l1h, chan_nr,
+ 					lchan->rsl_cmode, lchan->tch_mode,
+ 					lchan->tch.amr_mr.num_modes,
+-					lchan->tch.amr_mr.mode[0].mode,
+-					lchan->tch.amr_mr.mode[1].mode,
+-					lchan->tch.amr_mr.mode[2].mode,
+-					lchan->tch.amr_mr.mode[3].mode,
++					lchan->tch.amr_mr.bts_mode[0].mode,
++					lchan->tch.amr_mr.bts_mode[1].mode,
++					lchan->tch.amr_mr.bts_mode[2].mode,
++					lchan->tch.amr_mr.bts_mode[3].mode,
+ 					amr_get_initial_mode(lchan),
+ 					0);
+ 				break;
+Index: osmo-bts/src/osmo-bts-trx/loops.c
+===================================================================
+--- osmo-bts.orig/src/osmo-bts-trx/loops.c	2016-02-21 09:59:44.646216742 +0100
++++ osmo-bts/src/osmo-bts-trx/loops.c	2016-02-21 10:00:07.655276973 +0100
+@@ -286,7 +286,7 @@
+ 	if (chan_state->dl_cmr > 0) {
+ 		/* degrade, if ber is above threshold FIXME: C/I */
+ 		if (ber >
+-		   lchan->tch.amr_mr.mode[chan_state->dl_cmr-1].threshold_bts) {
++		   lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) {
+ 			LOGP(DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f "
+ 				"from codec id %d to %d of trx=%u "
+ 				"chan_nr=0x%02x\n", ber, chan_state->dl_cmr,
+@@ -301,8 +301,8 @@
+ 	if (chan_state->dl_cmr < chan_state->codecs - 1) {
+ 		/* degrade, if ber is above threshold  FIXME: C/I*/
+ 		if (ber <
+-		    lchan->tch.amr_mr.mode[chan_state->dl_cmr].threshold_bts
+-		  - lchan->tch.amr_mr.mode[chan_state->dl_cmr].hysteresis_bts) {
++		    lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold
++		  - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) {
+ 			LOGP(DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f "
+ 				"from codec id %d to %d of trx=%u "
+ 				"chan_nr=0x%02x\n", ber, chan_state->dl_cmr,

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