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
wangjie
OpenXG-RAN
Commits
9af8daef
Commit
9af8daef
authored
Jul 02, 2021
by
Fang-WANG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
100M--rar failed
parent
1dc94f57
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
11 deletions
+18
-11
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+1
-1
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+8
-2
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+3
-3
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+4
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+1
-1
No files found.
executables/nr-uesoftmodem.c
View file @
9af8daef
...
@@ -490,7 +490,7 @@ int main( int argc, char **argv ) {
...
@@ -490,7 +490,7 @@ int main( int argc, char **argv ) {
nrUE_config
->
carrier_config
.
dl_frequency
=
(
downlink_frequency
[
0
][
0
]
-
(
6
*
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
*
(
15000
<<
nrUE_config
->
ssb_config
.
scs_common
)))
/
1000
;
nrUE_config
->
carrier_config
.
dl_frequency
=
(
downlink_frequency
[
0
][
0
]
-
(
6
*
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
*
(
15000
<<
nrUE_config
->
ssb_config
.
scs_common
)))
/
1000
;
nrUE_config
->
carrier_config
.
uplink_frequency
=
(
downlink_frequency
[
0
][
0
]
-
(
6
*
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
*
(
15000
<<
nrUE_config
->
ssb_config
.
scs_common
)))
/
1000
;
nrUE_config
->
carrier_config
.
uplink_frequency
=
(
downlink_frequency
[
0
][
0
]
-
(
6
*
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
*
(
15000
<<
nrUE_config
->
ssb_config
.
scs_common
)))
/
1000
;
nrUE_config
->
ssb_table
.
ssb_offset_point_a
=
(
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
-
20
)
>>
1
;
nrUE_config
->
ssb_table
.
ssb_offset_point_a
=
(
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
-
20
)
>>
1
;
if
(
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
&
0x01
==
1
)
if
(
(
UE
[
CC_id
]
->
frame_parms
.
N_RB_DL
&
0x01
)
==
1
)
{
{
nrUE_config
->
ssb_table
.
ssb_subcarrier_offset
=
12
;
// 15khz
nrUE_config
->
ssb_table
.
ssb_subcarrier_offset
=
12
;
// 15khz
}
}
...
...
openair1/PHY/INIT/nr_parms.c
View file @
9af8daef
...
@@ -316,8 +316,14 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
...
@@ -316,8 +316,14 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
((
fp
->
freq_range
==
nr_FR2
)
&&
(
config
->
ssb_table
.
ssb_subcarrier_offset
<
12
))
)
((
fp
->
freq_range
==
nr_FR2
)
&&
(
config
->
ssb_table
.
ssb_subcarrier_offset
<
12
))
)
sco
=
config
->
ssb_table
.
ssb_subcarrier_offset
;
sco
=
config
->
ssb_table
.
ssb_subcarrier_offset
;
fp
->
ssb_start_subcarrier
=
(
12
*
config
->
ssb_table
.
ssb_offset_point_a
+
sco
);
fp
->
ssb_start_subcarrier
=
(
12
*
config
->
ssb_table
.
ssb_offset_point_a
+
sco
/
2
);
LOG_I
(
PHY
,
"sco %d, ssb_subcarrier_offset %d, ssb_offset_point_a %d, ssb_start_subcarrier %d, ofdmsize %d
\n
"
,
sco
,
// sco is 15khz
config
->
ssb_table
.
ssb_subcarrier_offset
,
config
->
ssb_table
.
ssb_offset_point_a
,
fp
->
ssb_start_subcarrier
,
fp
->
ofdm_symbol_size
);
// definition of Lmax according to ts 38.213 section 4.1
// definition of Lmax according to ts 38.213 section 4.1
if
(
fp
->
dl_CarrierFreq
<
6e9
)
{
if
(
fp
->
dl_CarrierFreq
<
6e9
)
{
if
(
fp
->
frame_type
&&
(
fp
->
ssb_type
==
2
))
if
(
fp
->
frame_type
&&
(
fp
->
ssb_type
==
2
))
...
...
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
9af8daef
...
@@ -94,12 +94,12 @@ void nr_generate_dci(PHY_VARS_gNB *gNB,
...
@@ -94,12 +94,12 @@ void nr_generate_dci(PHY_VARS_gNB *gNB,
* in time: by its first slot and its first symbol*/
* in time: by its first slot and its first symbol*/
const
nfapi_nr_dl_dci_pdu_t
*
dci_pdu
=
&
pdcch_pdu_rel15
->
dci_pdu
[
d
];
const
nfapi_nr_dl_dci_pdu_t
*
dci_pdu
=
&
pdcch_pdu_rel15
->
dci_pdu
[
d
];
LOG_
D
(
PHY
,
"DCI pdu %d, rnti %x, aggregation %d CCE %d Scrambling_Id %x ScramblingRNTI %x PayloadSizeBits %d
\n
"
,
d
,
dci_pdu
->
RNTI
,
dci_pdu
->
AggregationLevel
,
dci_pdu
->
CceIndex
,
dci_pdu
->
ScramblingId
,
dci_pdu
->
ScramblingRNTI
,
dci_pdu
->
PayloadSizeBits
);
LOG_
I
(
PHY
,
"DCI pdu %d, rnti %x, aggregation %d CCE %d Scrambling_Id %x ScramblingRNTI %x PayloadSizeBits %d
\n
"
,
d
,
dci_pdu
->
RNTI
,
dci_pdu
->
AggregationLevel
,
dci_pdu
->
CceIndex
,
dci_pdu
->
ScramblingId
,
dci_pdu
->
ScramblingRNTI
,
dci_pdu
->
PayloadSizeBits
);
cset_start_symb
=
pdcch_pdu_rel15
->
StartSymbolIndex
;
cset_start_symb
=
pdcch_pdu_rel15
->
StartSymbolIndex
;
cset_nsymb
=
pdcch_pdu_rel15
->
DurationSymbols
;
cset_nsymb
=
pdcch_pdu_rel15
->
DurationSymbols
;
dci_idx
=
0
;
dci_idx
=
0
;
LOG_
D
(
PHY
,
"Coreset rb_offset %d, nb_rb %d BWP Start %d
\n
"
,
rb_offset
,
n_rb
,
pdcch_pdu_rel15
->
BWPStart
);
LOG_
I
(
PHY
,
"Coreset rb_offset %d, nb_rb %d BWP Start %d
\n
"
,
rb_offset
,
n_rb
,
pdcch_pdu_rel15
->
BWPStart
);
LOG_
D
(
PHY
,
"Coreset starting subcarrier %d on symbol %d (%d symbols)
\n
"
,
cset_start_sc
,
cset_start_symb
,
cset_nsymb
);
LOG_
I
(
PHY
,
"Coreset starting subcarrier %d on symbol %d (%d symbols)
\n
"
,
cset_start_sc
,
cset_start_symb
,
cset_nsymb
);
// DMRS length is per OFDM symbol
// DMRS length is per OFDM symbol
uint32_t
dmrs_length
=
n_rb
*
6
;
//2(QPSK)*3(per RB)*6(REG per CCE)
uint32_t
dmrs_length
=
n_rb
*
6
;
//2(QPSK)*3(per RB)*6(REG per CCE)
uint32_t
encoded_length
=
dci_pdu
->
AggregationLevel
*
108
;
//2(QPSK)*9(per RB)*6(REG per CCE)
uint32_t
encoded_length
=
dci_pdu
->
AggregationLevel
*
108
;
//2(QPSK)*9(per RB)*6(REG per CCE)
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
9af8daef
...
@@ -63,7 +63,7 @@ void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_scf_t *cfg, NR_DL_FRAME
...
@@ -63,7 +63,7 @@ void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_scf_t *cfg, NR_DL_FRAME
((
fp
->
freq_range
==
nr_FR2
)
&&
(
cfg
->
ssb_table
.
ssb_subcarrier_offset
.
value
<
12
))
)
((
fp
->
freq_range
==
nr_FR2
)
&&
(
cfg
->
ssb_table
.
ssb_subcarrier_offset
.
value
<
12
))
)
sco
=
cfg
->
ssb_table
.
ssb_subcarrier_offset
.
value
;
sco
=
cfg
->
ssb_table
.
ssb_subcarrier_offset
.
value
;
fp
->
ssb_start_subcarrier
=
(
12
*
cfg
->
ssb_table
.
ssb_offset_point_a
.
value
+
sco
);
fp
->
ssb_start_subcarrier
=
(
12
*
cfg
->
ssb_table
.
ssb_offset_point_a
.
value
+
sco
/
2
);
// sco is 15khz
LOG_D
(
PHY
,
"SSB first subcarrier %d (%d,%d)
\n
"
,
fp
->
ssb_start_subcarrier
,
cfg
->
ssb_table
.
ssb_offset_point_a
.
value
,
sco
);
LOG_D
(
PHY
,
"SSB first subcarrier %d (%d,%d)
\n
"
,
fp
->
ssb_start_subcarrier
,
cfg
->
ssb_table
.
ssb_offset_point_a
.
value
,
sco
);
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
9af8daef
...
@@ -1090,18 +1090,19 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
...
@@ -1090,18 +1090,19 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
dci_payload
.
mcs
=
pdsch_pdu_rel15
->
mcsIndex
[
0
];
dci_payload
.
mcs
=
pdsch_pdu_rel15
->
mcsIndex
[
0
];
dci_payload
.
tb_scaling
=
tb_scaling
;
dci_payload
.
tb_scaling
=
tb_scaling
;
LOG_
D
(
NR_MAC
,
LOG_
I
(
NR_MAC
,
"[RAPROC] DCI type 1 payload: freq_alloc %d (%d,%d,%d), time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d
\n
"
,
"[RAPROC] DCI type 1 payload: freq_alloc %d (%d,%d,
%d,
%d), time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d
\n
"
,
dci_payload
.
frequency_domain_assignment
.
val
,
dci_payload
.
frequency_domain_assignment
.
val
,
pdsch_pdu_rel15
->
rbStart
,
pdsch_pdu_rel15
->
rbStart
,
pdsch_pdu_rel15
->
rbSize
,
pdsch_pdu_rel15
->
rbSize
,
pdsch_pdu_rel15
->
BWPStart
,
pdsch_pdu_rel15
->
BWPSize
,
pdsch_pdu_rel15
->
BWPSize
,
dci_payload
.
time_domain_assignment
.
val
,
dci_payload
.
time_domain_assignment
.
val
,
dci_payload
.
vrb_to_prb_mapping
.
val
,
dci_payload
.
vrb_to_prb_mapping
.
val
,
dci_payload
.
mcs
,
dci_payload
.
mcs
,
dci_payload
.
tb_scaling
);
dci_payload
.
tb_scaling
);
LOG_
D
(
NR_MAC
,
LOG_
I
(
NR_MAC
,
"[RAPROC] DCI params: rnti 0x%x, rnti_type %d, dci_format %d coreset params: FreqDomainResource %llx, start_symbol %d n_symb %d
\n
"
,
"[RAPROC] DCI params: rnti 0x%x, rnti_type %d, dci_format %d coreset params: FreqDomainResource %llx, start_symbol %d n_symb %d
\n
"
,
pdcch_pdu_rel15
->
dci_pdu
[
0
].
RNTI
,
pdcch_pdu_rel15
->
dci_pdu
[
0
].
RNTI
,
NR_RNTI_RA
,
NR_RNTI_RA
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
View file @
9af8daef
...
@@ -353,7 +353,7 @@ void schedule_control_sib1(module_id_t module_id,
...
@@ -353,7 +353,7 @@ void schedule_control_sib1(module_id_t module_id,
const
uint16_t
bwpSize
=
type0_PDCCH_CSS_config
->
num_rbs
;
const
uint16_t
bwpSize
=
type0_PDCCH_CSS_config
->
num_rbs
;
int
rbStart
=
0
;
//type0_PDCCH_CSS_config->cset_start_rb;
int
rbStart
=
0
;
//type0_PDCCH_CSS_config->cset_start_rb;
LOG_
I
(
PHY
,
"cset_start_rb is %d
\n
"
,
type0_PDCCH_CSS_config
->
cset_start_rb
);
LOG_
D
(
PHY
,
"cset_start_rb is %d
\n
"
,
type0_PDCCH_CSS_config
->
cset_start_rb
);
int
startSymbolIndex
=
0
;
int
startSymbolIndex
=
0
;
int
nrOfSymbols
=
0
;
int
nrOfSymbols
=
0
;
...
...
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