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, zecke/features/amr2 has been created at 39c5459215622b9dc816c897fc78f646d26a84da (commit) - Log ----------------------------------------------------------------- http://cgit.osmocom.org/openbsc/commit/?id=39c5459215622b9dc816c897fc78f646… commit 39c5459215622b9dc816c897fc78f646d26a84da Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: Thu Sep 24 16:26:01 2015 +0200 amr: Attempt to unbreak the AMR support in the BSC The signature of mr_config and the BSC implementation didn't match and the compiler was warning about it: osmo_bsc_api.c:530:2: warning: initialization from incompatible pointer type .mr_config = bsc_mr_config, ^ osmo_bsc_api.c:530:2: warning: (near initialization for ‘bsc_handler.mr_config’) Change the mr_config again and provide an implementation that will set the ms and bts data structure. It would be better to put the size outside of the IE but I am not going to change it right now. It would also be nice to either move the AMR setting into the "nitb" structure or have the msc data be used _after_ the bts settings. This needs to be cleaned up in the next step. http://cgit.osmocom.org/openbsc/commit/?id=03a42e313cb82fe00510b9f052586a36… commit 03a42e313cb82fe00510b9f052586a3664e504ce Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: Thu Sep 24 11:39:38 2015 +0200 amr: Kill more duplication and let the code work one of the modes http://cgit.osmocom.org/openbsc/commit/?id=b3c89769a9cbda6e6d676beedd9f0c31… commit b3c89769a9cbda6e6d676beedd9f0c31936dbef4 Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: Thu Sep 24 11:30:58 2015 +0200 amr: Instead of putting ms/bts into the same struct.. use it twice This way a lot of if/else can just be killed by the caller deciding which of the two instances to use. I have copied both branches to new files, replace bts for ms in one of them and ran diff on it. There is no difference. http://cgit.osmocom.org/openbsc/commit/?id=17dcb1506ea61f1d5d2093b2fe75c206… commit 17dcb1506ea61f1d5d2093b2fe75c206d4010504 Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: Thu Aug 20 19:32:46 2015 +0200 amr: Remove some code duplication in preparation Merge two copies into a local static helper function. The format of the message will change and then it is easier to modify it in one place than in two. Sadly the original patch was merged before this clean-up so do the clean-up as second step. Conflicts: openbsc/src/libbsc/abis_rsl.c openbsc/src/libbsc/gsm_04_08_utils.c ----------------------------------------------------------------------- hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)