Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
ead11229
Commit
ead11229
authored
Aug 19, 2021
by
Melissa Elkadi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated gNB conf file & last RRC msg in LTE/NR UE
parent
8918e858
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
81 deletions
+45
-81
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
-2
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+3
-4
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_UE.c
+4
-2
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+6
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
...CTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
+30
-71
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
ead11229
...
...
@@ -769,7 +769,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
/* dmrs symbol positions*/
dlsch_config_pdu_1_0
->
dlDmrsSymbPos
=
fill_dmrs_mask
(
pdsch_config
,
mac
->
scc
->
dmrs_TypeA_Position
,
(
get_softmodem_params
()
->
nsa
)
?
mac
->
scc
->
dmrs_TypeA_Position
:
mac
->
mib
->
dmrs_TypeA_Position
,
dlsch_config_pdu_1_0
->
number_symbols
,
dlsch_config_pdu_1_0
->
start_symbol
,
mappingtype
);
...
...
@@ -2820,7 +2820,7 @@ uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
LOG_D
(
MAC
,
"RV %d (%d bits)=> %d (0x%lx)
\n
"
,
dci_pdu_rel15
->
rv
,
2
,
dci_size
-
pos
,
*
dci_pdu
);
#endif
// HARQ process number 4bit
pos
+=
4
;
pos
+=
2
;
dci_pdu_rel15
->
harq_pid
=
(
*
dci_pdu
>>
(
dci_size
-
pos
))
&
0xf
;
#ifdef DEBUG_EXTRACT_DCI
LOG_D
(
MAC
,
"HARQ_PID %d (%d bits)=> %d (0x%lx)
\n
"
,
dci_pdu_rel15
->
harq_pid
,
4
,
dci_size
-
pos
,
*
dci_pdu
);
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
ead11229
...
...
@@ -350,8 +350,7 @@ static void copy_ul_dci_data_req_to_dl_info(nr_downlink_indication_t *dl_info, n
ul_dci_req
->
SFN
,
ul_dci_req
->
Slot
,
dci_pdu_list
->
RNTI
,
dci_pdu_list
->
PayloadSizeBits
,
num_bytes
,
harq_pid
);
harq_pid
);
for
(
int
k
=
0
;
k
<
num_bytes
;
k
++
)
{
LOG_I
(
NR_MAC
,
"PDCCH DCI PDU payload[%d] = %d
\n
"
,
k
,
dci_pdu_list
->
Payload
[
k
]);
...
...
@@ -769,11 +768,11 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
module_id_t
module_id
=
ul_info
->
module_id
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
if
(
ul_info
->
ue_sched_mode
==
ONLY_PUSCH
||
mac
->
ra
.
ra_state
==
RA_SUCCEEDED
)
{
if
(
ul_info
->
ue_sched_mode
==
ONLY_PUSCH
)
{
ret
=
nr_ue_scheduler
(
NULL
,
ul_info
);
return
0
;
}
else
if
(
ul_info
->
ue_sched_mode
==
SCHED_ALL
)
else
if
(
ul_info
->
ue_sched_mode
==
SCHED_ALL
||
mac
->
ra
.
ra_state
==
RA_SUCCEEDED
)
ret
=
nr_ue_scheduler
(
NULL
,
ul_info
);
NR_TDD_UL_DL_ConfigCommon_t
*
tdd_UL_DL_ConfigurationCommon
=
mac
->
scc
!=
NULL
?
mac
->
scc
->
tdd_UL_DL_ConfigurationCommon
:
mac
->
scc_SIB
->
tdd_UL_DL_ConfigurationCommon
;
...
...
openair2/RRC/LTE/rrc_UE.c
View file @
ead11229
...
...
@@ -1953,6 +1953,7 @@ rrc_ue_process_rrcConnectionReconfiguration(
uint32_t
RadioBearer_size
;
uint32_t
SecondaryCellGroup_size
;
uint8_t
trans_id
;
uint8_t
padding
[
3
];
uint8_t
buffer
[
total_size
];
}
msg
;
...
...
@@ -1962,9 +1963,10 @@ rrc_ue_process_rrcConnectionReconfiguration(
memcpy
(
msg
.
buffer
,
nr_RadioBearer
->
buf
,
nr_RadioBearer
->
size
);
memcpy
(
msg
.
buffer
+
nr_RadioBearer
->
size
,
nr_SecondaryCellGroup
->
buf
,
nr_SecondaryCellGroup
->
size
);
LOG_D
(
RRC
,
"nr_RadioBearerConfig1_r15 size %ld nr_SecondaryCellGroupConfig_r15 size %ld
\n
"
,
LOG_D
(
RRC
,
"nr_RadioBearerConfig1_r15 size %ld nr_SecondaryCellGroupConfig_r15 size %ld
, sizeof(msg) = %zu
\n
"
,
nr_RadioBearer
->
size
,
nr_SecondaryCellGroup
->
size
);
nr_SecondaryCellGroup
->
size
,
sizeof
(
msg
));
nsa_sendmsg_to_nrue
(
&
msg
,
sizeof
(
msg
),
RRC_CONFIG_COMPLETE_REQ
);
LOG_A
(
RRC
,
"Sent RRC_CONFIG_COMPLETE_REQ to the NR UE
\n
"
);
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
ead11229
...
...
@@ -2978,6 +2978,7 @@ void process_lte_nsa_msg(nsa_msg_t *msg, int msg_len)
uint32_t
RadioBearer_size
;
uint32_t
SecondaryCellGroup_size
;
uint8_t
trans_id
;
uint8_t
padding
[
3
];
uint8_t
buffer
[];
}
hdr
;
AssertFatal
(
msg_len
>=
sizeof
(
hdr
),
"Bad received msg
\n
"
);
...
...
@@ -2985,8 +2986,11 @@ void process_lte_nsa_msg(nsa_msg_t *msg, int msg_len)
LOG_I
(
NR_RRC
,
"We got an RRC_CONFIG_COMPLETE_REQ
\n
"
);
uint32_t
nr_RadioBearer_size
=
hdr
.
RadioBearer_size
;
uint32_t
nr_SecondaryCellGroup_size
=
hdr
.
SecondaryCellGroup_size
;
AssertFatal
(
sizeof
(
hdr
)
+
nr_RadioBearer_size
+
nr_SecondaryCellGroup_size
!=
msg_len
,
"Bad received msg
\n
"
);
AssertFatal
(
sizeof
(
hdr
)
+
nr_RadioBearer_size
+
nr_SecondaryCellGroup_size
==
msg_len
,
"nr_RadioBearerConfig1_r15 size %d nr_SecondaryCellGroupConfig_r15 size %d sizeof(hdr) %zu, msg_len = %d
\n
"
,
nr_RadioBearer_size
,
nr_SecondaryCellGroup_size
,
sizeof
(
hdr
),
msg_len
);
NR_RRC_TransactionIdentifier_t
t_id
=
hdr
.
trans_id
;
LOG_I
(
NR_RRC
,
"nr_RadioBearerConfig1_r15 size %d nr_SecondaryCellGroupConfig_r15 size %d t_id %ld
\n
"
,
nr_RadioBearer_size
,
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
View file @
ead11229
...
...
@@ -21,10 +21,10 @@ gNBs =
//////////
Physical
parameters
:
ssb_SubcarrierOffset
=
0
;
ssb_SubcarrierOffset
=
31
; //
0
;
pdsch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
servingCellConfigCommon
= (
{
#spCellConfigCommon
...
...
@@ -33,8 +33,8 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz +
43
PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
641
032
;
# this is 3600 MHz +
84
PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
641
272
; //
641032
;
#641968; 641968=start of ssb at 3600MHz + 82 RBs 641032=center of SSB at center of cell
dl_frequencyBand
=
78
;
# this is 3600 MHz
dl_absoluteFrequencyPointA
=
640000
;
...
...
@@ -46,37 +46,23 @@ gNBs =
dl_carrierBandwidth
=
106
;
#initialDownlinkBWP
#genericParameters
# this is RBstart=
41,L=24
(275*(L-1))+RBstart
initialDLBWPlocationAndBandwidth
=
636
6
;
# this is RBstart=
84,L=13
(275*(L-1))+RBstart
initialDLBWPlocationAndBandwidth
=
636
8
;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialDLBWPsubcarrierSpacing
=
1
;
#pdcch-ConfigCommon
initialDLBWPcontrolResourceSetZero
=
12
;
initialDLBWPcontrolResourceSetZero
=
0
;
initialDLBWPsearchSpaceZero
=
0
;
#pdsch-ConfigCommon
#pdschTimeDomainAllocationList (up to 16 entries)
initialDLBWPk0_0
=
0
;
#initialULBWPmappingType
#0=typeA,1=typeB
initialDLBWPmappingType_0
=
0
;
#this is SS=1,L=13
initialDLBWPstartSymbolAndLength_0
=
40
;
initialDLBWPk0_1
=
0
;
initialDLBWPmappingType_1
=
0
;
#this is SS=2,L=12
initialDLBWPstartSymbolAndLength_1
=
53
;
initialDLBWPk0_2
=
0
;
initialDLBWPmappingType_2
=
0
;
#this is SS=1,L=12
initialDLBWPstartSymbolAndLength_2
=
54
;
initialDLBWPk0_3
=
0
;
initialDLBWPmappingType_3
=
0
;
#this is SS=1,L=5
initialDLBWPstartSymbolAndLength_3
=
57
;
initialDLBWPk0_0
=
0
;
#for DL slot
initialDLBWPmappingType_0
=
0
;
#0=typeA,1=typeB
initialDLBWPstartSymbolAndLength_0
=
40
;
#this is SS=1,L=13
initialDLBWPk0_1
=
0
;
#for mixed slot
initialDLBWPmappingType_1
=
0
;
initialDLBWPstartSymbolAndLength_1
=
57
;
#this is SS=1,L=5
#uplinkConfigCommon
#frequencyInfoUL
...
...
@@ -90,7 +76,7 @@ gNBs =
pMax
=
20
;
#initialUplinkBWP
#genericParameters
initialULBWPlocationAndBandwidth
=
636
6
;
initialULBWPlocationAndBandwidth
=
636
8
;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialULBWPsubcarrierSpacing
=
1
;
...
...
@@ -102,7 +88,7 @@ gNBs =
prach_msg1_FDM
=
0
;
prach_msg1_FrequencyStart
=
0
;
zeroCorrelationZoneConfig
=
13
;
preambleReceivedTargetPower
= -
1
18
;
preambleReceivedTargetPower
= -
1
00
;
#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
preambleTransMax
=
6
;
#powerRampingStep
...
...
@@ -110,12 +96,12 @@ gNBs =
powerRampingStep
=
1
;
#ra_ReponseWindow
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
ra_ResponseWindow
=
5
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
4
;
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
1
4
; //
1
5
;
#ra_ContentionResolutionTimer
#(0..7) 8,16,24,32,40,48,56,64
ra_ContentionResolutionTimer
=
7
;
...
...
@@ -127,25 +113,22 @@ gNBs =
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
msg1_SubcarrierSpacing
=
1
,
# restrictedSetConfig
# 0=unrestricted, 1=restricted type A, 2=restricted type B
restrictedSetConfig
=
0
,
# pusch-ConfigCommon (up to 16 elements)
initialULBWPk2_0
=
6
;
initialULBWPk2_0
=
6
;
# used for UL slot
initialULBWPmappingType_0
=
1
# this is SS=0 L=11
initialULBWPstartSymbolAndLength_0
=
55
;
initialULBWPstartSymbolAndLength_0
=
41
;
# this is SS=0 L=13
initialULBWPk2_1
=
6
;
initialULBWPk2_1
=
6
;
# used for mixed slot
initialULBWPmappingType_1
=
1
;
# this is SS=0 L=12
initialULBWPstartSymbolAndLength_1
=
69
;
initialULBWPstartSymbolAndLength_1
=
52
;
# this is SS=10 L=4
initialULBWPk2_2
=
7
;
initialULBWPk2_2
=
7
;
# used for Msg.3 during RA
initialULBWPmappingType_2
=
1
;
# this is SS=10 L=4
initialULBWPstartSymbolAndLength_2
=
52
;
initialULBWPstartSymbolAndLength_2
=
52
;
# this is SS=10 L=4
msg3_DeltaPreamble
=
1
;
p0_NominalWithGrant
=-
90
;
...
...
@@ -159,7 +142,7 @@ gNBs =
# ssb_PositionsInBurs_BitmapPR
# 1=short, 2=medium, 3=long
ssb_PositionsInBurst_PR
=
2
;
ssb_PositionsInBurst_Bitmap
=
1
;
ssb_PositionsInBurst_Bitmap
=
1
;
#0x80;
# ssb_periodicityServingCell
# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
...
...
@@ -182,40 +165,16 @@ gNBs =
# dl_UL_TransmissionPeriodicity
# 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
dl_UL_TransmissionPeriodicity
=
6
;
nrofDownlinkSlots
=
7
;
nrofDownlinkSymbols
=
6
;
nrofDownlinkSlots
=
7
;
//
8
; //
7
;
nrofDownlinkSymbols
=
6
;
//
0
; //
6
;
nrofUplinkSlots
=
2
;
nrofUplinkSymbols
=
4
;
nrofUplinkSymbols
=
4
;
//
0
; //
4
;
ssPBCH_BlockPower
=
10
;
ssPBCH_BlockPower
=
-
25
;
}
);
srb1_parameters
:
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit
=
80
;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering
=
35
;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit
=
0
;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu
=
4
;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte
=
99999
;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold
=
4
;
}
# ------- SCTP definitions
SCTP
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment