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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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-RAN
Commits
dbddecb7
Commit
dbddecb7
authored
Apr 04, 2018
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Paging bug when PO=subframe0 and sfn_sf error
parent
1846c56d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+7
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
dbddecb7
...
@@ -1844,7 +1844,7 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
...
@@ -1844,7 +1844,7 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
LOG_D
(
MAC
,
"[eNB %d] Frame %d subframe %d: PCCH->PCH CC_id %d UE_id %d, Received %d bytes
\n
"
,
module_idP
,
frameP
,
subframeP
,
CC_id
,
i
,
pcch_sdu_length
);
LOG_D
(
MAC
,
"[eNB %d] Frame %d subframe %d: PCCH->PCH CC_id %d UE_id %d, Received %d bytes
\n
"
,
module_idP
,
frameP
,
subframeP
,
CC_id
,
i
,
pcch_sdu_length
);
#ifdef FORMAT1C
#ifdef FORMAT1C
//NO SIB
//NO SIB
if
((
subframeP
==
1
||
subframeP
==
2
||
subframeP
==
4
||
subframeP
==
6
||
subframeP
==
9
)
||
if
((
subframeP
==
0
||
subframeP
==
1
||
subframeP
==
2
||
subframeP
==
4
||
subframeP
==
6
||
subframeP
==
9
)
||
(
subframeP
==
5
&&
((
frameP
%
2
)
!=
0
&&
(
frameP
%
8
)
!=
1
)))
{
(
subframeP
==
5
&&
((
frameP
%
2
)
!=
0
&&
(
frameP
%
8
)
!=
1
)))
{
switch
(
n_rb_dl
)
{
switch
(
n_rb_dl
)
{
#if 0
#if 0
...
@@ -1963,7 +1963,7 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
...
@@ -1963,7 +1963,7 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
}
}
#else
#else
//NO SIB
//NO SIB
if
((
subframeP
==
1
||
subframeP
==
2
||
subframeP
==
4
||
subframeP
==
6
||
subframeP
==
9
)
||
if
((
subframeP
==
0
||
subframeP
==
1
||
subframeP
==
2
||
subframeP
==
4
||
subframeP
==
6
||
subframeP
==
9
)
||
(
subframeP
==
5
&&
((
frameP
%
2
)
!=
0
&&
(
frameP
%
8
)
!=
1
)))
{
(
subframeP
==
5
&&
((
frameP
%
2
)
!=
0
&&
(
frameP
%
8
)
!=
1
)))
{
switch
(
n_rb_dl
)
{
switch
(
n_rb_dl
)
{
case
25
:
case
25
:
...
@@ -2051,6 +2051,10 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
...
@@ -2051,6 +2051,10 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
LOG_D
(
MAC
,
"Frame %d: Subframe %d : Adding common DCI for P_RNTI
\n
"
,
frameP
,
subframeP
);
LOG_D
(
MAC
,
"Frame %d: Subframe %d : Adding common DCI for P_RNTI
\n
"
,
frameP
,
subframeP
);
dl_req
->
number_dci
++
;
dl_req
->
number_dci
++
;
dl_req
->
number_pdu
++
;
dl_req
->
number_pdu
++
;
dl_req
->
tl
.
tag
=
NFAPI_DL_CONFIG_REQUEST_BODY_TAG
;
eNB
->
DL_req
[
CC_id
].
sfn_sf
=
frameP
<<
4
|
subframeP
;
eNB
->
DL_req
[
CC_id
].
header
.
message_id
=
NFAPI_DL_CONFIG_REQUEST
;
dl_config_pdu
=
&
dl_req
->
dl_config_pdu_list
[
dl_req
->
number_pdu
];
dl_config_pdu
=
&
dl_req
->
dl_config_pdu_list
[
dl_req
->
number_pdu
];
memset
((
void
*
)
dl_config_pdu
,
0
,
sizeof
(
nfapi_dl_config_request_pdu_t
));
memset
((
void
*
)
dl_config_pdu
,
0
,
sizeof
(
nfapi_dl_config_request_pdu_t
));
dl_config_pdu
->
pdu_type
=
NFAPI_DL_CONFIG_DLSCH_PDU_TYPE
;
dl_config_pdu
->
pdu_type
=
NFAPI_DL_CONFIG_DLSCH_PDU_TYPE
;
...
@@ -2091,6 +2095,7 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
...
@@ -2091,6 +2095,7 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
TX_req
->
num_segments
=
1
;
TX_req
->
num_segments
=
1
;
TX_req
->
segments
[
0
].
segment_length
=
pcch_sdu_length
;
TX_req
->
segments
[
0
].
segment_length
=
pcch_sdu_length
;
TX_req
->
segments
[
0
].
segment_data
=
cc
[
CC_id
].
PCCH_pdu
.
payload
;
TX_req
->
segments
[
0
].
segment_data
=
cc
[
CC_id
].
PCCH_pdu
.
payload
;
eNB
->
TX_req
[
CC_id
].
tx_request_body
.
tl
.
tag
=
NFAPI_TX_REQUEST_BODY_TAG
;
eNB
->
TX_req
[
CC_id
].
tx_request_body
.
number_of_pdus
++
;
eNB
->
TX_req
[
CC_id
].
tx_request_body
.
number_of_pdus
++
;
}
else
{
}
else
{
LOG_E
(
MAC
,
"[eNB %d] CCid %d Frame %d, subframe %d : Cannot add DCI 1A/1C for Paging
\n
"
,
module_idP
,
CC_id
,
frameP
,
subframeP
);
LOG_E
(
MAC
,
"[eNB %d] CCid %d Frame %d, subframe %d : Cannot add DCI 1A/1C for Paging
\n
"
,
module_idP
,
CC_id
,
frameP
,
subframeP
);
...
...
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