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
19509f08
Commit
19509f08
authored
Feb 20, 2018
by
tomita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed log level.
parent
ea3aecf4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+3
-3
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-1
No files found.
openair1/SCHED/fapi_l1.c
View file @
19509f08
...
@@ -681,16 +681,16 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
...
@@ -681,16 +681,16 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
eNB
->
pdcch_vars
[
subframe
&
1
].
num_dci
=
0
;
eNB
->
pdcch_vars
[
subframe
&
1
].
num_dci
=
0
;
eNB
->
phich_vars
[
subframe
&
1
].
num_hi
=
0
;
eNB
->
phich_vars
[
subframe
&
1
].
num_hi
=
0
;
LOG_
I
(
PHY
,
"NFAPI: Sched_INFO:SFN/SF:%04d%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d
\n
"
,
LOG_
D
(
PHY
,
"NFAPI: Sched_INFO:SFN/SF:%04d%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d
\n
"
,
frame
,
subframe
,
frame
,
subframe
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
),
number_dl_pdu
,
NFAPI_SFNSF2SFN
(
DL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
DL_req
->
sfn_sf
),
number_dl_pdu
,
NFAPI_SFNSF2SFN
(
TX_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
TX_req
->
sfn_sf
),
TX_req
->
tx_request_body
.
number_of_pdus
NFAPI_SFNSF2SFN
(
TX_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
TX_req
->
sfn_sf
),
TX_req
->
tx_request_body
.
number_of_pdus
);
);
LOG_
I
(
PHY
,
"NFAPI: hi_dci0:SFN/SF:%04d%d:pdus:%d
\n
"
,
LOG_
D
(
PHY
,
"NFAPI: hi_dci0:SFN/SF:%04d%d:pdus:%d
\n
"
,
NFAPI_SFNSF2SFN
(
HI_DCI0_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
HI_DCI0_req
->
sfn_sf
),
number_hi_dci0_pdu
NFAPI_SFNSF2SFN
(
HI_DCI0_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
HI_DCI0_req
->
sfn_sf
),
number_hi_dci0_pdu
);
);
if
(
UL_req
!=
NULL
)
if
(
UL_req
!=
NULL
)
LOG_
I
(
PHY
,
"NFAPI: ul_cfg:SFN/SF:%04d%d:pdus:%d num_pdcch_symbols:%d
\n
"
,
LOG_
D
(
PHY
,
"NFAPI: ul_cfg:SFN/SF:%04d%d:pdus:%d num_pdcch_symbols:%d
\n
"
,
NFAPI_SFNSF2SFN
(
UL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
UL_req
->
sfn_sf
),
number_ul_pdu
,
NFAPI_SFNSF2SFN
(
UL_req
->
sfn_sf
),
NFAPI_SFNSF2SF
(
UL_req
->
sfn_sf
),
number_ul_pdu
,
eNB
->
pdcch_vars
[
subframe
&
1
].
num_pdcch_symbols
);
eNB
->
pdcch_vars
[
subframe
&
1
].
num_pdcch_symbols
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
19509f08
...
@@ -3771,7 +3771,7 @@ uint8_t frame_subframe2_dl_harq_pid(TDD_Config_t *tdd_Config, int abs_frameP, su
...
@@ -3771,7 +3771,7 @@ uint8_t frame_subframe2_dl_harq_pid(TDD_Config_t *tdd_Config, int abs_frameP, su
switch
(
tdd_Config
->
subframeAssignment
){
//TODO fill in other tdd config
switch
(
tdd_Config
->
subframeAssignment
){
//TODO fill in other tdd config
case
1
:
case
1
:
harq_pid
=
(((
frame_cnt
*
1024
+
abs_frameP
)
*
4
)
-
1
+
get_dl_subframe_count
(
tdd_Config
->
subframeAssignment
,
subframeP
))
%
7
;
//4 dl subframe in a frame
harq_pid
=
(((
frame_cnt
*
1024
+
abs_frameP
)
*
4
)
-
1
+
get_dl_subframe_count
(
tdd_Config
->
subframeAssignment
,
subframeP
))
%
7
;
//4 dl subframe in a frame
LOG_
I
(
MAC
,
"[frame_subframe2_dl_harq_pid] (%d,%d) calculate harq_pid ((( %d * 1024 + %d) *4) - 1 + %d)%7 = %d
\n
"
,
LOG_
D
(
MAC
,
"[frame_subframe2_dl_harq_pid] (%d,%d) calculate harq_pid ((( %d * 1024 + %d) *4) - 1 + %d)%7 = %d
\n
"
,
(
abs_frameP
+
1024
)
%
1024
,
subframeP
,
frame_cnt
,
abs_frameP
,
(
abs_frameP
+
1024
)
%
1024
,
subframeP
,
frame_cnt
,
abs_frameP
,
get_dl_subframe_count
(
tdd_Config
->
subframeAssignment
,
subframeP
),
harq_pid
);
get_dl_subframe_count
(
tdd_Config
->
subframeAssignment
,
subframeP
),
harq_pid
);
return
harq_pid
;
return
harq_pid
;
...
...
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