Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
canghaiwuhen
OpenXG-RAN
Commits
5eacaddd
Commit
5eacaddd
authored
Apr 22, 2020
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code cleanup
parent
32af60bc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
42 deletions
+40
-42
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+39
-38
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+0
-3
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
5eacaddd
...
@@ -969,6 +969,7 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
...
@@ -969,6 +969,7 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
return
(
-
1
);
return
(
-
1
);
break
;
break
;
}
}
if
(
dlsch1_harq
)
{
if
(
dlsch1_harq
)
{
switch
(
nr_get_Qm_dl
(
dlsch1_harq
->
mcs
,
dlsch1_harq
->
mcs_table
))
{
switch
(
nr_get_Qm_dl
(
dlsch1_harq
->
mcs
,
dlsch1_harq
->
mcs_table
))
{
case
2
:
case
2
:
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
5eacaddd
...
@@ -2599,7 +2599,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, nr
...
@@ -2599,7 +2599,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, nr
/* PDSCH_TO_HARQ_FEEDBACK_TIME_IND (only if CRC scrambled by C-RNTI or CS-RNTI or new-RNTI)*/
/* PDSCH_TO_HARQ_FEEDBACK_TIME_IND (only if CRC scrambled by C-RNTI or CS-RNTI or new-RNTI)*/
dlsch_config_pdu_1_0
->
pdsch_to_harq_feedback_time_ind
=
dci
->
pdsch_to_harq_feedback_time_ind
;
dlsch_config_pdu_1_0
->
pdsch_to_harq_feedback_time_ind
=
dci
->
pdsch_to_harq_feedback_time_ind
;
LOG_D
(
MAC
,
"(nr_ue_procedures.c) rnti
=%d dl_config->number_pdus=
%d
\n
"
,
LOG_D
(
MAC
,
"(nr_ue_procedures.c) rnti
= %x dl_config->number_pdus =
%d
\n
"
,
dl_config
->
dl_config_list
[
dl_config
->
number_pdus
].
dlsch_config_pdu
.
rnti
,
dl_config
->
dl_config_list
[
dl_config
->
number_pdus
].
dlsch_config_pdu
.
rnti
,
dl_config
->
number_pdus
);
dl_config
->
number_pdus
);
LOG_D
(
MAC
,
"(nr_ue_procedures.c) frequency_domain_resource_assignment=%d
\t
number_rbs=%d
\t
start_rb=%d
\n
"
,
LOG_D
(
MAC
,
"(nr_ue_procedures.c) frequency_domain_resource_assignment=%d
\t
number_rbs=%d
\t
start_rb=%d
\n
"
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
5eacaddd
...
@@ -247,8 +247,6 @@ void nr_initiate_ra_proc(module_id_t module_idP,
...
@@ -247,8 +247,6 @@ void nr_initiate_ra_proc(module_id_t module_idP,
// ra_rnti from 5.1.3 in 38.321
// ra_rnti from 5.1.3 in 38.321
uint16_t
ra_rnti
=
1
+
symbol
+
(
slotP
*
14
)
+
(
freq_index
*
14
*
80
)
+
(
ul_carrier_id
*
14
*
80
*
8
);
uint16_t
ra_rnti
=
1
+
symbol
+
(
slotP
*
14
)
+
(
freq_index
*
14
*
80
)
+
(
ul_carrier_id
*
14
*
80
*
8
);
uint16_t
msg2_frame
,
msg2_slot
,
monitoring_slot_period
,
monitoring_offset
;
uint16_t
msg2_frame
,
msg2_slot
,
monitoring_slot_period
,
monitoring_offset
;
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
NR_UE_list_t
*
UE_list
=
&
nr_mac
->
UE_list
;
NR_UE_list_t
*
UE_list
=
&
nr_mac
->
UE_list
;
...
@@ -672,7 +670,6 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -672,7 +670,6 @@ void nr_generate_Msg2(module_id_t module_idP,
dci_pdu
->
ScramblingId
[
numDlDci
]
=
*
scc
->
physCellId
;
dci_pdu
->
ScramblingId
[
numDlDci
]
=
*
scc
->
physCellId
;
dci_pdu
->
ScramblingRNTI
[
numDlDci
]
=
0
;
dci_pdu
->
ScramblingRNTI
[
numDlDci
]
=
0
;
dci_pdu
->
AggregationLevel
[
numDlDci
]
=
aggregation
;
dci_pdu
->
AggregationLevel
[
numDlDci
]
=
aggregation
;
dci_pdu
->
powerControlOffsetSS
[
numDlDci
]
=
0
;
dci_pdu
->
CceIndex
[
numDlDci
]
=
CCEIndex
;
dci_pdu
->
CceIndex
[
numDlDci
]
=
CCEIndex
;
dci_pdu
->
beta_PDCCH_1_0
[
numDlDci
]
=
0
;
dci_pdu
->
beta_PDCCH_1_0
[
numDlDci
]
=
0
;
dci_pdu
->
powerControlOffsetSS
[
numDlDci
]
=
1
;
dci_pdu
->
powerControlOffsetSS
[
numDlDci
]
=
1
;
...
...
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