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
lizhongxiao
OpenXG-RAN
Commits
cd817930
Commit
cd817930
authored
Jun 08, 2023
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tests after review and LOG_E to avoid assertion on channel raster
parent
ce7d6cc3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
14 deletions
+13
-14
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
+1
-1
ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+1
-1
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+1
-1
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
...onf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+1
-1
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+2
-2
ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml
ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml
+1
-1
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
...ts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+1
-1
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+4
-5
No files found.
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
View file @
cd817930
...
...
@@ -32,7 +32,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 2150 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
43
2880
;
absoluteFrequencySSB
=
43
3096
;
dl_frequencyBand
=
66
;
# this is 2150 MHz
dl_absoluteFrequencyPointA
=
430000
;
...
...
ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
View file @
cd817930
...
...
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
43
3096
;
absoluteFrequencySSB
=
43
2990
;
dl_frequencyBand
=
66
;
# this is 3600 MHz
dl_absoluteFrequencyPointA
=
430000
;
...
...
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
View file @
cd817930
...
...
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB
=
430
60
0
;
absoluteFrequencySSB
=
430
59
0
;
dl_frequencyBand
=
66
;
# this is 2150 MHz
dl_absoluteFrequencyPointA
=
430000
;
...
...
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
View file @
cd817930
...
...
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
43
300
0
;
absoluteFrequencySSB
=
43
299
0
;
dl_frequencyBand
=
66
;
# this is 3600 MHz
dl_absoluteFrequencyPointA
=
430000
;
...
...
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
View file @
cd817930
...
...
@@ -21,8 +21,8 @@
-->
<testCaseList>
<htmlTabRef>
rfsim-5gnr-
t
dd-u0-25prb
</htmlTabRef>
<htmlTabName>
Monolithic SA
T
DD u0 25PRB gNB
</htmlTabName>
<htmlTabRef>
rfsim-5gnr-
f
dd-u0-25prb
</htmlTabRef>
<htmlTabName>
Monolithic SA
F
DD u0 25PRB gNB
</htmlTabName>
<htmlTabIcon>
wrench
</htmlTabIcon>
<repeatCount>
1
</repeatCount>
<TestCaseRequestedList>
...
...
ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml
View file @
cd817930
...
...
@@ -22,7 +22,7 @@
-->
<testCaseList>
<htmlTabRef>
rfsim-5gnr-u0-25prb-down
</htmlTabRef>
<htmlTabName>
CleanUp SA Monolithic
T
DD u0 25PRB gNB
</htmlTabName>
<htmlTabName>
CleanUp SA Monolithic
F
DD u0 25PRB gNB
</htmlTabName>
<htmlTabIcon>
trash
</htmlTabIcon>
<TestCaseRequestedList>
100002
...
...
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
View file @
cd817930
...
...
@@ -187,7 +187,7 @@ services:
container_name
:
rfsim5g-oai-nr-ue
environment
:
RFSIMULATOR
:
192.168.71.140
USE_ADDITIONAL_OPTIONS
:
-E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 3
80
--log_config.global_log_options level,nocolor,time
USE_ADDITIONAL_OPTIONS
:
-E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 3
78
--log_config.global_log_options level,nocolor,time
depends_on
:
-
oai-gnb
networks
:
...
...
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
View file @
cd817930
...
...
@@ -188,7 +188,7 @@ services:
container_name
:
rfsim5g-oai-nr-ue
environment
:
RFSIMULATOR
:
192.168.71.140
USE_ADDITIONAL_OPTIONS
:
--sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb
80
--log_config.global_log_options level,nocolor,time
USE_ADDITIONAL_OPTIONS
:
--sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb
76
--log_config.global_log_options level,nocolor,time
depends_on
:
-
oai-gnb
networks
:
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
cd817930
...
...
@@ -2234,13 +2234,12 @@ static const uint16_t table_7_3_1_1_2_32[3][15] = {
{
0
,
1
,
2
,
3
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
},
};
void
get_delta_arfcn
(
int
i
,
uint32_t
nrarfcn
,
uint64_t
N_OFFs
)
{
void
get_delta_arfcn
(
int
i
,
uint32_t
nrarfcn
,
uint64_t
N_OFFs
)
{
uint32_t
delta_arfcn
=
nrarfcn
-
N_OFFs
;
if
(
delta_arfcn
%
(
nr_bandtable
[
i
].
step_size
)
!=
0
)
AssertFatal
(
1
==
0
,
"nrarfcn %u is not on the channel raster for step size %lu"
,
nrarfcn
,
nr_bandtable
[
i
].
step_size
);
if
(
delta_arfcn
%
(
nr_bandtable
[
i
].
step_size
)
!=
0
)
LOG_E
(
NR_MAC
,
"nrarfcn %u is not on the channel raster for step size %lu
\n
"
,
nrarfcn
,
nr_bandtable
[
i
].
step_size
);
}
uint32_t
to_nrarfcn
(
int
nr_bandP
,
...
...
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