Robert Schmidt
c5968599b2
Add nr_fill_nfapi_pucch(): allocate PUCCH nFAPI message
2021-02-07 10:39:39 +01:00
Robert Schmidt
7a9ad3dbf7
Keep track of used PUCCH resources
2021-02-07 10:39:39 +01:00
Robert Schmidt
94d8147ece
nr_csi_meas_reporting() for multiple UEs
2021-02-07 10:39:39 +01:00
Robert Schmidt
5a2caa5475
Refactor nr_csi_meas_reporting(): check only in slot 0
2021-02-06 20:50:28 +01:00
Robert Schmidt
b6ebdc2fab
Refactor nr_get_csi_bitlen()
2021-02-06 20:50:28 +01:00
Robert Schmidt
49c7dbf214
Use three fields
2021-02-06 20:50:28 +01:00
Robert Schmidt
171f7842bc
Rewrite PUCCH allocation (simplified, restricted)
...
- No dynamic allocation of PUCCH structures
- Use first PUCCH for HARQ (can only allocate for up to two slots in
single PUCCH, simplistic nr_acknack_scheduling!)
- Use second PUCCH for CSI, do not multiplex!
2021-02-06 20:50:28 +01:00
Robert Schmidt
4e91f44839
Rename NR_sched_pucch to NR_sched_pucch_t
2021-02-06 20:50:28 +01:00
Robert Schmidt
a19a15cfb7
Enable logging of PUCCH
2021-02-06 20:50:28 +01:00
hardy
663dd1251c
Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05
2021-02-05 12:00:38 +01:00
hardy
5d832308c6
Merge remote-tracking branch 'origin/NR_SA_itti_sim_wk48' into integration_2021_wk05
2021-02-05 11:43:54 +01:00
Thomas Schlichter
9c4714fd25
NR_UE: re-introduce mcs check for DCI format 0_0 and 0_1
2021-02-04 19:51:58 +01:00
Thomas Schlichter
ea0d24b935
NR_UE: discard DCI with bwp_indicator != 1
...
Even stricter check/hack for BWP ID.
Drop every DCI where this value is not '1'.
2021-02-04 19:27:56 +01:00
Xue Song
6a3b7b40a5
Merge branch 'master' into develop_SA_L3
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
hardy
c00b44028b
Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05
2021-02-02 15:40:22 +01:00
hardy
1d6eea64a4
Merge remote-tracking branch 'origin/bugfix-x2-SgNBAdditionRequest' into integration_2021_wk05
2021-02-02 15:39:38 +01:00
hardy
320b43c462
Merge remote-tracking branch 'origin/lte-ulsch-bugfix' into integration_2021_wk05
2021-02-02 15:38:54 +01:00
dir
82d40a654c
Transform precoding related changes
2021-02-02 13:19:42 +01:00
yoshio.inoue
c49220610d
add TODO comments
2021-02-01 21:19:04 +09:00
Cedric Roux
94dad700c4
lte/nr x2ap: fix content of SgNBAdditionRequest
...
Wireshark (version 3.3.2) was not happy.
https://asn1.io/asn1playground/ was not happy.
Let's make them happy.
So then everyone is happy.
2021-02-01 11:48:44 +01:00
Wu.Jing
37f0198944
Revert "remove the commented code from rrc_gNB.c"
...
This reverts commit 15caed4d54 .
2021-02-01 16:02:47 +09:00
Wu.Jing
c20fae1dea
Merge branch 'develop_SA_SIM' into develop_SA_L3
2021-02-01 14:58:51 +09:00
He Shanyun
150221536c
change output format for ran ue ngap id
2021-02-01 14:08:19 +09:00
Xue Song
a85f261b54
add license text
...
fix some problems
2021-02-01 13:59:56 +09:00
yincong
15caed4d54
remove the commented code from rrc_gNB.c
2021-02-01 12:27:37 +09:00
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +01:00
cig
5a9014e960
Review of MR 1025
...
- bugfix in nr_ue_dci_configuration
- cleanup of irrelevant RA-related data structure members in UE
- moved msg1 init condition to MAC
- minor fixes concerning init_ra function
2021-01-29 12:44:28 +01:00
Robert Schmidt
f1cb44a005
Bugfix: decrease actual MCS value
2021-01-29 09:31:56 +01:00
hardy
5db5657df7
Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b
2021-01-29 07:41:47 +01:00
hardy
6e12f8f8d3
Merge remote-tracking branch 'origin/nr_ul_scfdma' into integration_2021_wk04_b
2021-01-29 07:40:42 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
hardy
62aec337bf
Merge remote-tracking branch 'origin/flexran-repair-mme-mgmt' into integration_2021_wk04_b
2021-01-29 07:39:49 +01:00
rmagueta
62bc47c820
Minor update in SIB1 contents. do_SIB1_NR() only if SA.
2021-01-28 16:04:41 +00:00
Thomas Schlichter
92cb99b201
NR_UE: Add some more LOG_W() in case of ignoring DCI.
2021-01-28 10:14:44 +01:00
Thomas Schlichter
ac1bc7025b
NR_UE: discard DCI with bwp_indicator == 0
...
Recently we stared using the BWP_indicator signalled in DCI, before we always assumed BWP_Id == 1.
Now "fake-DCI" with bandwidth_indicator == 0 lead to segmentation faults, so we discard these.
Note: There are still several placed where we assume BWP_Id == 1!
2021-01-28 09:36:00 +01:00
Thomas Schlichter
60471dd179
NR_UE: change message when RA succeeded, so CI recognizes it again
2021-01-28 09:33:47 +01:00
Xue Song
36487515c4
fix double definition in rrc_gNB_NGAP.c and nr_ngap_gnb.c
2021-01-28 14:20:35 +09:00
Thomas Schlichter
3eb04ffcf7
move unreachable LOG_D() in NR_IF_Module.c
...
Code between a 'switch' statement and its first 'case' statement is not reachable!
So move the LOG_D() statement just before the 'switch' statement.
2021-01-27 12:05:34 +01:00
rmagueta
6e917c539f
Fill SIB1 with more contents
2021-01-25 23:18:35 +00:00
Thomas Schlichter
f32297fefa
fix cppcheck warnings
2021-01-25 14:32:32 +01:00
rmagueta
094f21a165
Fix REG to CCE mapping at UE
2021-01-23 18:40:30 +00:00
rmagueta
70938bb907
Fix REG to CCE mapping at gNB
2021-01-22 17:18:37 +00:00
Thomas Schlichter
df06b67d1e
reduce logging output
2021-01-22 12:26:59 +01:00
Thomas Schlichter
c107b9b756
Merge remote-tracking branch 'develop'
2021-01-21 18:28:33 +01:00
Laurent Thomas
eddebae1e4
fix after code review
2021-01-21 13:47:18 +01:00
cig
e8989b2015
Moved UE UL scheduling functions to new MAC file
...
- this commit was necessary because the location of the MAC UE
functions does not reflect the context in which they are used
- therefore all UL scheduling-related functions have been moved
to a new nr_ue_scheduler.c file
- and the irrelevant file rar_tools_nrUE.c has been deleted
(nr_ue_process_rar moved to nr_ue_procedures)
- the new locations are supposed to make the file and functions
organisations more structured and cleaner
2021-01-20 14:59:52 +01:00
cig
9f6a8da0ac
UE UL scheduling review
...
- new data structure RAR_grant_t to handle RAR grant
- new common ul scheduler function
- new common ul pdu configuration function handling ul grants
- new function to fill ul_config_request
- moved pdu configuration code from process dci function
- merged procedures for Msg3 and PUSCH together in nr_ue_scheduler
- the same functions are now handling both PUSCH and Msg3
- relying on ul_config (no more RA Msg3 frame and slot storage)
- done some cleanup and logging in the process
2021-01-20 14:18:04 +01:00
He Shanyun
e4ff0d5b31
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
2021-01-20 01:51:32 +00:00
He Shanyun
b425e6f495
fix cppcheck error and warning
2021-01-16 12:04:00 +09:00
cig
35c4f94e1d
Introduced a new function to retrieve the transformPrecoding status
...
- this return whether the transform precoder is enabled or not
- redundant configuration code has been migrated to the new function
- get_transformPrecoding is a common MAC function used already
@ UE side, can be adopted by gNB too
2021-01-15 16:53:15 +01:00