Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Laurent OpenCells
78da843624
code-cleanup-20210716
2021-07-16 17:16:15 +02:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +01:00
Michael Cook
1f771f74a2
Change some printf statements to LOG_I
...
The printfs were mangling the log.
2020-09-06 10:45:03 -07:00
Michael Cook
3a2e4a3189
Use LOG_A for log messages intended for analysis
...
This change allows us to disable the LOG_I messages to reduce
overhead.
Removed LOG_VAR macro because it was used in only one place, and
a better solution is to simply use `__attribute__((unused))`.
2020-09-06 07:54:56 -07:00
Javier Morgade
e3cf9bcf1f
fembms: handle L2 eNB/UE config
...
Signed-off-by: Javier Morgade <javier.morgade@ieee.org >
2020-07-21 18:11:51 +02:00
Robert Schmidt
2e9f391a0a
Store active LCs in MAC, remove unneeded headers
2020-04-06 13:43:52 +02:00
Robert Schmidt
8ffe5b4920
Rename UE_list_t to UE_info_t, UE_list_t separate struct
...
UE_list_t is now used as a separate list. It can be e.g. used in the
scheduler to mark groups of users. The original UE_list_t is renamed to
UE_info_t to reflect that it is a container for information about UEs.
2020-04-01 10:47:02 +02:00
Raphael Defosseux
7aa35e874b
Removing obsolete LTE_RRC_VERSION
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-10 15:38:13 +01:00
Raphael Defosseux
e7aa071e1b
Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr
2020-01-10 15:35:54 +01:00
Raphael Defosseux
67c7f97350
Merge remote-tracking branch 'origin/452-cdrx-better-support-cu-du-split' into develop_integration_2019_w51
2019-12-17 11:39:50 +01:00
LAD
a3c337cc9f
[to test] Add MAC itti loop and DRX config support
2019-10-30 07:36:44 -07:00
LouisAdrien
206f17b2a4
[under test] Fix CDRX starts at RRCReconfComplete again; new comments
2019-10-10 08:10:16 +02:00
frtabu
b9b4d05e41
remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value)
2019-09-23 19:46:44 +02:00
Stefan Schaffelder
28a4d4f501
cdrx_configured update
2019-09-18 10:47:19 +02:00
Javier Morgade
dc14cdc665
*L2 procedures to enable mixed unicast/broadcast operation at ENB implemeted:
...
-MBMS scheduler developed (oneFrame allocations implemented at this time)
-UE DSLCH schedulers updated: if an eMBMS session running UE DTCH, DCCH will be only scheduled at non MBSFN sufbframes
-eMBMS L2 procedures implemented
-Dedicated MBMS PDCP pipes src/sink enabled (only for TUN)
-BUGFIX eMBMS MAC procedures (wrong indexing at few loops)
-ENB FAPI updated to enable dynamic MBSFN configurations through M2AP (RRC<->MCE)
ACKNOWLEDGEMENT:
1. This commit was developed at Vicomtech (https://www.vicomtech.org ) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu )
Signed-off-by: Javier Morgade <javier.morgade@ieee.org >
2019-09-14 13:23:30 +02:00
yilmazt
4967e1b1ac
develop&-nr up-to-date as of 30.7.19
2019-07-30 22:01:48 +02:00
yilmazt
f37a17e540
develop&-nr current as of 22.7.19 & OAI fully ready for testing
2019-07-22 21:56:44 +02:00
yoshio.inoue
46537af2b2
Merge remote-tracking branch 'origin/OAI_develop' into oai_dev_x2ho_tdd
2019-07-09 14:45:31 +09:00
Wu Jing
02532d044e
x2 handover for tdd
2019-07-04 17:40:31 +09:00
laurent
924e10f73a
fix rfsim ue initial sync and legacy OAI C struct syntax
2019-07-01 15:17:07 +02:00
Raphael Defosseux
8931915030
Merge remote-tracking branch 'origin/434-coverity-scan-fix-week25' into develop_integration_2019_w25
2019-06-21 13:04:51 +02:00
Dong Anyuan
486f1368e0
Fix Coverity Scan CID 339974 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).)
2019-06-20 14:05:13 +09:00
Dong Anyuan
f3c3a1ff67
Fix Coverity Scan CID 340004 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).)
2019-06-20 14:03:17 +09:00
Dong Anyuan
00c10b7706
Fix Coverity Scan CID 261498 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).)
2019-06-20 11:31:42 +09:00
Dong Anyuan
ab06b52486
Fix Coverity Scan CID 261506 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).)
2019-06-20 11:21:07 +09:00
Dong Anyuan
1e14bee4f3
Fix Coverity Scan CID 261548 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).)
2019-06-20 11:15:26 +09:00
Javier Morgade
27a3cff798
BUGFIX and cppcheck/warning suppression
2019-05-21 10:59:17 +02:00
Javier Morgade
fe89f107e3
Code cleanup & CI F1 CD/DU Bugfix
2019-05-20 13:14:51 +02:00
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +02:00
Louis Adrien Dufrene
5ae494e974
merge from develop
2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene
d7cddc2825
Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate
2019-04-15 10:57:39 +02:00
Louis Adrien Dufrene
4c931888e6
Add dci0_ongoing_timer. Commit to build and test.
2019-04-15 08:54:00 +02:00
Louis Adrien Dufrene
46b0a9fb38
Remove bypass_cdrx variable and add cdrx_waiting_ack. The CDRX is now activated at RRC COnnection Reconfiguration Complete reception. To Test
2019-04-11 07:36:05 +02:00
frtabu
30b7c973e0
merge nfapi_cleanup
2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene
7817358197
Cleanup of enb_config.c config.c asn1_msg.c asn1_msg.h
2019-04-05 11:56:29 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
Robert Schmidt
62d9b8cf36
Merge branch 'develop' into feature-127-protocol-split
2019-03-14 13:10:21 +01:00
Konstantinos Alexandris
f76f1f1e1c
x2: bugfix: pass correct rach resource type
2019-03-05 14:56:42 +01:00
Javier Morgade
65e485642e
NFAPI bindings for FeMBMS-CAS
2019-02-28 10:44:44 +01:00
Javier Morgade
39fe25a44d
FeMBMS RRC->MAC config request protypes
2019-02-27 11:01:47 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Raphael Defosseux
341fedd468
Merge branch 'issue394_fix_cppcheck' into develop_integration_2019_w07_v2
...
--> openair2/LAYER2/MAC/eNB_scheduler_primitives.c is still old (not from issue394_fix_cppcheck branch)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-15 12:24:19 +01:00
Javier Morgade
46a8c83b6c
UE procedures for FeMBMS SIB1-MBMS (SystemInformationBlockType1-MBMS message)
...
-- asn1 dissectors ETSI TS 136 331 V14.2.2 (2017-05)
-- schedule_SI_MBMS
-- ue_decode_si_mbms
2019-02-14 15:35:00 +01:00
Cedric Roux
1c6b9f0eda
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
2019-02-13 15:20:45 +01:00
frtabu
501ae74cb5
first set of cppcheck fixes
2019-02-12 09:46:02 +01:00
Cedric Roux
246abce5d1
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_proto.h
openair3/GTPV1-U/gtpv1u_eNB.c
openair3/S1AP/s1ap_eNB_handlers.c
2019-01-18 10:35:39 +01:00
Raymond Knopp
cae1ed0b11
changed some AssertFatal into LOG_E + return(-1)
2019-01-15 21:31:29 +01:00