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, neels/dyn_fixes2 has been created at f3f9d145485283422ea4dec7a13f1a2b1e6290dd (commit) - Log ----------------------------------------------------------------- http://cgit.osmocom.org/openbsc/commit/?id=f3f9d145485283422ea4dec7a13f1a2b1... commit f3f9d145485283422ea4dec7a13f1a2b1e6290dd Author: Neels Hofmeyr <nhofmeyr@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=babda0e61b06f30df8d2fb5333bde756c... commit babda0e61b06f30df8d2fb5333bde756cce7e3fd Author: Neels Hofmeyr <nhofmeyr@sysmocom.de> Date: Sun Sep 25 15:07:01 2016 +0200 dyn TS: fix: bs11, om2000: two 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 two (unrelated) places: libbsc/bts_siemens_bs11.c and e1_config.c. This patch is not due to an actual observed failure. A general grep for switch on pchan turned up these two instances that don'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=22687129cda65bafbc7b19e2f97e1e582... commit 22687129cda65bafbc7b19e2f97e1e5822edbae8 Author: Neels Hofmeyr <nhofmeyr@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=fbcbbef242c281378eeff0396bd719cee... commit fbcbbef242c281378eeff0396bd719ceeedb6000 Author: Neels Hofmeyr <nhofmeyr@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=aecaee097d8deb27928186bebca272b5c... commit aecaee097d8deb27928186bebca272b5c838f3d7 Author: Neels Hofmeyr <nhofmeyr@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=508a0786fd23407c358c8fe2a4c56dfff... commit 508a0786fd23407c358c8fe2a4c56dfff7eb8fc5 Author: Neels Hofmeyr <nhofmeyr@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 ----------------------------------------------------------------------- hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)