francescomani
5fc23d5864
Merge remote-tracking branch 'origin/develop' into NR_RRC_harmonization_after_BWP
2022-08-03 12:11:37 +02:00
francescomani
0196dd6dc2
Merge remote-tracking branch 'origin/develop' into NR_RRC_harmonization_after_BWP
2022-06-27 14:44:04 +02:00
Roberto Louro Magueta
7018b7c841
Fixes after merge
2022-05-19 13:38:22 +01:00
francescomani
075e8c6d8f
Merge remote-tracking branch 'origin/develop' into NR_RRC_harmonization_after_BWP
2022-05-17 15:27:12 +02:00
rmagueta
751335765f
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/nr_rrc_config.c
2022-04-30 15:52:48 +01:00
Robert Schmidt
532bb0da96
Remove useless comments
2022-04-22 17:54:41 +02:00
francescomani
c791b45adc
harmonization of downlink BWPs configuration
2022-04-16 14:34:00 +02:00
rmagueta
40279dddf3
Get cri_bitlen, ri_bitlen, pmi_bitlen and cqi_bitlen at UE
2022-04-13 01:07:01 +01:00
Laurent THOMAS
4ad71064b8
review comments
2022-04-11 19:29:45 +02:00
Laurent Thomas
95a58d646a
merge develop, no test
2022-04-10 22:22:52 +02:00
Robert Schmidt
288c29da84
Apply review suggestions
2022-03-24 14:39:16 +01:00
Laurent THOMAS
a7e7d05da3
fix difficult to read code
2022-03-24 14:38:17 +01:00
Melissa Elkadi
5e7de1cdfc
Fixing typo and adding .h files for linking
2022-02-14 11:41:22 -08:00
Melissa Elkadi
987363b8a8
Clean up for MR
2022-02-14 10:34:23 -08:00
Melissa Elkadi
60a9d41bc6
UCI ACK/NACK most of the way working
...
We have gotten rid of filling the ACK/NACK with
the DLSCH and now only fill with the PUCCH. This
assumes that the MAC layer is properly decoding the
dl_tti_req and tx_data_req and allows us to
simply use the MAC layers scheduled SNF/Slot
to return the ACK NACK. There are some hacks added
in this commit which ensure that the PDCP packet
has the correct header (1st byte = 80) and now with
15Mbps we are seeing about 20% packet loss and
a gNB bug on the edge case (current frame is 1023
and the gNB schduler wants an ACK in frame 0 but the
scheduled UL_TTI_REQ has a frame of 1023).
2022-02-09 07:59:10 -08:00
Melissa
8c2a067a22
Merge branch 'episys/david/checking_downlink_siso_model' into 'episys/master-nsa'
...
Downlink SISO modeling
See merge request aburger/openairinterface5g!104
2022-02-08 14:51:55 -08:00
Melissa Elkadi
9da3cbc9ec
Cherry picking UCI multiplexing for CSI reports
2022-02-08 13:03:13 -08:00
Melissa Elkadi
fa4617c0bf
Fixing MR based on OAI feedback
...
The following was changed in this commit:
- A new struct in the mac instance was created
for all emulated L1 fields.
- NR UE RRC state bug was fixed
- Checking the RAR rnti based on the MAC instance
ra.ra_rnti and not hardcoding to 0x10b
- Modified the name of the new emulate_l2 flag
to make sense: emulate_l1
2021-11-08 10:59:28 -08:00
mjoang
626e3a7015
merge develop
2021-09-23 10:44:43 -04:00
mjoang
e8156ddba7
1. Move NR_LONG_BSR_TABLE and NR_SHORT_BSR_TABLE to nr_mac_common.c 2. Change nr_rlc_mac_config_req_ue_logicalChannelBearer to nr_rrc_mac_config_req_ue_logicalChannelBearer.
2021-08-23 15:38:52 -04:00
mjoang
607578f080
first version of sr bsr.
2021-08-16 10:09:53 -04:00
francescomani
2fe8dd7657
Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA
2021-07-14 10:35:09 +02:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Robert Schmidt
c3796c044f
Merge branch 'develop' into integration_2021_wk13_b
2021-04-16 07:23:46 +02:00
francescomani
1051c94cf6
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA
2021-04-15 11:53:16 +02:00
francescomani
7e5ef00996
removal of bwp from sib1, removal of fill_default_initialDownlinkBWP
2021-04-13 16:12:06 +02:00
Robert Schmidt
7f774d5fbc
Merge branch 'develop' into integration_2021_wk13_b
2021-04-12 17:23:21 +02:00
Raymond Knopp
0b59ce4faf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-07 15:50:46 +02:00
francescomani
259191df06
new functions to fill ss0 and coreset0
2021-04-02 16:09:33 +02:00
rmagueta
1aab76a48d
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-01 11:19:28 +01:00
Robert Schmidt
576df55450
Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12
2021-03-30 10:48:57 +02:00
Raymond Knopp
e84d1fe678
adding UL LCID 52 for CCCH with 48 bits
2021-03-24 16:09:48 +01:00
francescomani
8756a56121
tentative fix for scheduling multiple sib1 instances
2021-03-04 17:48:10 +01:00
francescomani
18b1218779
reworking of MAC functions to schedule SSBs, including VRB map occupation and get_type0_PDCCH_CSS_config_parameters
2021-03-04 14:32:41 +01:00
rmagueta
deef82d70b
Fix RA-Msg3 to logical channel CCCH
2021-03-01 19:23:23 +00:00
Raymond Knopp
5ed79a27de
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-14 07:18:13 +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
ChiehChun
c316f2fc57
Correct bit ordering in struct NR_BSR_LONG
2021-02-07 10:39:40 +01:00
Raymond Knopp
edff477050
reduced 5G memory limits for CI
2021-02-07 09:40:22 +01:00
Thomas Schlichter
c107b9b756
Merge remote-tracking branch 'develop'
2021-01-21 18:28:33 +01:00
cig
73fbbf50ed
Cleanup MAC header files
...
- sorted out according to recurring logic that wants function
prototypes in separate files from data struct and constants
definitions, variables in separate .c files with inclusion
of "extern" header files
- moved function prototypes to resective header files
- moved data structures and constants to respective header files
- merged unnecessary mac.h file into mac_defs.h @ MAC UE
- moved const variables suchs as tables to respective .c files
- moved extern references to respective extern.h files
2021-01-15 16:53:15 +01:00
Francesco Mani
5fc3a991c9
dci size for 0_1 and some other modifications
2020-07-08 18:44:34 +02:00
Francesco Mani
cd61f38eca
Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks
2020-07-02 10:16:57 +02:00
Rangaswami
e08878ed1c
Corrected indentation and removed GES macro
2020-06-18 18:01:13 +05:30
vr.devendra
8533610e2a
GlobalEdge: CSI and TCI related MAC CE intial commit
2020-06-18 17:51:44 +05:30
Francesco Mani
c5f82f6d9f
Merge remote-tracking branch 'origin/NR_RRC_PRACH_procedures' into NR_RRC_harq_hacks
2020-06-18 12:31:07 +02:00
matzakos
928c189ef0
Modify starting LCID for DTCH to start from 4 instead of 3 for both UL and DL
...
- Make required adaptations in RLC and default DRB configuration
2020-06-12 14:44:52 +02:00
Francesco Mani
ecb81ef995
Merge branch 'NR_RRC_PRACH_procedures' into NR_RRC_harq
2020-04-13 15:15:48 +02:00
Sakthivel Velumani
9e8e7de10a
using same dci_pdu_rel15 for UE also
2020-04-08 22:24:08 +02:00
Sakthivel Velumani
6f3934acc0
moved dci_pdu_rel15_t to mac_common
2020-04-07 18:09:07 +02:00