openbsc.git branch neels/dyn_ts updated. 0.15.0-376-g5be478b

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 b6ac607ca4c27654d7296f51c5ce91667a27b7c7 (commit) discards 8e080d462efd753127d70712843d1e5c49fb9efc (commit) discards b865d8a3a35a7ef0527a7046f68c44bd873a4eda (commit) discards 00db96f4a09ae6134717f2342a2ec392598b2edb (commit) discards aef5d5f08216483679e3de5db7f205badbce36ee (commit) discards 1fe767799be1b12b8419cff47cdee057bf1a42e1 (commit) discards 57b9f4f00294ce075a468d6806bdf6b32f6334eb (commit) discards 5ce7702afbcbdee1a41b68c6ba7224d8d2561239 (commit) discards 69e11d9ac8056b97b05c7f32e3eb10676d71d00a (commit) discards 80b01c9169b37f937ce4acbec8817a379082da14 (commit) discards b33329c9d73274c9093b767ac91bd10c9b108b6c (commit) discards 6de65e14d22f9743b4d6f5a1a002b56d58a7912e (commit) discards e371115d07a9569d8ddbacdd6405cd9fda9b5f56 (commit) discards be926a72e42eeade042b5dd6e62e415621e07958 (commit) discards 4c80eab89a942fdb5cba986925a36947a32f0a47 (commit) discards b0a42ae7dee38accd653e8b7f32459fca65830fd (commit) discards 0eb5adb533096a7c3f73bbe53354c4b7ad24b5f3 (commit) discards 97f9f61cdb983ca0757a3325093bb09152abf7d6 (commit) discards c61461c7eb752744821670004c1b7d9777682742 (commit) discards f3173fc87ea4a040c4e558cf1db03b744594fafe (commit) discards 571fda8c71fbcbabea3d03c8d86a622a931b31dc (commit) via 5be478b7574fc9152a4df2eb066abde001769b0b (commit) via c06c5f7baab99b35d506c0c38769c4a222b8cd6d (commit) via 4975485fa51f59357ac76ad24f0b2cda48c13e0e (commit) via 597c1df5611a21ad82a7dbb8d19103d55a3209c2 (commit) via 49647d24e9fa5c812a88f138dc4c39c8cf2a970d (commit) via 436df63a2eeae38e168792be3f505e5470c5c172 (commit) via e103d7607f46f5a6042edb841479dba4ff9d7c40 (commit) via 6808c1acd5dc9b89ef2481d858870af35ec97f7c (commit) via fa1cf8ff522221b021de6a01191ad0d65ef15e0c (commit) via 96087201aa17585be4c20d877883ed2897d1d1c7 (commit) via 3861aca82be42114e4a58415ac36243ed646369a (commit) via 7ae34bd787abd4f5105ad3111ce76e0d48e84009 (commit) via 90d077f89056a6e48dc0bdc773f78c8d8266e66a (commit) via 2e99962a168b4d6b185dcc3bc9476c6812cda717 (commit) via 49a899600f66099953302a9c5e209cc7a8e69407 (commit) via 96571b0ed54ec59bf063a7f7b647525d246fb586 (commit) via 03d07fe5930b2e4739e92e286e88c772559852dd (commit) via 30fd7dedbd3041bfeb1fa2938365871b5ca7c88c (commit) via 8b1c7b8decad0678bd0e42e897d7686e92b74172 (commit) via cc5814b53c51994305f141c469e7cdd45f20dd43 (commit) via 86a0f91ca2a825c276dee4acf5fe93c016d5506a (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 (b6ac607ca4c27654d7296f51c5ce91667a27b7c7) \ N -- N -- N (5be478b7574fc9152a4df2eb066abde001769b0b) 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=5be478b7574fc9152a4df2eb066abde0… commit 5be478b7574fc9152a4df2eb066abde001769b0b Author: Neels Hofmeyr <neels(a)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=c06c5f7baab99b35d506c0c38769c4a2… commit c06c5f7baab99b35d506c0c38769c4a222b8cd6d Author: Neels Hofmeyr <neels(a)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=4975485fa51f59357ac76ad24f0b2cda… commit 4975485fa51f59357ac76ad24f0b2cda48c13e0e Author: Neels Hofmeyr <neels(a)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 in abis_rsl.h, so we can start the initial switchover to PDCH from dyn_ts_init(); in abis_rsl.h include gsm_utils.h for enum gsm_phys_chan_config. Change-Id: I5c0b257ba8ff0e9c9a2268681a84b0681a778368 http://cgit.osmocom.org/openbsc/commit/?id=597c1df5611a21ad82a7dbb8d19103d5… commit 597c1df5611a21ad82a7dbb8d19103d55a3209c2 Author: Neels Hofmeyr <neels(a)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=49647d24e9fa5c812a88f138dc4c39c8… commit 49647d24e9fa5c812a88f138dc4c39c8cf2a970d Author: Neels Hofmeyr <neels(a)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=436df63a2eeae38e168792be3f505e54… commit 436df63a2eeae38e168792be3f505e5470c5c172 Author: Neels Hofmeyr <neels(a)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=e103d7607f46f5a6042edb841479dba4… commit e103d7607f46f5a6042edb841479dba4ff9d7c40 Author: Neels Hofmeyr <neels(a)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=6808c1acd5dc9b89ef2481d858870af3… commit 6808c1acd5dc9b89ef2481d858870af35ec97f7c Author: Neels Hofmeyr <neels(a)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=fa1cf8ff522221b021de6a01191ad0d6… commit fa1cf8ff522221b021de6a01191ad0d65ef15e0c Author: Neels Hofmeyr <neels(a)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=96087201aa17585be4c20d877883ed28… commit 96087201aa17585be4c20d877883ed2897d1d1c7 Author: Neels Hofmeyr <neels(a)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=3861aca82be42114e4a58415ac36243e… commit 3861aca82be42114e4a58415ac36243ed646369a Author: Neels Hofmeyr <neels(a)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=7ae34bd787abd4f5105ad3111ce76e0d… commit 7ae34bd787abd4f5105ad3111ce76e0d48e84009 Author: Neels Hofmeyr <neels(a)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=90d077f89056a6e48dc0bdc773f78c8d… commit 90d077f89056a6e48dc0bdc773f78c8d8266e66a Author: Neels Hofmeyr <neels(a)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=2e99962a168b4d6b185dcc3bc9476c68… commit 2e99962a168b4d6b185dcc3bc9476c6812cda717 Author: Neels Hofmeyr <neels(a)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=49a899600f66099953302a9c5e209cc7… commit 49a899600f66099953302a9c5e209cc7a8e69407 Author: Neels Hofmeyr <neels(a)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=96571b0ed54ec59bf063a7f7b647525d… commit 96571b0ed54ec59bf063a7f7b647525d246fb586 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 16:14:06 2016 +0200 dyn TS: add ts->dyn state 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=03d07fe5930b2e4739e92e286e88c772… commit 03d07fe5930b2e4739e92e286e88c772559852dd Author: Neels Hofmeyr <neels(a)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=30fd7dedbd3041bfeb1fa2938365871b… commit 30fd7dedbd3041bfeb1fa2938365871b5ca7c88c Author: Neels Hofmeyr <neels(a)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=8b1c7b8decad0678bd0e42e897d7686e… commit 8b1c7b8decad0678bd0e42e897d7686e92b74172 Author: Neels Hofmeyr <neels(a)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=cc5814b53c51994305f141c469e7cdd4… commit cc5814b53c51994305f141c469e7cdd45f20dd43 Author: Neels Hofmeyr <neels(a)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=86a0f91ca2a825c276dee4acf5fe93c0… commit 86a0f91ca2a825c276dee4acf5fe93c016d5506a Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Mon Jul 25 12:33:02 2016 +0200 log lchan_alloc() result It is particularly interesting to see whether a given lchan type is allocated on a dynamic timeslot. Change-Id: I8a0bca6d9cd583a0988e5ee8f4e6f74f218f4185 ----------------------------------------------------------------------- Summary of changes: openbsc/include/openbsc/abis_rsl.h | 1 + openbsc/src/libbsc/chan_alloc.c | 34 +++++++++------------------------- 2 files changed, 10 insertions(+), 25 deletions(-) hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)