Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts: openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c openair1/PHY/LTE_TRANSPORT/dlsch_coding.c openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/pre_processor.c openair2/LAYER2/openair2_proc.c openair2/RRC/LITE/rrc_eNB.c openair3/NAS/UE/API/USIM/usim_api.c openair3/NAS/UE/ESM/esm_ebr_context.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 47 additions, 3 deletionscmake_targets/CMakeLists.txt
- cmake_targets/autotests/run_compilation_autotests.bash 3 additions, 3 deletionscmake_targets/autotests/run_compilation_autotests.bash
- cmake_targets/tools/fix_asn1 177 additions, 0 deletionscmake_targets/tools/fix_asn1
- cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff 23 additions, 0 deletions...s/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
- cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff 8 additions, 0 deletions...ets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff
- cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff 4 additions, 0 deletions...ets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff
- cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff 8 additions, 0 deletions...ets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff
- cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff 15 additions, 0 deletions...a/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
- cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff 4 additions, 0 deletions...ets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff
- cmake_targets/tools/test_helper 1 addition, 1 deletioncmake_targets/tools/test_helper
- common/utils/collection/hashtable/hashtable.c 0 additions, 1 deletioncommon/utils/collection/hashtable/hashtable.c
- common/utils/itti/memory_pools.c 2 additions, 0 deletionscommon/utils/itti/memory_pools.c
- openair1/PHY/INIT/lte_init.c 5 additions, 5 deletionsopenair1/PHY/INIT/lte_init.c
- openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c 1 addition, 1 deletionopenair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
- openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c 1 addition, 1 deletionopenair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
- openair1/PHY/LTE_TRANSPORT/dlsch_coding.c 1 addition, 0 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_coding.c
- openair1/PHY/defs.h 6 additions, 4 deletionsopenair1/PHY/defs.h
- openair1/SCHED/phy_mac_stub.c 3 additions, 3 deletionsopenair1/SCHED/phy_mac_stub.c
- openair1/SCHED/phy_procedures_lte_eNb.c 9 additions, 7 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair1/SCHED/phy_procedures_lte_ue.c 2 additions, 0 deletionsopenair1/SCHED/phy_procedures_lte_ue.c
Loading
Please register or sign in to comment