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
Michael Black
OpenXG-RAN
Commits
5eb7f686
Commit
5eb7f686
authored
Dec 06, 2018
by
Florian Kaltenberger
Committed by
Florian Kaltenberger
Dec 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temporarily hardconding dl_freq
Conflicts: openair1/PHY/INIT/nr_init.c
parent
53060047
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+1
-1
No files found.
openair1/PHY/INIT/nr_init.c
View file @
5eb7f686
...
@@ -414,7 +414,7 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu)
...
@@ -414,7 +414,7 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu)
gNB
->
mac_enabled
=
1
;
gNB
->
mac_enabled
=
1
;
fp
->
dl_CarrierFreq
=
from_e
arfcn
(
gNB_config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
],
gNB_config
->
nfapi_config
.
nrarfcn
.
value
);
fp
->
dl_CarrierFreq
=
3510000000
;
//from_nr
arfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
fp
->
ul_CarrierFreq
=
fp
->
dl_CarrierFreq
-
(
get_uldl_offset
(
gNB_config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
])
*
100000
);
fp
->
ul_CarrierFreq
=
fp
->
dl_CarrierFreq
-
(
get_uldl_offset
(
gNB_config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
])
*
100000
);
fp
->
threequarter_fs
=
0
;
fp
->
threequarter_fs
=
0
;
...
@@ -455,7 +455,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
...
@@ -455,7 +455,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
RC
.
gNB
[
Mod_id
][
CC_id
]
->
mac_enabled
=
1
;
RC
.
gNB
[
Mod_id
][
CC_id
]
->
mac_enabled
=
1
;
fp
->
dl_CarrierFreq
=
from_e
arfcn
(
gNB_config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
],
gNB_config
->
nfapi_config
.
nrarfcn
.
value
);
fp
->
dl_CarrierFreq
=
3510000000
;
//from_nr
arfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
fp
->
ul_CarrierFreq
=
fp
->
dl_CarrierFreq
-
(
get_uldl_offset
(
gNB_config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
])
*
100000
);
fp
->
ul_CarrierFreq
=
fp
->
dl_CarrierFreq
-
(
get_uldl_offset
(
gNB_config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
])
*
100000
);
fp
->
threequarter_fs
=
0
;
fp
->
threequarter_fs
=
0
;
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
5eb7f686
...
@@ -179,7 +179,7 @@ void config_common(int Mod_idP,
...
@@ -179,7 +179,7 @@ void config_common(int Mod_idP,
cfg
->
nfapi_config
.
rf_bands
.
tl
.
tag
=
NFAPI_PHY_RF_BANDS_TAG
;
cfg
->
nfapi_config
.
rf_bands
.
tl
.
tag
=
NFAPI_PHY_RF_BANDS_TAG
;
cfg
->
num_tlv
++
;
cfg
->
num_tlv
++
;
cfg
->
nfapi_config
.
nrarfcn
.
value
=
to_
e
arfcn
(
nr_bandP
,
dl_CarrierFreqP
,
dl_BandwidthP
);
cfg
->
nfapi_config
.
nrarfcn
.
value
=
to_
nr
arfcn
(
nr_bandP
,
dl_CarrierFreqP
,
dl_BandwidthP
);
cfg
->
nfapi_config
.
nrarfcn
.
tl
.
tag
=
NFAPI_NR_NFAPI_NRARFCN_TAG
;
cfg
->
nfapi_config
.
nrarfcn
.
tl
.
tag
=
NFAPI_NR_NFAPI_NRARFCN_TAG
;
cfg
->
num_tlv
++
;
cfg
->
num_tlv
++
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
View file @
5eb7f686
...
@@ -29,7 +29,7 @@ gNBs =
...
@@ -29,7 +29,7 @@ gNBs =
frame_type
=
"FDD"
;
frame_type
=
"FDD"
;
DL_prefix_type
=
"NORMAL"
;
DL_prefix_type
=
"NORMAL"
;
UL_prefix_type
=
"NORMAL"
;
UL_prefix_type
=
"NORMAL"
;
eutra_band
=
22
;
eutra_band
=
78
;
downlink_frequency
=
3510000000
L
;
downlink_frequency
=
3510000000
L
;
uplink_frequency_offset
= -
120000000
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
Nid_cell
=
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