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 "The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)". The branch, master has been updated via 3ea9fece6dab31a8dc8f1bf9badad9bb80149fbd (commit) via 255dbfe65579d73fa35db376cf68726acc86fb02 (commit) via 23c3aa37acd9eadcb7d7c740e1413ebf153dcc64 (commit) via c3f72f63afde926dfc46827d6880055597515fb6 (commit) via 2afffd5cf67ad84c4fd8e589798b8697b809ebc5 (commit) via e289a2a86a845759fe1ac75365a6dc54ee9671d3 (commit) via 8d878e8a283a3bfa59d4a0fc39baec406c86cc1e (commit) from 57e8a1fee0316ca97b8fea83c3a5af94056c15fd (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/openbsc/commit/?id=3ea9fece6dab31a8dc8f1bf9badad9bb… commit 3ea9fece6dab31a8dc8f1bf9badad9bb80149fbd Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Tue Sep 27 11:53:23 2016 +0200 cosmetic: bs11: also use ts_is_tch() Use the recently added ts_is_tch() function instead of an explicit switch to determine TCH pchan types. This is a cosmetic change since the bs11 does not support dynamic channels (which was the main motivator behind ts_is_tch()). Change-Id: Idf8ce51c76a83210fe3d70e18c51bbaffebb8ad5 http://cgit.osmocom.org/openbsc/commit/?id=255dbfe65579d73fa35db376cf68726a… commit 255dbfe65579d73fa35db376cf68726acc86fb02 Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Sun Sep 25 15:07:01 2016 +0200 dyn TS: fix: e1_config.c: switch(pchan) for dyn TS Add ts_is_tch() in gsm_data_shared.h/.c and use it to replace a switch on the pchan in e1_config.c. This patch is not due to an actual observed failure. A general grep for switch on pchan turned up this instance that doesn't handle dyn TS properly. Hence this patch is not actually tested with real equipment. Change-Id: Ide4f156034bab77140d2d9a8c462d68ae6f0d6a6 http://cgit.osmocom.org/openbsc/commit/?id=23c3aa37acd9eadcb7d7c740e1413ebf… commit 23c3aa37acd9eadcb7d7c740e1413ebf153dcc64 Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Sun Sep 25 15:15:59 2016 +0200 dyn TS: fix: abis_om2000: also handle dyn TS as TCH Add ts2comb() to switch on dyn TS so that dyn TS in TCH mode are also treated like normal TCH/H or TCH/F pchans. Use ts2comb() instead of pchan2comb(). Change-Id: Iddc51a4409488d91db59228ca66aaab73ce3f1df http://cgit.osmocom.org/openbsc/commit/?id=c3f72f63afde926dfc46827d68800555… commit c3f72f63afde926dfc46827d6880055597515fb6 Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Sun Sep 25 15:33:02 2016 +0200 dyn TS: fix: ts_subslots() for TCH/F_PDCH in PDCH mode In gsm_data_shared.c, add ts_pchan() to determine actual pchan type for dynamic and non-dynamic TS. Use in ts_subslots() to fix the value returned for TCH/F_PDCH in PDCH mode. Adjust the assertion in channel_test.c accordingly. Drop GSM_PCHAN_TCH_F_PDCH, which is now handled in ts_pchan(). Explicitly add GSM_PCHAN_PDCH as zero in subslots_per_pchan[] (cosmetic). Adjust the comment in subslots_per_pchan[]. The fix for the number of subslots affects only one caller: bts_chan_load() in chan_alloc.c. Before this, it would always include a TCH/F_PDCH in the load_counter->total, now it is skipped when in PDCH mode. Whether this is the way bts_chan_load() should handle dynamic TS is a separate discussion, so far I'm only making sure that the two dyn TS kinds act in the same way: TCH/F_TCH/H_PDCH is only counted when in TCH mode, and TCH/F_PDCH should match. Change-Id: Icd6668667ad2be7ad20866ffd185bf3b8711ccd6 http://cgit.osmocom.org/openbsc/commit/?id=2afffd5cf67ad84c4fd8e589798b8697… commit 2afffd5cf67ad84c4fd8e589798b8697b809ebc5 Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Sun Sep 25 17:01:20 2016 +0200 Revert "bts: extend bts_chan_load to allow counting tch only" This reverts commit 308cb0719dca3ba8eed1eff2a2124d44f34d9a28. Problems in this commit: openbsc/src/libbsc/chan_alloc.c:523: case GSM_PCHAN_TCH_F_PDCH: This is actually wrong, GSM_PCHAN_TCH_F_PDCH use ts->flags, not ts->dyn below (due to historical reasons and could be unified). 560: if (only_count_tch && !chan_is_tch(ts)) This has exactly one effect: it excludes GSM_PCHAN_TCH_F_PDCH when in PDCH mode, because for all other PDCH (plain PDCH and TCH/F_TCH/H_PDCH in PDCH mode) below ts_subslots() returns 0 and skips the for() loop. I consider this a bug in TCH/F_PDCH, to be fixed in an upcoming commit. I don't see why we need the only_count_tch argument, because this should normally only count TCH, weren't it for the TCH/F_PDCH bug. If dyn TS should be counted differently, we should do this in a different way. Change-Id: I34dbbaf53a800115e3d03bd44028cad675f3b525 http://cgit.osmocom.org/openbsc/commit/?id=e289a2a86a845759fe1ac75365a6dc54… commit e289a2a86a845759fe1ac75365a6dc54ee9671d3 Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Sun Sep 25 15:58:01 2016 +0200 channel_test: test nr of subslots for dyn pchan, with error Add test_dyn_ts_subslots() and call from main(). Update channel_test.ok. This includes erratic assert to show a bug for TCH/F_PDCH in PDCH mode: the nr of subslots should be the same as for a normal PDCH, i.e. zero. This will be adjusted along with the fix in an upcoming commit. Change-Id: I09685be3fb3ed1ead4577b772a9fbc31967980d1 http://cgit.osmocom.org/openbsc/commit/?id=8d878e8a283a3bfa59d4a0fc39baec40… commit 8d878e8a283a3bfa59d4a0fc39baec406c86cc1e Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Sun Sep 25 15:47:36 2016 +0200 channel test: prepare to add another test function Move the main() guts to test_request_chan(), so that I can add another test in an upcoming commit. Change-Id: I1349d0f416806416080d4667ad697f7db1ea252d ----------------------------------------------------------------------- Summary of changes: openbsc/include/openbsc/chan_alloc.h | 2 +- openbsc/include/openbsc/gsm_data_shared.h | 1 + openbsc/src/libbsc/abis_om2000.c | 18 +++++++++++-- openbsc/src/libbsc/bsc_ctrl_commands.c | 2 +- openbsc/src/libbsc/bsc_vty.c | 2 +- openbsc/src/libbsc/bts_siemens_bs11.c | 8 +----- openbsc/src/libbsc/chan_alloc.c | 29 +++------------------ openbsc/src/libbsc/e1_config.c | 7 +----- openbsc/src/libbsc/paging.c | 2 +- openbsc/src/libcommon/gsm_data_shared.c | 42 ++++++++++++++++++++++++++----- openbsc/tests/channel/channel_test.c | 42 ++++++++++++++++++++++++++++--- openbsc/tests/channel/channel_test.ok | 1 + 12 files changed, 102 insertions(+), 54 deletions(-) hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)