luis_pereira87
486e9e2381
Merge remote-tracking branch 'origin/Dedicated-BWPs' into integration_2022_wk19b
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-13 15:58:56 +01:00
luis_pereira87
3c4ba50281
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-11 14:49:59 +01:00
Roberto Louro Magueta
4c1b432718
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
2022-05-11 13:45:56 +01:00
rmagueta
b8cd9ef167
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-05-06 15:41:10 +01:00
francescomani
020c4c52ec
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-05-06 15:27:20 +02:00
luis_pereira87
a8e6bf9bd5
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/GNB_APP/gnb_config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_defs.h
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-06 11:29:55 +01:00
Roberto Louro Magueta
f2974b431b
Revert transformPrecoder to transform_precoding
2022-05-03 19:25:14 +01:00
luis_pereira87
a39c310bd4
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-04-19 10:21:57 +01:00
francescomani
02b66061b1
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-12 10:14:21 +02:00
francescomani
8927c648d4
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-04-12 09:55:57 +02:00
francescomani
4452308184
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-04-12 09:40:52 +02:00
luis_pereira87
940abc3587
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
2022-04-11 13:49:40 +01:00
Raymond Knopp
86b5b9db3d
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-09 19:44:26 +02:00
Robert Schmidt
9151666960
Merge remote-tracking branch 'origin/nr_gold_init_improv' into integration_2022_wk15
2022-04-09 13:09:50 +02:00
francescomani
680c605e32
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-04-08 17:02:35 +02:00
francescomani
1ab64d26aa
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-08 16:50:02 +02:00
francescomani
65d0318504
using tbslbrm at mac also for ulsch as in scf spec
2022-03-25 17:52:44 +01:00
Melissa Elkadi
3e6f957a63
Several nfapi bug fixes for RX ind and SR ind
...
The SR ind was not properly being packed and unpacked.
The RX inidcation was not properly being allocated
prior to unpacking.
The freq_shift field was declared as a uint16_t but
push/pulled as a uint8_t.
Added MSG_TRUNC in the nfapi VNF recvfrom.
2022-03-23 10:03:08 -07:00
Melissa Elkadi
d1cd5b771b
Clean up to nFAPI and error checking UL_TTI_REQ n_pdus
...
We seprarated out the large if block in the push/pull
of the UL_TTI_REQ fields to make it easier to read
and debug. Furthermore, we add in AsserFatals before
indexing in UL_TTI_REQ PDU list to ensure we are not
indexing past the end of the array.
2022-03-08 07:47:44 -08:00
luis_pereira87
a87e99ad69
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair1/PHY/TOOLS/lte_ue_scope.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-08 14:21:00 +00:00
Melissa Elkadi
79cc21f6f5
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-07 06:33:51 -08:00
francescomani
b8935b7761
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-03-07 10:37:48 +01:00
Raymond Knopp
f99754a5ea
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-03-05 21:12:32 +01:00
francescomani
26d8766d27
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-03-04 18:08:09 +01:00
francescomani
d7b117ba25
Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv
2022-03-04 17:24:53 +01:00
francescomani
eec513ab4f
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-03-01 16:05:30 +01:00
francescomani
62f23df256
Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv
2022-03-01 12:15:57 +01:00
francescomani
b9ae5db874
gold init improvement at ue for dl channels
2022-02-25 12:09:42 +01:00
Melissa Elkadi
2b1cc455b0
Merge branch 'episys-ul-info-cleanup' into episys/master-sa
2022-02-24 15:48:43 -08:00
francescomani
ddfb131f68
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2022-02-23 14:55:33 +01:00
francescomani
faf38c7e56
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-02-23 14:20:39 +01:00
luis_pereira87
8238c40ce9
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-23 10:48:49 +00:00
Melissa Elkadi
0db8f80f73
Removing invalid log
2022-02-18 09:58:26 -08:00
francescomani
77153fbf5f
TBSLBRM for DL computed ad MAC (added fapi parameter)
2022-02-17 10:16:22 +01:00
Melissa Elkadi
e5ddd558ad
Fixing spacing in nfapi code
2022-02-16 15:13:26 -08:00
Melissa Elkadi
10d0f13ceb
Revert "Getting rid of pthread warning and fixing nfapi"
...
This reverts commit 9a78b58927 .
2022-02-16 13:15:15 -08:00
Melissa Elkadi
9a78b58927
Getting rid of pthread warning and fixing nfapi
...
The nfapi code releases dl_ttis and tx_data_reqs
if the buffer has data in it. In the proxy code we
overwrite this instead of dropping the packet.
2022-02-16 13:12:12 -08:00
luis_pereira87
6b69e67f71
Fix number of search spaces
2022-02-16 16:43:49 +00:00
francescomani
c4f1812cc9
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-02-14 18:14:19 +01:00
francescomani
de88c3f45c
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-14 08:57:52 +01:00
Raymond Knopp
4756c5a167
added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3)
2022-02-13 22:15:48 +01:00
Raymond Knopp
5ba8b83856
Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
...
Conflicts:
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_reconfig.c
targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp
b9b24588af
Merge remote-tracking branch 'origin/develop' into aw2s-n41
...
Conflicts:
cmake_targets/phy_simulators
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-02-11 12:21:29 +01:00
Melissa Elkadi
df06a1e8e4
Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master
2022-02-09 16:20:22 -08:00
Melissa Elkadi
e81b901355
nFAPI bug fix. Not properly packing/unpacking PUCCH PDU
...
Attempting to manually cherry-pick this commit:
30c14c2f5a
2022-02-09 14:05:05 -08:00
Melissa
65dadfb3e2
Merge branch 'episys/master-nsa-nfapi-errors' into 'episys/master-nsa'
...
nfapi.c: Add on_error()
See merge request aburger/openairinterface5g!96
2022-02-09 13:56:27 -08:00
Melissa Elkadi
f336cbc645
Fixing pull/push array 32 and cleaning nFAPI code
...
Several of these changes were made previously and
lost in the merge.
2022-02-09 07:30:04 -08:00
Melissa Elkadi
a1dee602fe
Duplicated packing and unpacking fixed in this commit
...
This now matches the develop branch as well.
2022-02-08 17:11:59 -08:00
Melissa Elkadi
9da3cbc9ec
Cherry picking UCI multiplexing for CSI reports
2022-02-08 13:03:13 -08:00
Robert Schmidt
a36555b254
Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a
2022-02-08 18:06:53 +01:00