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_ts has been updated discards 8ea535d406279b9f651c0030b89c94a13fe57d3b (commit) discards 439154451785e73a96dbe56e7b687905439f18cf (commit) discards 26753d71a5a9c077e7ef3d049aa85a068f260428 (commit) discards 497b96ed1191eeb72adeaa2c20dbc16b5cb6989d (commit) discards c8d815c5cc980b4ced159f2a8cdcff467bdf2b12 (commit) discards 82439efc8bfe17c17dad5afc610c2ef9beeb7c74 (commit) discards e69b2e80cb9cb11253bf41264ef06435247dff9a (commit) discards 6c7ebc24647c40288e5b42bc070450e67d438e8e (commit) discards c1e56ed9a2528dfcdab5505d667117c870aa9735 (commit) discards 3c28afa31f11ae2ce28ec98f21eabc819bf3668f (commit) discards 1f28fe702503a142f4c2941b9531e8eed7ad59fd (commit) discards d6590999e510af411121a788e6e3d556f9460408 (commit) discards bf60a6b7736b1c1c9f2c940803fb6c3be251789b (commit) discards d7832dd956f0212851cae1cdebd132bd0cdc52ae (commit) discards 18accac7c9d05152e9986b3a978a907009971aea (commit) discards 26ca593264813b0f414e2e94ccdfd3605fbad6cf (commit) discards 24693c5d0c585b8ab4f24ead581971b9271d1a76 (commit) discards 9b6960d0799f50e86f66473fe9556e33b5ca6405 (commit) discards 265b42ef4dd490b2d358f3de5f8d6ba8c7e48664 (commit) discards 2197099330e41d4e8d7ed1d3c2806f9d48b065b8 (commit) discards 7155b5f4f41accd95ff47e0130e90ee10bf7c92e (commit) discards 77a291410a81bc97524389a0c8ee26b30faeb182 (commit) discards 048de3ed85b9c93d7b8d8e306764cadf121f1dfe (commit) via 383521ab51181f2d48d0775c1253a0f2b58ef637 (commit) via 093badbc4a980d928f39083437692d8b79843da6 (commit) via 64a384c37fe41f6aa91de75e722e7cc705be7e15 (commit) via 7495a8b16a7cce1adac58737af09e4b988990a11 (commit) via 77d8f0e6098e277a8f5fb6381faf69d84ab39e31 (commit) via 5305c2469576538109ca8af1b02e3f188f0aa150 (commit) via 0ca258b6884f2ccffef66c60d4080f5d136904d5 (commit) via 72bacbc33112425d60ea658d1419f1094a15bbf0 (commit) via 89796af3b64523a8eb7a624c89dbdbc7e8b9c84d (commit) via fe6dc1ebf1b96da21e9fd3cd94859fca4d082861 (commit) via 1e434e04dd7f72cb4d1bf1f2a3f9357aeedcfa29 (commit) via 8576da475b4b16cf40126e416acd13f3774385ed (commit) via 8f8cca0b58b873e789d6a34b1b25b4ca3dcd2f38 (commit) via 43959f5e7bbfcac08064036e6d9bac49b0a2eae1 (commit) via 4d11481faf1a3442f9d53e4632bda6bba743ae89 (commit) via 66afa6841abb976358a460e95ea37963890e8671 (commit) via def6522241ae224521b77c25e1160940812a152a (commit) via 294dbb2c904e477787e36ed5cfb4279a7e20543d (commit) via 9bd0fd098d7e44fcb566795582ce02ec202d6b53 (commit) via 278976eb670e373fe2e30ecae2d00bdbf674ebd5 (commit) via 66fd0ae879edeb66f438b638d2b3066b76b3aec8 (commit) via 77b72a846f113a2b4570b18f7f88458f7d215207 (commit) via dc29e9a5fcc7ce934f17b800aaab65fe1064625b (commit) via ae815b7a51fbb7d6146dff4ca0452417dd9cab1a (commit) via 3c3c6f1fb8a8525f92e56fa018d8a01e19177a67 (commit) via 64d64de5550bb0d898a9f0c6cb3db8680f357e7a (commit) via 3badb9fc47610eed2e3dd146470a2f14c41dc861 (commit) via 01a7a18a5ff51dfc23d5e8cca13aada0d4d79adc (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (8ea535d406279b9f651c0030b89c94a13fe57d3b) \ N -- N -- N (383521ab51181f2d48d0775c1253a0f2b58ef637) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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=383521ab51181f2d48d0775c1253a0f2b... commit 383521ab51181f2d48d0775c1253a0f2b58ef637 Author: Neels Hofmeyr <nhofmeyr@sysmocom.de> Date: Tue Jun 14 01:32:46 2016 +0200 debug log: log all lchan_alloc steps Change-Id: Ib2d11744d92dc06205fb1573815e11efd84842b0 http://cgit.osmocom.org/openbsc/commit/?id=093badbc4a980d928f39083437692d8b7... commit 093badbc4a980d928f39083437692d8b79843da6 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 20:15:28 2016 +0200 dyn TS: OS#1778 workaround: disable TCH/F on dyn TS To avoid two phones picking mismatching TCH pchans, disable TCH/F on dynamic pchans for now. See http://osmocom.org/issues/1778 Related: OS#1778 Change-Id: If7e4797a72815fc6e2bbef27756ea5df69f4bde7 http://cgit.osmocom.org/openbsc/commit/?id=64a384c37fe41f6aa91de75e722e7cc70... commit 64a384c37fe41f6aa91de75e722e7cc705be7e15 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 17:17:34 2016 +0200 dyn TS: Rename bsc_dyn_pdch.c to bsc_dyn_ts.c It's no longer just for IPAC style TCH/F_PDCH, but also contains code for TCH/F_TCH/H_PDCH, so pick a more general name. Change-Id: Ic19db81eca03fd72738839ee3686b6b4c8b6b437 http://cgit.osmocom.org/openbsc/commit/?id=7495a8b16a7cce1adac58737af09e4b98... commit 7495a8b16a7cce1adac58737af09e4b988990a11 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 20:08:41 2016 +0200 dyn TS: split dyn_pdch_init() for new dyn type and rename Init both TCH/F_PDCH and TCH/F_TCH/H_PDCH via dyn_ts_init(), which refactors dyn_pdch_init(). Make dyn_ts_switchover_start from abis_rsl.c public so we can call it from dyn_ts_init(). Change-Id: I5c0b257ba8ff0e9c9a2268681a84b0681a778368 http://cgit.osmocom.org/openbsc/commit/?id=77d8f0e6098e277a8f5fb6381faf69d84... commit 77d8f0e6098e277a8f5fb6381faf69d84ab39e31 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 19:45:15 2016 +0200 dyn TS: implement pchan switchover logic In struct gsm_lchan, add dyn.rqd_ref and dyn.rqd_ta. These save the Channel Requested details across the PDCH deactivation dance. abis_rsl.c: add static functions: * dyn_ts_switchover*() for the various stages of switchover between pchans. * pchan_for_lchant() to derive the desired pchan from the lchan type that was set during lchan_alloc(). * rsl_chan_activate_lchan_as_pdch() to compose the simpler RSL CHAN ACT message without introducing numerous special cases to the normal RSL CHAN ACT code. In rsl_chan_activate_lchan(), detect and initiate required pchan switchovers if requested pchan on a dyn TS differs. In rsl_rx_rf_chan_rel_ack(), initiate or continue pchan switchovers after a channel was released. In rsl_rx_chan_act_ack(), notice that a switchover is complete. Change-Id: I5c6bce13092a10204113d84678c587c65e35e4fd http://cgit.osmocom.org/openbsc/commit/?id=5305c2469576538109ca8af1b02e3f188... commit 5305c2469576538109ca8af1b02e3f188f0aa150 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 21:00:51 2016 +0200 dyn TS: rename lchan->dyn_pdch to lchan->dyn This will also be used by the new dynamic TS type, so make the name more general. Change-Id: I2451b10519dff3e5cdf503b430574c0984d19000 http://cgit.osmocom.org/openbsc/commit/?id=0ca258b6884f2ccffef66c60d4080f5d1... commit 0ca258b6884f2ccffef66c60d4080f5d136904d5 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 19:59:31 2016 +0200 dyn TS: add ts_subslots() abis_rsl.c will need to know the number of subslots per pchan, to verify that all lchans are free before dyn TS switchover. The subslots_per_pchan[] array is static to lchan_alloc.c, and since we need a check for dyn TS anyway, add public ts_subslots() to lchan_alloc.c, which also checks the current dyn pchan type. Change-Id: I69d8f1ec7a828028bffdf7641ca410a7d5814488 http://cgit.osmocom.org/openbsc/commit/?id=72bacbc33112425d60ea658d1419f1094... commit 72bacbc33112425d60ea658d1419f1094a15bbf0 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 19:51:09 2016 +0200 dyn TS: chan act: set chan_nr according to dyn pchan type Change-Id: Ica5ef2197b3e97d5e895f3e3221295d5d0ef8908 http://cgit.osmocom.org/openbsc/commit/?id=89796af3b64523a8eb7a624c89dbdbc7e... commit 89796af3b64523a8eb7a624c89dbdbc7e8b9c84d Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Thu Jul 14 03:01:24 2016 +0200 dyn TS: enhance channel allocator for dynamic TS Change _lc_find_bts() to _lc_dyn_find_bts() with added dyn_as_pchan arg to pass exactly as which pchan we'd like to allocate on a dynamic TS. Add _lc_find_bts() as wrapper so non-dynamic-TS callers remain unchanged. Also add dyn_as_pchan arg to _lc_find_trx() (not renaming to dyn and wrapping because there is only one caller). Implement dynamic allocator logic in _lc_find_trx() and lchan_alloc(). A returned dynamic channel still needs to be switched to the proper mode, which will follow in another commit. Replace a fixme comment with a normal comment in subslots_per_pchan[], because handling of dynamic TS is now defined. Change-Id: I18da7679300c43220d9baa6a304e8df74d366249 http://cgit.osmocom.org/openbsc/commit/?id=fe6dc1ebf1b96da21e9fd3cd94859fca4... commit fe6dc1ebf1b96da21e9fd3cd94859fca4d082861 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 20:18:40 2016 +0200 dyn TS: rsl *2chan_nr(): handle TCH/F_TCH/H_PDCH In gsm_lchan2chan_nr() use the current pchan type. In gsm_lchan_as_pchan2chan_nr(), add the special case of non-standard cbits for activating PDCH on a TCH/F_TCH/H_PDCH dyn TS. This way, gsm_pchan2chan_nr() conforms to the standard and does not need access to a ts struct. Change-Id: If248b9073b9f397110a2003d8e1a04afdc1c0e20 http://cgit.osmocom.org/openbsc/commit/?id=1e434e04dd7f72cb4d1bf1f2a3f9357ae... commit 1e434e04dd7f72cb4d1bf1f2a3f9357aeedcfa29 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Mon Jul 18 23:43:44 2016 +0200 dyn TS: gsm_lchan2chan_nr(): decouple from ts->pchan For upcoming dynamic TS, the pchan choice for RSL De-/Activation is not trivial. So in order to pass the desired pchan to generate the RSL chan_nr, introduce gsm_lchan_as_pchan2chan_nr(). To avoid code dup, this requires decoupling the gsm_ts2chan_nr() pchan from the actual ts struct, so refactor gsm_ts2chan_nr() to gsm_pchan2chan_nr() with explicit pchan, ts_nr and lchan_nr arguments. Change-Id: I1a40e8452fe8120d350a27973e56be0b8c8c517f http://cgit.osmocom.org/openbsc/commit/?id=8576da475b4b16cf40126e416acd13f37... commit 8576da475b4b16cf40126e416acd13f3774385ed Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 19:49:58 2016 +0200 prepare dyn TS: act lchan: fetch the channel mode a bit later Change-Id: I66d88ad6a4ae7bee1e552960fd4e92aff953125c http://cgit.osmocom.org/openbsc/commit/?id=8f8cca0b58b873e789d6a34b1b25b4ca3... commit 8f8cca0b58b873e789d6a34b1b25b4ca3dcd2f38 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Mon Jul 18 23:56:08 2016 +0200 error log: rsl_chan_activate_lchan: log channel mode error Change-Id: I0f403b13ff9897770c0b855bf57a9440717b46e8 http://cgit.osmocom.org/openbsc/commit/?id=43959f5e7bbfcac08064036e6d9bac49b... commit 43959f5e7bbfcac08064036e6d9bac49b0a2eae1 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Mon Jul 18 23:54:54 2016 +0200 debug log: rsl_chan_activate_lchan: log activation type Change-Id: I9b6b43b4fad62195af0009ab12632125de39d4fe http://cgit.osmocom.org/openbsc/commit/?id=4d11481faf1a3442f9d53e4632bda6bba... commit 4d11481faf1a3442f9d53e4632bda6bba743ae89 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 20:06:27 2016 +0200 cosmetic: dyn_pdch_init(): debug log: use new gsm_ts_and_pchan_name() Change-Id: I396c2696bdbedb41a1f1fe2183f8eada57dc3413 http://cgit.osmocom.org/openbsc/commit/?id=66afa6841abb976358a460e95ea379638... commit 66afa6841abb976358a460e95ea37963890e8671 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 16 23:59:32 2016 +0200 gsm_data_shared: add gsm_ts_and_pchan_name() for dyn ts logging Change-Id: I9b6be77c9e5fb9dffa2021a2da72293af15a03a0 http://cgit.osmocom.org/openbsc/commit/?id=def6522241ae224521b77c25e11609408... commit def6522241ae224521b77c25e1160940812a152a Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 16:14:06 2016 +0200 dyn TS: add ts->dyn state, use new GSM_PCHAN_TCH_F_TCH_H_PDCH Add GSM_PCHAN_TCH_F_TCH_H_PDCH in gsm_pchant_names and gsm_pchant_descs: the VTY can now handle the new pchan type. Add state fields osmo_bts_trx_ts->dyn.* to record dynamic timeslot state. Initialize in gsm_bts_trx_alloc(). Change-Id: I0a4049df8500b4f7c864f1355c4e9238932d1b8f http://cgit.osmocom.org/openbsc/commit/?id=294dbb2c904e477787e36ed5cfb4279a7... commit 294dbb2c904e477787e36ed5cfb4279a7e20543d Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 17:57:53 2016 +0200 dyn TS: rsl_lchan_lookup(): add dyn PCHAN and PDCH chan bits Change-Id: If8f7c118f69e5a9f370bfe25f82f3d5a8de75b51 http://cgit.osmocom.org/openbsc/commit/?id=9bd0fd098d7e44fcb566795582ce02ec2... commit 9bd0fd098d7e44fcb566795582ce02ec202d6b53 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Thu Jul 14 03:09:56 2016 +0200 dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_* Change-Id: I7ce754a48c7f492e921a4450745383bb8dd7225c http://cgit.osmocom.org/openbsc/commit/?id=278976eb670e373fe2e30ecae2d00bdbf... commit 278976eb670e373fe2e30ecae2d00bdbf674ebd5 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 16:54:16 2016 +0200 gsm_ts2chan_nr(): add assertions for lchan_nr Change-Id: Ibfdef347c85d4a145645a7325cd193ea1b475a54 http://cgit.osmocom.org/openbsc/commit/?id=66fd0ae879edeb66f438b638d2b3066b7... commit 66fd0ae879edeb66f438b638d2b3066b76b3aec8 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 16:47:07 2016 +0200 gsm_ts2chan_nr(): use constants instead of magic numbers Change-Id: I14dceab6ac9f0d4ad852259eae643f567d0982f2 http://cgit.osmocom.org/openbsc/commit/?id=77b72a846f113a2b4570b18f7f88458f7... commit 77b72a846f113a2b4570b18f7f88458f7d215207 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Mon Jul 18 23:47:24 2016 +0200 error log: abis_rsl.c: log errors in channel_mode_from_lchan() Change-Id: Ifa416eab76e6c26dc83e979d815ae778d0d7133b http://cgit.osmocom.org/openbsc/commit/?id=dc29e9a5fcc7ce934f17b800aaab65fe1... commit dc29e9a5fcc7ce934f17b800aaab65fe1064625b Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 17:38:22 2016 +0200 code dup: join [rsl_]lchan_lookup() from libbsc and osmo-bts lchan_lookup in abis_rsl.c and rsl_lchan_lookup() from osmo-bts rsl.c are the same code, except for the log context, which is only set in abis_rsl.c. Factor out the common code to rsl_lchan_lookup() in gsm_data_shared.c. Openbsc and osmo-bts each define their own DRSL log constant, so add an int *rc return code argument and keep the logging part in abis_rsl.c's thin lchan_lookup() wrapper. Incidentally, this also removes code dup for logging. To avoid duplicate symbols, the rsl_lchan_lookup() implementation needs to be removed from osmo-bts, so older osmo-bts git revisions will not build with this. Change-Id: Ie89bc5bb9110a0e539d37991dedac6f913211b48 http://cgit.osmocom.org/openbsc/commit/?id=ae815b7a51fbb7d6146dff4ca0452417d... commit ae815b7a51fbb7d6146dff4ca0452417dd9cab1a Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Thu Jul 14 02:51:13 2016 +0200 comments: clarify some dynamic TS comments A new type of dynamic channel will be introduced soon, so prepare some comments to name the dynamic TS kind more specifically. Change-Id: I51fa8c2ebba507299e55a5cb7e67e48a6c8471f7 http://cgit.osmocom.org/openbsc/commit/?id=3c3c6f1fb8a8525f92e56fa018d8a01e1... commit 3c3c6f1fb8a8525f92e56fa018d8a01e19177a67 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 20:01:49 2016 +0200 cosmetic: rsl_rx_rf_chan_rel_ack(): use local ts var for brevity In preparation for an upcoming change. Change-Id: I11bd59492fa8d5b9392d9f2b511c8fa9585afe6c http://cgit.osmocom.org/openbsc/commit/?id=64d64de5550bb0d898a9f0c6cb3db8680... commit 64d64de5550bb0d898a9f0c6cb3db8680f357e7a Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Fri Jul 15 01:26:03 2016 +0200 cosmetic: act lchan type: use constant instead of 0x00 Change-Id: Idc8afc4e52e189f474077899eef896381ce238f7 http://cgit.osmocom.org/openbsc/commit/?id=3badb9fc47610eed2e3dd146470a2f14c... commit 3badb9fc47610eed2e3dd146470a2f14c41dc861 Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Thu Jul 14 16:16:33 2016 +0200 cosmetic: rsl_rx_chan_act_ack(): use local lchan var in 14 instances In preparation for an upcoming change. Change-Id: I9ce71fd7dde42ad7d20f806ac70c150d11450efa http://cgit.osmocom.org/openbsc/commit/?id=01a7a18a5ff51dfc23d5e8cca13aada0d... commit 01a7a18a5ff51dfc23d5e8cca13aada0d4d79adc Author: Neels Hofmeyr <neels@hofmeyr.de> Date: Sat Jul 23 16:25:15 2016 +0200 compiler warning: abis_rsl.h: include gsm_utils.h Change-Id: I10f9d64398adabf8fca29663f883ac952470579c ----------------------------------------------------------------------- Summary of changes: openbsc/include/openbsc/gsm_data_shared.h | 6 ++--- openbsc/src/libbsc/abis_rsl.c | 45 ++++++++++++++++--------------- openbsc/src/libbsc/bsc_dyn_ts.c | 5 ---- openbsc/src/libbsc/chan_alloc.c | 37 +++++++------------------ openbsc/src/libbsc/gsm_04_08_utils.c | 8 ++---- openbsc/src/libcommon/gsm_data_shared.c | 44 +++++++++++++----------------- 6 files changed, 57 insertions(+), 88 deletions(-) hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)