Laurent THOMAS
7d3c60ed37
small fixes, make all compile is same tree
2021-05-11 14:34:27 +02:00
rmagueta
4301582f88
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy
246afc7ccb
Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15
2021-04-14 14:37:09 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02:00
Laurent THOMAS
fbf39eecc1
cppcheck fixes
2021-03-26 16:32:20 +01:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
luis_pereira87
5ab73a228f
Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU
...
# Conflicts:
# executables/nr-softmodem.c
# executables/nr-uesoftmodem.c
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/main.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-03-15 12:44:16 +00:00
Xue Song
834d6f1055
Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
Laurent THOMAS
3b1b74cfd2
starting
2021-03-04 13:22:14 +01:00
rmagueta
ce5b59c938
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:58:32 +00:00
Laurent Thomas
9ce7f94518
record/replay for 5G, nrscope bug fix
2021-02-28 21:39:53 +01:00
hardy
8d05695722
Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b
2021-02-26 16:09:05 +01:00
Xue Song
e1a92eadba
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-10 15:56:50 +09:00
He Shanyun
01999cfcc7
fix build error of enb and ittisim
2021-02-10 01:07:02 +00:00
Florian Kaltenberger
04a4a6f451
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-09 11:13:01 +01:00
Mahesh
0e6f1e6ad6
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
Laurent Thomas
fa63d9a4e6
merge develop
2021-02-08 11:56:42 +01:00
Mahesh
ae422aca1f
Merge conficts resolved
2021-02-02 09:36:49 +05:30
Florian Kaltenberger
0f57529b48
fixing benetel4g driver by setting ru->has_ctrl_prt =1 and thus starting the RU control thread, which is required for the 4G RRU. In the future we should revisit this and harmonize with the 5G version.
2021-02-01 10:24:22 +01:00
Laurent Thomas
6b37681854
merge develop, minor code addition
2021-02-01 09:02:57 +01:00
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +01:00
Thomas Schlichter
f32297fefa
fix cppcheck warnings
2021-01-25 14:32:32 +01:00
Laurent Thomas
75ad3da9d9
start new gtpu
2021-01-21 15:51:30 +01:00
Laurent Thomas
eddebae1e4
fix after code review
2021-01-21 13:47:18 +01:00
Laurent
3b0c43c04b
fix memory allocation error
2021-01-10 21:41:22 +01:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
Mahesh
024849983a
Merge develop(w51 2) to nfapi_nr
...
Setting of nFAPI mode in NR yet to be updated
2020-12-18 23:26:21 +05:30
Remi Hardy
98fd8279bf
Merge remote-tracking branch 'origin/develop-oriecpriupdates' into rh_wk50_debug
2020-12-09 14:16:19 +01:00
Mahesh
e174ebdc30
Resolved merge conflicts with nfapi_nr_develop
2020-12-02 16:28:18 +05:30
Cedric Roux
25ab3a5ed3
rlc v2: change time keeping
...
RLC has timers. We need to keep track of time. We chose to not use
realtime but 'processing time'. That is we send a tick to RLC for every
subframe when it is processed by the softmodem. Before this commit we
used to increase time in the function mac_rlc_status_ind which may not be
called every subframe (especially in TDD mode). So we need another way
to keep track of time.
We introduce rlc_tick() and call it in eNB_dlsch_ulsch_scheduler, which
is called every subframe, both in FDD and TDD.
We also call rlc_tick() in the function ru_thread_synch() because
pdcp_run() and rrc_rx_tx() are called there too.
It may not be the best solution. To be revised if needed.
Note: the UE has not been touched. Some modification is needed for the UE
too, most probably.
2020-11-26 11:53:22 +01:00
Mahesh
56db8f4915
RESOLVED build errors
2020-11-24 18:49:41 +05:30
Raymond Knopp
f0320ea0e2
testing of RCC
2020-11-21 14:06:24 +01:00
Eurecom
7a538b09d5
testing legacy RRU
2020-11-21 11:34:25 +01:00
Eurecom
f7811624b3
regular eNB with usrp seems ok
2020-11-20 14:32:24 +01:00
Raymond Knopp
a627d9c2a3
preparing merge, fixing issues inflicted on usrp radios after IF5 modifications
2020-11-20 14:02:51 +01:00
Raymond Knopp
47a7186621
Merge remote-tracking branch 'origin/develop' into develop-oriecpriupdates
2020-11-19 18:35:52 +01:00
Mahesh
87105d77cf
Merged latest develop to nfapi
2020-11-19 22:33:39 +05:30
Mahesh
41438a1968
PDSCH decoded at UE
2020-11-18 16:13:42 +05:30
Raymond Knopp
98a96115c7
testing with AW2S RRU.
2020-11-18 10:50:03 +01:00
Mahesh
e6bf90e2dd
LTE and NR NFAPI integration
2020-11-11 15:10:32 +05:30
Raymond Knopp
8b92c53141
modifications for eCPRI radio units, increased averaging in eNodeB subband I0 measurements
2020-11-03 06:01:42 +01:00
Laurent
7d603191db
merge develop
2020-10-29 16:29:32 +01:00
Raymond Knopp
6c414a80d4
wqMerge remote-tracking branch 'origin/develop' into develop-oriecpriupdates
2020-10-26 19:58:25 +01:00
hardy
89d7353ddf
Merge remote-tracking branch 'origin/fixes-tun' into integration_2020_wk44
2020-10-26 17:28:11 +01:00
Laurent
5c69510f17
merge develop, improve doc
2020-10-21 14:38:17 +02:00
Robert Schmidt
4c7035e6e3
Remove UESIM_EXPANSION
...
This completely removes the UESIM_EXPANSION define: it does not compile
at the moment. Its function was to multiplex multiple UEs on the same
TUN interface. However, this functionality is not needed since it is
possible to allocate many TUN devices (i.e., >= 32).
2020-10-13 09:07:46 +02:00
Mahesh K
66a6d550a6
benetel: driver for Benetel's 4G and 5G RRUs
...
This commit contains work done by Eurecom and by Benetel.
2020-10-12 18:56:41 +02:00