osmo-bts: Apply the sysmobts-mgr hotfix onto the last version

I take the most conversative route and apply the single sysmobts-mgr
patch to get a working "ipaccess-find" again.
This commit is contained in:
Holger Hans Peter Freyther 2014-06-01 12:06:50 +02:00
parent b895e31fd8
commit 70bfea442d
2 changed files with 45 additions and 2 deletions

View File

@ -0,0 +1,42 @@
From a7f9b58e44fa7119e7113269765302a0b8a619d5 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 30 May 2014 12:42:31 +0200
Subject: [PATCH] sysmobts: Fix the initialization of the BTS manager code
The code should only run for the sysmoBTS 2050 and TRX 0.
If the device is not marked as 2050 the code would attempt
to open /dev/ttyS0 and block forever.
---
src/osmo-bts-sysmo/misc/sysmobts_mgr.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: git/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
===================================================================
--- git.orig/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
+++ git/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
@@ -188,16 +188,17 @@ static void initialize_sbts2050(void)
return;
}
- if (val == 2050) {
- if (sysmobts_par_get_int(SYSMOBTS_PAR_TRX_NR, &val) < 0) {
- LOGP(DFIND, LOGL_ERROR,
- "Failed to get the TRX number\n");
- return;
- }
+ if (val != 2050)
+ return;
- if (val != 0)
- return;
+ if (sysmobts_par_get_int(SYSMOBTS_PAR_TRX_NR, &val) < 0) {
+ LOGP(DFIND, LOGL_ERROR, "Failed to get the TRX number\n");
+ return;
}
+
+ if (val != 0)
+ return;
+
trx_nr = val;
ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200);

View File

@ -3,11 +3,12 @@ LICENSE = "AGPLv3"
LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/features/handover;name=osmobts;destsuffix=git \
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc \
file://0001-sysmobts-Fix-the-initialization-of-the-BTS-manager-c.patch"
SRCREV_osmobts = "0a1699ff8a5462c167c24e8b28186abb26331698"
SRCREV_openbsc = "1b148ec1009c32faea269331836e366cfff7d18e"
PV = "0.4.1+git${SRCPV}"
PR = "r7.${META_TELEPHONY_OSMO_INC}"
PR = "r8.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git"
SRCREV_FORMAT = "openbsc-rosmobts"