6 Sep
2016
6 Sep
'16
7:38 p.m.
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Osmocom BTS-side code (Abis, scheduling, ...)".
The branch, master has been updated
via 3cc91746a3d93824e248c67dda3b69e2eec81281 (commit)
via c9a1f284acf518cb4e62c3898e20398ed53807c3 (commit)
via ed6b48e4a5fba07c3ecccf689991799ae13a2aaa (commit)
from 8431bbb80ffcab865e57b46af0e3a28eaee60108 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cgit.osmocom.org/osmo-bts/commit/?id=3cc91746a3d93824e248c67dda3b69e…
commit 3cc91746a3d93824e248c67dda3b69e2eec81281
Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>
Date: Tue Sep 6 15:15:07 2016 +0200
octphy: fix build with OCTSDR-OPENBSC-02.07.00-B708: name changed
There was an apparent change of name from
cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_IDLE
to
cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNUSED
in:
git://git.osmocom.org/octphy-2g-headers
commit 953a258aadf18c05e8128a339f15b1c5bb377cfd
"Import headers from OCTSDR-OPENBSC-02.07.00-B708.tgz"
In order to build octphy with these headers, apply the same rename in
osmo-bts-octphy/*.
Change-Id: Ic07055860035a7c1b83ab923817423eeb39f33d3
http://cgit.osmocom.org/osmo-bts/commit/?id=c9a1f284acf518cb4e62c3898e20398…
commit c9a1f284acf518cb4e62c3898e20398ed53807c3
Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>
Date: Tue Sep 6 15:08:34 2016 +0200
octphy: fix build: Revert "octphy: add support for multiple trx ids"
This reverts commit c4fc00d8515ddc9990dfaf700c501cb8fe490cab, except: we keep
the part that sets the trx_id in bts_model_phy_instance_set_defaults().
Theoretically, this patch makes a lot of sense, but in order to be able to
build osmo-bts-octphy until the headers version is clarified, revert use of
usCentreArfcn:
Above commit uses an usCentreArfcn member that is never defined in the history
of our octphy-2g-headers.git. This usCentreArfcn does exist in a code snapshot
OCTSDR-2G-02.05.00-B780-DEBUG, which is not (yet?) publicly available.
Also, the current headers version is apparently 02.07, though the octasic
version numbers have been known to cause confusion among osmocom folks.
This along with one other revert fixes this build problem:
make[3]: Entering directory '/n/s/octphy/git/osmo-bts/src/osmo-bts-octphy'
CC l1_oml.o
l1_oml.c: In function ‘l1if_trx_open’:
l1_oml.c:1350:13: error: ‘tOCTVC1_GSM_TRX_CONFIG’ has no member named ‘usCentreArfcn’
oc->Config.usCentreArfcn = plink->u.octphy.center_arfcn;
^
l1_oml.c:1352:13: error: ‘tOCTVC1_GSM_TRX_CONFIG’ has no member named ‘usCentreArfcn’
oc->Config.usCentreArfcn = trx->arfcn;
^
In file included from ../../include/osmo-bts/logging.h:5:0,
from l1_oml.c:33:
l1_oml.c:1365:13: error: ‘tOCTVC1_GSM_TRX_CONFIG’ has no member named ‘usCentreArfcn’
oc->Config.usCentreArfcn, oc->Config.usTsc, oc->RfConfig.ulRxGainDb,
^
Change-Id: Ic643709e8fb3df2d66337190ed1f07fd230d7dca
http://cgit.osmocom.org/osmo-bts/commit/?id=ed6b48e4a5fba07c3ecccf689991799…
commit ed6b48e4a5fba07c3ecccf689991799ae13a2aaa
Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>
Date: Tue Sep 6 15:08:07 2016 +0200
octphy: fix build: Revert "octphy: fix for multiple trx with more than 1
dsp"
This reverts commit 06968beab90806cba94c8b331276e4dc209c152b.
Theoretically, this patch makes a lot of sense, but in order to be able to
build osmo-bts-octphy until the headers version is clarified, revert use of
usCentreArfcn:
Above commit uses an usCentreArfcn member that is never defined in the history
of our octphy-2g-headers.git. This usCentreArfcn does exist in a code snapshot
OCTSDR-2G-02.05.00-B780-DEBUG, which is not (yet?) publicly available.
Also, the current headers version is apparently 02.07, though the octasic
version numbers have been known to cause confusion among osmocom folks.
This along with one other revert fixes this build problem:
make[3]: Entering directory '/n/s/octphy/git/osmo-bts/src/osmo-bts-octphy'
CC l1_oml.o
l1_oml.c: In function ‘l1if_trx_open’:
l1_oml.c:1350:13: error: ‘tOCTVC1_GSM_TRX_CONFIG’ has no member named ‘usCentreArfcn’
oc->Config.usCentreArfcn = plink->u.octphy.center_arfcn;
^
l1_oml.c:1352:13: error: ‘tOCTVC1_GSM_TRX_CONFIG’ has no member named ‘usCentreArfcn’
oc->Config.usCentreArfcn = trx->arfcn;
^
In file included from ../../include/osmo-bts/logging.h:5:0,
from l1_oml.c:33:
l1_oml.c:1365:13: error: ‘tOCTVC1_GSM_TRX_CONFIG’ has no member named ‘usCentreArfcn’
oc->Config.usCentreArfcn, oc->Config.usTsc, oc->RfConfig.ulRxGainDb,
^
Change-Id: I222766f6961f5f35aa3651e2907e3e908fe9a66e
-----------------------------------------------------------------------
Summary of changes:
include/osmo-bts/phy_link.h | 3 +--
src/osmo-bts-octphy/l1_oml.c | 12 ++----------
src/osmo-bts-octphy/l1_utils.c | 2 +-
src/osmo-bts-octphy/octphy_hw_api.c | 2 +-
4 files changed, 5 insertions(+), 14 deletions(-)
hooks/post-receive
--
Osmocom BTS-side code (Abis, scheduling, ...)