Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG
OpenXG UE
Commits
98e5baf8
Commit
98e5baf8
authored
Feb 06, 2021
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing on outdoor network
parent
27115e31
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
19 deletions
+18
-19
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/pucch.c
+9
-8
openair1/PHY/defs_eNB.h
openair1/PHY/defs_eNB.h
+2
-1
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+2
-5
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-2
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+1
-1
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+1
-1
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
98e5baf8
...
...
@@ -73,17 +73,17 @@ void dump_uci_stats(FILE *fd,PHY_VARS_eNB *eNB,int frame) {
for
(
int
i
=
0
;
i
<
NUMBER_OF_SCH_STATS_MAX
;
i
++
){
if
(
eNB
->
uci_stats
[
i
].
rnti
>
0
)
{
eNB_UCI_STATS_t
*
uci_stats
=
&
eNB
->
uci_stats
[
i
];
strpos
+=
sprintf
(
output
+
strpos
,
"UCI
RNTI %x: pucch1_trials %d, pucch1_thres %d dB, current pucch1_stat %d dB,
positive SR count %d
\n
"
,
uci_stats
->
rnti
,
uci_stats
->
pucch1_trials
,
uci_stats
->
pucch1_thres
,
dB_fixed
(
uci_stats
->
current_pucch1_stat
),
uci_stats
->
pucch1_positive_SR
);
strpos
+=
sprintf
(
output
+
strpos
,
"UCI RNTI %x: pucch1_low (%d,%d)dB pucch1_high (%d,%d)dB
\n
"
,
uci_stats
->
rnti
,
strpos
+=
sprintf
(
output
+
strpos
,
"UCI
%d RNTI %x: pucch1_trials %d, pucch1_n0 %d dB, pucch1_thres %d dB, current pucch1_stat_pos %d dB, current pucch1_stat_neg %d dB,
positive SR count %d
\n
"
,
i
,
uci_stats
->
rnti
,
uci_stats
->
pucch1_trials
,
eNB
->
measurements
.
n0_pucch_dB
/*max(eNB->measurements.n0_subband_power_tot_dB[0], eNB->measurements.n0_subband_power_tot_dB[eNB->frame_parms.N_RB_UL-1])*/
,
uci_stats
->
pucch1_thres
,
dB_fixed
(
uci_stats
->
current_pucch1_stat_pos
),
dB_fixed
(
uci_stats
->
current_pucch1_stat_neg
),
uci_stats
->
pucch1_positive_SR
);
strpos
+=
sprintf
(
output
+
strpos
,
"UCI
%d
RNTI %x: pucch1_low (%d,%d)dB pucch1_high (%d,%d)dB
\n
"
,
i
,
uci_stats
->
rnti
,
dB_fixed
(
uci_stats
->
pucch1_low_stat
[
0
]),
dB_fixed
(
uci_stats
->
pucch1_low_stat
[
1
]),
dB_fixed
(
uci_stats
->
pucch1_high_stat
[
0
]),
dB_fixed
(
uci_stats
->
pucch1_high_stat
[
1
]));
strpos
+=
sprintf
(
output
+
strpos
,
"UCI RNTI %x: pucch1a_trials %d, pucch1a_stat (%d,%d), pucch1b_trials %d, pucch1b_stat (%d,%d) pucch1ab_DTX %d
\n
"
,
uci_stats
->
rnti
,
strpos
+=
sprintf
(
output
+
strpos
,
"UCI
%d
RNTI %x: pucch1a_trials %d, pucch1a_stat (%d,%d), pucch1b_trials %d, pucch1b_stat (%d,%d) pucch1ab_DTX %d
\n
"
,
i
,
uci_stats
->
rnti
,
uci_stats
->
pucch1a_trials
,
uci_stats
->
current_pucch1a_stat_re
,
uci_stats
->
current_pucch1a_stat_im
,
...
...
@@ -902,7 +902,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
static
int
first_call
=
1
;
LTE_eNB_COMMON
*
common_vars
=
&
eNB
->
common_vars
;
LTE_DL_FRAME_PARMS
*
frame_parms
=
&
eNB
->
frame_parms
;
int8_t
sigma2_dB
=
eNB
->
measurements
.
n0_pucch_dB
;
int8_t
sigma2_dB
=
/*max(eNB->measurements.n0_subband_power_tot_dB[0], eNB->measurements.n0_subband_power_tot_dB[eNB->frame_parms.N_RB_UL-1]); */
eNB
->
measurements
.
n0_pucch_dB
;
uint32_t
u
,
v
,
n
,
aa
;
uint32_t
z
[
12
*
14
];
...
...
@@ -1276,13 +1276,14 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
// This is a moving average of the PUCCH1 statistics conditioned on being above or below the threshold
if
(
sigma2_dB
<
(
dB_fixed
(
stat_max
)
-
pucch1_thres
))
{
*
payload
=
1
;
uci_stats
->
current_pucch1_stat
=
stat_max
;
uci_stats
->
current_pucch1_stat
_pos
=
stat_max
;
for
(
int
aa
=
0
;
aa
<
frame_parms
->
nb_antennas_rx
;
aa
++
)
{
uci_stats
->
pucch1_low_stat
[
aa
]
=
stat0_max
[
aa
];
uci_stats
->
pucch1_high_stat
[
aa
]
=
stat1_max
[
aa
];
uci_stats
->
pucch1_positive_SR
++
;
}
}
else
{
uci_stats
->
current_pucch1_stat_neg
=
stat_max
;
*
payload
=
0
;
}
...
...
openair1/PHY/defs_eNB.h
View file @
98e5baf8
...
...
@@ -449,7 +449,8 @@ typedef struct {
int
frame
;
int
pucch1_trials
;
int
pucch1_thres
;
int
current_pucch1_stat
;
int
current_pucch1_stat_pos
;
int
current_pucch1_stat_neg
;
int
pucch1_positive_SR
;
int
pucch1_low_stat
[
4
];
int
pucch1_high_stat
[
4
];
...
...
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
98e5baf8
...
...
@@ -2729,10 +2729,6 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
tbs
=
get_TBS_UL
(
mcs
,
rb_table
[
rb_table_index
]);
tx_power
=
estimate_ue_tx_power
(
0
,
tbs
*
8
,
rb_table
[
rb_table_index
],
0
,
cc
->
Ncp
,
0
);
}
if
(
rb_table
[
rb_table_index
]
>
40
)
LOG_D
(
MAC
,
"bytes_to_schedule %d, nb_rb %d tx_power %d PHR %d
\n
"
,
bytes_to_schedule
,
rb_table
[
rb_table_index
],
estimate_ue_tx_power
(
0
,
tbs
*
8
,
rb_table
[
rb_table_index
],
0
,
cc
->
Ncp
,
0
),
UE_template
->
phr_info
);
if
(
rb_table
[
rb_table_index
]
<
3
)
{
rb_table_index
=
2
;
}
...
...
@@ -2773,10 +2769,11 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
=
10
;
}
else
{
// assigne RBS( 3 RBs)
first_rb
[
CC_id
]
=
first_rb
[
CC_id
]
+
3
;
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_nb_rb_ul
=
3
;
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_rb_table_index_ul
=
2
;
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
=
10
;
UE_info
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
=
10
;
}
}
}
else
if
(
ulsch_ue_select
[
CC_id
].
list
[
ulsch_ue_num
].
ue_priority
==
SCH_UL_INACTIVE
)
{
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
98e5baf8
...
...
@@ -430,7 +430,7 @@ rx_sdu(const module_id_t enb_mod_idP,
case
CRNTI
:
old_rnti
=
(((
uint16_t
)
payload_ptr
[
0
])
<<
8
)
+
payload_ptr
[
1
];
old_UE_id
=
find_UE_id
(
enb_mod_idP
,
old_rnti
);
LOG_
D
(
MAC
,
"[eNB %d] Frame %d, Subframe %d CC_id %d MAC CE_LCID %d (ce %d/%d): CRNTI %x (UE_id %d) in Msg3
\n
"
,
LOG_
I
(
MAC
,
"[eNB %d] Frame %d, Subframe %d CC_id %d MAC CE_LCID %d (ce %d/%d): CRNTI %x (UE_id %d) in Msg3
\n
"
,
enb_mod_idP
,
frameP
,
subframeP
,
...
...
@@ -508,7 +508,7 @@ rx_sdu(const module_id_t enb_mod_idP,
/* Received a new rnti */
if
(
ret
==
0
)
{
ra
->
state
=
MSGCRNTI
;
LOG_
D
(
MAC
,
"[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) Received rnti(Msg4)
\n
"
,
LOG_
I
(
MAC
,
"[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) Received rnti(Msg4)
\n
"
,
enb_mod_idP
,
frameP
,
subframeP
,
...
...
openair2/LAYER2/MAC/mac.h
View file @
98e5baf8
...
...
@@ -83,7 +83,7 @@
#define MAX_MAC_INST 16
#define BCCH_PAYLOAD_SIZE_MAX 128
#define CCCH_PAYLOAD_SIZE_MAX
128
#define CCCH_PAYLOAD_SIZE_MAX
512
#define PCCH_PAYLOAD_SIZE_MAX 128
#define RAR_PAYLOAD_SIZE_MAX 128
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
98e5baf8
...
...
@@ -2728,7 +2728,7 @@ do_RRCConnectionSetup(
// assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax,
//SchedulingRequestConfig__setup__dsr_TransMax_n4);
// assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax = SchedulingRequestConfig__setup__dsr_TransMax_n4;
physicalConfigDedicated2
->
schedulingRequestConfig
->
choice
.
setup
.
dsr_TransMax
=
LTE_SchedulingRequestConfig__setup__dsr_TransMax_n4
;
physicalConfigDedicated2
->
schedulingRequestConfig
->
choice
.
setup
.
dsr_TransMax
=
LTE_SchedulingRequestConfig__setup__dsr_TransMax_n
6
4
;
rrcConnectionSetup
->
rrc_TransactionIdentifier
=
Transaction_id
;
rrcConnectionSetup
->
criticalExtensions
.
present
=
LTE_RRCConnectionSetup__criticalExtensions_PR_c1
;
rrcConnectionSetup
->
criticalExtensions
.
choice
.
c1
.
present
=
LTE_RRCConnectionSetup__criticalExtensions__c1_PR_rrcConnectionSetup_r8
;
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
98e5baf8
...
...
@@ -5804,7 +5804,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
//SchedulingRequestConfig__setup__dsr_TransMax_n4);
// assign_enum(&physicalConfigDedicated2->schedulingRequestConfig->choice.setup.dsr_TransMax = SchedulingRequestConfig__setup__dsr_TransMax_n4;
physicalConfigDedicated2
->
schedulingRequestConfig
->
choice
.
setup
.
dsr_TransMax
=
LTE_SchedulingRequestConfig__setup__dsr_TransMax_n4
;
LTE_SchedulingRequestConfig__setup__dsr_TransMax_n
6
4
;
LOG_D
(
RRC
,
"handover_config [FRAME %05d][RRC_eNB][MOD %02d][][--- MAC_CONFIG_REQ (SRB1 UE %x) --->][MAC_eNB][MOD %02d][]
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
module_id
,
ue_context_pP
->
ue_context
.
rnti
,
ctxt_pP
->
module_id
);
...
...
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