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
4784f603
Commit
4784f603
authored
Jul 20, 2020
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compilation.
parent
155c386f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
openair1/SCHED/ru_procedures.c
openair1/SCHED/ru_procedures.c
+4
-3
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+0
-1
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+0
-1
No files found.
openair1/SCHED/ru_procedures.c
View file @
4784f603
...
@@ -769,13 +769,14 @@ void fep_full(RU_t *ru) {
...
@@ -769,13 +769,14 @@ void fep_full(RU_t *ru) {
RU_proc_t
*
proc
=
&
ru
->
proc
;
RU_proc_t
*
proc
=
&
ru
->
proc
;
int
l
;
int
l
;
LTE_DL_FRAME_PARMS
*
fp
=&
ru
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
fp
=&
ru
->
frame_parms
;
if
((
fp
->
frame_type
==
TDD
)
&&
(
subframe_select
(
fp
,
proc
->
subframe_rx
)
!=
SF_UL
))
{
double
recv_pow
=
0
;
double
recv_pow
=
0
;
int
i
,
idx
;
int
i
,
idx
;
int
shift
=
0
;
int
shift
=
0
;
short
*
temp_iq
;
short
*
temp_iq
;
if
((
fp
->
frame_type
==
TDD
)
&&
(
subframe_select
(
fp
,
proc
->
subframe_rx
)
!=
SF_UL
))
return
;
for
(
i
=
0
;
i
<
fp
->
samples_per_tti
;
i
++
){
for
(
i
=
0
;
i
<
fp
->
samples_per_tti
;
i
++
){
idx
=
i
+
fp
->
samples_per_tti
*
proc
->
subframe_rx
-
ru
->
N_TA_offset
;
idx
=
i
+
fp
->
samples_per_tti
*
proc
->
subframe_rx
-
ru
->
N_TA_offset
;
if
(
idx
<
0
)
idx
+=
fp
->
samples_per_tti
*
10
;
if
(
idx
<
0
)
idx
+=
fp
->
samples_per_tti
*
10
;
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
4784f603
...
@@ -425,7 +425,6 @@ schedule_SR (module_id_t module_idP,
...
@@ -425,7 +425,6 @@ schedule_SR (module_id_t module_idP,
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
pdu_type
=
NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
pdu_type
=
NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel8
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel8
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel8
.
rnti
=
UE_list
->
UE_template
[
CC_id
][
UE_id
].
rnti
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel8
.
rnti
=
UE_list
->
UE_template
[
CC_id
][
UE_id
].
rnti
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel8
.
ue_id
=
UE_id
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel11
.
tl
.
tag
=
0
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel11
.
tl
.
tag
=
0
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel13
.
tl
.
tag
=
0
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
ue_information
.
ue_information_rel13
.
tl
.
tag
=
0
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
sr_information
=
sr
;
ul_req_body
->
ul_config_pdu_list
[
ul_req_body
->
number_of_pdus
].
uci_sr_pdu
.
sr_information
=
sr
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
4784f603
...
@@ -983,7 +983,6 @@ generate_Msg4(module_id_t module_idP,
...
@@ -983,7 +983,6 @@ generate_Msg4(module_id_t module_idP,
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
handle
=
0
;
// don't know how to use this
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
handle
=
0
;
// don't know how to use this
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
rnti
=
ra
->
rnti
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
rnti
=
ra
->
rnti
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel8
.
ue_id
=
UE_id
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel13
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL13_TAG
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel13
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL13_TAG
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel13
.
ue_type
=
(
ra
->
rach_resource_type
<
3
)
?
1
:
2
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel13
.
ue_type
=
(
ra
->
rach_resource_type
<
3
)
?
1
:
2
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel13
.
empty_symbols
=
0
;
ul_config_pdu
->
uci_harq_pdu
.
ue_information
.
ue_information_rel13
.
empty_symbols
=
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