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
899f5045
Commit
899f5045
authored
May 14, 2018
by
Rajeev Gangula
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed config files to update ul channel SNRs.
parent
dc9b0fa5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+0
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
...S/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
+2
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
...TS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
+2
-0
No files found.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
899f5045
...
@@ -1355,11 +1355,9 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
...
@@ -1355,11 +1355,9 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
eNB_UE_stats
=
&
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
];
eNB_UE_stats
=
&
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
];
/* unit is not dBm, it's special from nfapi */
/* unit is not dBm, it's special from nfapi */
//normalized_rx_power = ue_sched_ctl->pucch1_snr[CC_id];
// converting to dBm: ToDo: Noise power hard coded to 30
// converting to dBm: ToDo: Noise power hard coded to 30
normalized_rx_power
=
(
5
*
ue_sched_ctl
->
pucch1_snr
[
CC_id
]
-
640
)
/
10
+
30
;
normalized_rx_power
=
(
5
*
ue_sched_ctl
->
pucch1_snr
[
CC_id
]
-
640
)
/
10
+
30
;
target_rx_power
=
eNB
->
puCch10xSnr
/
10
+
30
;
target_rx_power
=
eNB
->
puCch10xSnr
/
10
+
30
;
printf
(
"
\n
eNB->puCch10xSnr = %d, normalized_rx_power = %d, target_rx_power = %d
\n
"
,
eNB
->
puCch10xSnr
,
normalized_rx_power
,
target_rx_power
);
// this assumes accumulated tpc
// this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
int32_t
framex10psubframe
=
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pucch_tpc_tx_frame
*
10
+
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pucch_tpc_tx_subframe
;
int32_t
framex10psubframe
=
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pucch_tpc_tx_frame
*
10
+
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pucch_tpc_tx_subframe
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
899f5045
...
@@ -1279,12 +1279,10 @@ schedule_ulsch_rnti(module_id_t module_idP,
...
@@ -1279,12 +1279,10 @@ schedule_ulsch_rnti(module_id_t module_idP,
//compute the expected ULSCH RX power (for the stats)
//compute the expected ULSCH RX power (for the stats)
// this is the normalized RX power and this should be constant (regardless of mcs
// this is the normalized RX power and this should be constant (regardless of mcs
//is not in dBm, unit from nfapi
//is not in dBm, unit from nfapi, converting to dBm: ToDo: Noise power hard coded to 30
//normalized_rx_power = UE_sched_ctrl->pusch_snr[CC_id];
// converting to dBm: ToDo: Noise power hard coded to 30
normalized_rx_power
=
(
5
*
UE_sched_ctrl
->
pusch_snr
[
CC_id
]
-
640
)
/
10
+
30
;
normalized_rx_power
=
(
5
*
UE_sched_ctrl
->
pusch_snr
[
CC_id
]
-
640
)
/
10
+
30
;
target_rx_power
=
mac
->
puSch10xSnr
/
10
+
30
;
target_rx_power
=
mac
->
puSch10xSnr
/
10
+
30
;
printf
(
"
\n
mac->puSch10xSnr = %d, normalized_rx_power = %d, target_rx_power = %d
\n
"
,
mac
->
puSch10xSnr
,
normalized_rx_power
,
target_rx_power
);
//
printf("\n mac->puSch10xSnr = %d, normalized_rx_power = %d, target_rx_power = %d \n",mac->puSch10xSnr,normalized_rx_power,target_rx_power);
// this assumes accumulated tpc
// this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
int32_t
framex10psubframe
=
UE_template
->
pusch_tpc_tx_frame
*
10
+
UE_template
->
pusch_tpc_tx_subframe
;
int32_t
framex10psubframe
=
UE_template
->
pusch_tpc_tx_frame
*
10
+
UE_template
->
pusch_tpc_tx_subframe
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
View file @
899f5045
...
@@ -164,6 +164,8 @@ MACRLCs = (
...
@@ -164,6 +164,8 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
tr_n_preference
=
"local_RRC"
;
puSch10xSnr
=
200
;
puCch10xSnr
=
200
;
}
}
);
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
View file @
899f5045
...
@@ -165,6 +165,8 @@ MACRLCs = (
...
@@ -165,6 +165,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
1
;
phy_test_mode
=
1
;
puSch10xSnr
=
200
;
puCch10xSnr
=
200
;
}
}
);
);
...
...
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