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
Raymond Knopp
91168581a5
small fix for basic simulator in TDD
2021-03-18 20:35:17 +01:00
Raymond Knopp
a3f6fe4260
L2 emulator seems ok now
2021-03-15 22:45:54 +01:00
David Kim
2948a2445e
Merge branch 'episys/master' into episys/david/episys-merge-2nd-x2c
2021-03-15 11:05:35 -07: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
Michael Cook
8120c7978c
Merge branch 'episys-merge-future' into episys/master
2021-03-14 09:17:34 -07:00
Michael Cook
092caec8ca
Merge branch 'episys-merge' into episys/trial-merge-to-master
2021-03-14 10:58:46 -04:00
David Kim
94c9866b7e
adding nfapi_nr_develop_new changes
2021-03-13 13:09:34 -08:00
Raymond Knopp
7f5dc92265
testing with multi-RU
2021-03-13 21:43:00 +01:00
Raymond Knopp
74a44d686d
minor changes
2021-03-13 21:27:39 +01:00
Raymond Knopp
e5226adcb0
Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu
2021-03-13 21:26:47 +01:00
magounak
a4666ba7e5
OTA synch changes for slave RRU
2021-03-13 21:25:54 +01:00
Michael Cook
c5ff3376ef
Size asserts for harq_pdu_list, sr_pdu_list, cqi_pdu_list
2021-03-13 11:56:55 -08:00
Michael Cook
6d2590906c
Assert NFAPI_CRC_IND_MAX_PDU
2021-03-13 10:58:33 -08:00
Michael Cook
df81c0de14
Add asserts for size of rx_indication_body.rx_pdu_list
2021-03-13 10:26:33 -08:00
Melissa Elkadi
e5b0c26549
Changed sf_ahead based on NFAPI_MODE
2021-03-10 16:20:55 -08:00
Raymond Knopp
d72b9c4e71
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-08 13:41:14 +01: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
Melissa Elkadi
e3168a7d8c
Merge remote-tracking branch 'eurecom/develop' into eurecom-episys-merge
2021-03-03 16:12:04 -08: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
Michael Cook
034d2cfed6
lte-ue.c: Allocate bigger arrays
...
This code allocates memory from the heap:
```
static void *UE_phy_stub_standalone_pnf_task(void *arg)
{
...
UL_INFO->crc_ind.crc_indication_body.crc_pdu_list =
calloc(NB_UE_INST, sizeof(nfapi_crc_indication_pdu_t));
```
I see NB_UE_INST==1.
Then this code:
```
void fill_crc_indication_UE_MAC(int Mod_id,
int frame,
int subframe,
UL_IND_t *UL_INFO,
uint8_t crc_flag,
int index,
uint16_t rnti,
nfapi_ul_config_request_t
*ul_config_req) {
...
nfapi_crc_indication_pdu_t *pdu =
&UL_INFO->crc_ind.crc_indication_body
.crc_pdu_list[UL_INFO->crc_ind.crc_indication_body.number_of_crcs];
```
used .number_of_crcs to index into .crc_pdu_list without first
checking if .number_of_crcs is in range.
When run with multiple UEs, sometimes .number_of_crcs==1 and then
-fsanitize=address complains.
Change is to use NUMBER_OF_UE_MAX instead of NB_UE_INST.
With this change, -fsanitize=address stopping complaining.
2021-02-28 09:45:31 -08:00
Michael Cook
414d3794fd
netlink_init.c: Memory leak
...
Found by `-fsanitize=address`.
2021-02-27 09:15:38 -08:00
hardy
8d05695722
Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b
2021-02-26 16:09:05 +01:00
Melissa Elkadi
98c8ddb673
Merge remote-tracking branch 'origin/develop' into episys-merge
...
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08:00
Raymond Knopp
a6e16e7c8a
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-23 11:51:29 +01:00
Raymond Knopp
9f35010ea3
changes for multi-RRU OTA synch
2021-02-23 10:19:05 +01:00
Raymond Knopp
5b865df202
fixed for oairu target after merge with develop
2021-02-14 14:05:16 +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
Raymond Knopp
a30eabbe21
OTA testing 4G, configuration parameters for fairRR scheduler and common parameters for both fairRR and default
2021-02-11 13:43:25 +01:00
Raymond Knopp
37ef411c2e
traces for fairRR scheduler
2021-02-10 14:14:29 +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
Raymond Knopp
4d47e3da96
IF4p5 testing. seems to work again with fixes after merge with develop
2021-02-08 15:27:37 +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
Raymond Knopp
846c67b9bd
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
2021-02-07 18:23:46 +01:00
Raymond Knopp
d06018d1e3
Merge branch 'four_antenna_eNB' into oairu
2021-02-07 17:46:23 +01:00
Raymond Knopp
4e9afb30b0
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-02 12:09:56 +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