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
cc81141c
Commit
cc81141c
authored
Apr 12, 2021
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduced logging, UE MIB processing
parent
4d4f4c22
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
42 deletions
+32
-42
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+4
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+1
-1
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+5
-13
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+22
-25
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
cc81141c
...
...
@@ -1698,16 +1698,17 @@ int get_nrofHARQ_ProcessesForPDSCH(e_NR_PDSCH_ServingCellConfig__nrofHARQ_Proces
int
add_new_nr_ue
(
module_id_t
mod_idP
,
rnti_t
rntiP
,
NR_CellGroupConfig_t
*
CellGroup
)
{
NR_UE_info_t
*
UE_info
=
&
RC
.
nrmac
[
mod_idP
]
->
UE_info
;
LOG_I
(
MAC
,
"[gNB %d] Adding UE with rnti %x (num_UEs %d)
\n
"
,
LOG_I
(
NR_
MAC
,
"[gNB %d] Adding UE with rnti %x (num_UEs %d)
\n
"
,
mod_idP
,
rntiP
,
UE_info
->
num_UEs
);
dump_nr_list
(
&
UE_info
->
list
);
for
(
int
i
=
0
;
i
<
MAX_MOBILES_PER_GNB
;
i
++
)
{
if
(
UE_info
->
active
[
i
])
if
(
UE_info
->
active
[
i
])
{
LOG_I
(
NR_MAC
,
"UE %x is active, skipping
\n
"
,
rntiP
);
continue
;
}
int
UE_id
=
i
;
UE_info
->
num_UEs
++
;
UE_info
->
active
[
UE_id
]
=
true
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
cc81141c
...
...
@@ -1251,7 +1251,7 @@ bool nr_acknack_scheduling(int mod_id,
// Find the right timing_indicator value.
int
i
=
0
;
while
(
i
<
8
)
{
LOG_
I
(
MAC
,
"pdsch_to_harq_feedback[%d] = %d (pucch->ul_slot %d - slot %d)
\n
"
,
LOG_
D
(
MAC
,
"pdsch_to_harq_feedback[%d] = %d (pucch->ul_slot %d - slot %d)
\n
"
,
i
,
pdsch_to_harq_feedback
[
i
],
pucch
->
ul_slot
,
slot
);
if
(
pdsch_to_harq_feedback
[
i
]
==
pucch
->
ul_slot
-
slot
)
break
;
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
cc81141c
...
...
@@ -488,20 +488,12 @@ rrc_gNB_generate_RRCSetup(
/* init timers */
// ue_context_pP->ue_context.ue_rrc_inactivity_timer = 0;
nr_rrc_data_req
(
ctxt_pP
,
DCCH
,
rrc_gNB_mui
++
,
SDU_CONFIRM_NO
,
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
,
(
uint8_t
*
)
ue_p
->
Srb0
.
Tx_buffer
.
Payload
,
PDCP_TRANSMISSION_MODE_CONTROL
);
// configure MAC
rrc_mac_config_req_gNB
(
rrc
->
module_id
,
rrc
->
carrier
.
ssb_SubcarrierOffset
,
rrc
->
carrier
.
pdsch_AntennaPorts
,
rrc
->
carrier
.
pusch_AntennaPorts
,
(
NR_ServingCellConfigCommon_t
*
)
rrc
->
carrier
.
servingcellconfigcommon
,
NULL
,
0
,
ue_context_pP
->
ue_context
.
rnti
,
ue_context_pP
->
ue_context
.
masterCellGroup
...
...
@@ -529,9 +521,9 @@ rrc_gNB_generate_RRCSetup(
}
break
;
default
:
default:
LOG_W
(
NR_RRC
,
"Unknown node type %d
\n
"
,
rrc
->
node_type
);
break
;
}
}
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
cc81141c
...
...
@@ -555,18 +555,13 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
const
uint8_t
buffer_len
){
int
i
;
NR_BCCH_BCH_Message_t
*
bcch_message
=
NULL
;
NR_MIB_t
*
mib
=
NR_UE_rrc_inst
[
module_id
].
mib
;
if
(
mib
!=
NULL
){
SEQUENCE_free
(
&
asn_DEF_NR_BCCH_BCH_Message
,
(
void
*
)
mib
,
1
);
}
else
{
//for(i=0; i<buffer_len; ++i){
// printf("[RRC] MIB PDU : %d\n", bufferP[i]
);
//}
if
(
NR_UE_rrc_inst
[
module_id
].
mib
!=
NULL
)
SEQUENCE_free
(
&
asn_DEF_NR_BCCH_BCH_Message
,
(
void
*
)
bcch_message
,
1
);
else
LOG_I
(
NR_RRC
,
"Configuring MAC for first MIB reception
\n
"
);
asn_dec_rval_t
dec_rval
=
uper_decode_complete
(
NULL
,
asn_dec_rval_t
dec_rval
=
uper_decode_complete
(
NULL
,
&
asn_DEF_NR_BCCH_BCH_Message
,
(
void
**
)
&
bcch_message
,
(
const
void
*
)
bufferP
,
...
...
@@ -580,17 +575,19 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
}
else
{
// link to rrc instance
mib
=
bcch_message
->
message
.
choice
.
mib
;
SEQUENCE_free
(
&
asn_DEF_NR_MIB
,
(
void
*
)
NR_UE_rrc_inst
[
module_id
].
mib
,
1
);
NR_UE_rrc_inst
[
module_id
].
mib
=
bcch_message
->
message
.
choice
.
mib
;
//memcpy( (void *)mib,
// (void *)&bcch_message->message.choice.mib,
// sizeof(NR_MIB_t) );
LOG_I
(
NR_RRC
,
"Configuring MAC for first MIB reception
\n
"
);
nr_rrc_mac_config_req_ue
(
0
,
0
,
0
,
mib
,
NULL
,
NULL
,
NULL
);
}
nr_rrc_mac_config_req_ue
(
0
,
0
,
0
,
NR_UE_rrc_inst
[
module_id
].
mib
,
NULL
,
NULL
,
NULL
);
}
return
0
;
}
const
char
siWindowLength
[
10
][
5
]
=
{
"5s"
,
"10s"
,
"20s"
,
"40s"
,
"80s"
,
"160s"
,
"320s"
,
"640s"
,
"1280s"
,
"ERR"
};
// {"1ms","2ms","5ms","10ms","15ms","20ms","40ms","80ms","ERR"};
const
short
siWindowLength_int
[
9
]
=
{
5
,
10
,
20
,
40
,
80
,
160
,
320
,
640
,
1280
};
//{1,2,5,10,15,20,40,80};
...
...
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