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
canghaiwuhen
OpenXG-RAN
Commits
b059f7f5
Commit
b059f7f5
authored
Mar 08, 2019
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix core set for pre_scd_thread and task, and add sfn_sf for dl_config_request
parent
52f5b589
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
openair2/ENB_APP/enb_app.c
openair2/ENB_APP/enb_app.c
+1
-2
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+1
-0
openair2/PHY_INTERFACE/IF_Module.c
openair2/PHY_INTERFACE/IF_Module.c
+1
-1
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+1
-1
No files found.
openair2/ENB_APP/enb_app.c
View file @
b059f7f5
...
@@ -191,7 +191,6 @@ void *eNB_app_task(void *args_p)
...
@@ -191,7 +191,6 @@ void *eNB_app_task(void *args_p)
int
result
;
int
result
;
/* for no gcc warnings */
/* for no gcc warnings */
(
void
)
instance
;
(
void
)
instance
;
thread_top_init
(
"eNB_app_task"
,
1
,
500000
,
1000000
,
20000000
);
itti_mark_task_ready
(
TASK_ENB_APP
);
itti_mark_task_ready
(
TASK_ENB_APP
);
LOG_I
(
PHY
,
"%s() Task ready initialise structures
\n
"
,
__FUNCTION__
);
LOG_I
(
PHY
,
"%s() Task ready initialise structures
\n
"
,
__FUNCTION__
);
...
@@ -233,7 +232,7 @@ void *eNB_app_task(void *args_p)
...
@@ -233,7 +232,7 @@ void *eNB_app_task(void *args_p)
/* Try to register each eNB with each other */
/* Try to register each eNB with each other */
// x2_registered_enb = 0;
// x2_registered_enb = 0;
// x2_register_enb_pending = eNB_app_register_x2 (enb_id_start, enb_id_end);
// x2_register_enb_pending = eNB_app_register_x2 (enb_id_start, enb_id_end);
thread_top_init
(
"eNB_app_task"
,
1
,
500000
,
1000000
,
20000000
);
do
{
do
{
// Wait for a message
// Wait for a message
itti_receive_msg
(
TASK_ENB_APP
,
&
msg_p
);
itti_receive_msg
(
TASK_ENB_APP
,
&
msg_p
);
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
b059f7f5
...
@@ -390,6 +390,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
...
@@ -390,6 +390,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
DL_req
[
CC_id
].
dl_config_request_body
.
number_dci
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
number_dci
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
number_pdu
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
number_pdu
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
tl
.
tag
=
NFAPI_DL_CONFIG_REQUEST_BODY_TAG
;
DL_req
[
CC_id
].
dl_config_request_body
.
tl
.
tag
=
NFAPI_DL_CONFIG_REQUEST_BODY_TAG
;
DL_req
[
CC_id
].
sfn_sf
=
frameP
<<
4
|
subframeP
;
LOG_D
(
MAC
,
LOG_D
(
MAC
,
"UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d
\n
"
,
"UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d
\n
"
,
UE_id
,
rnti
,
UE_id
,
rnti
,
...
...
openair2/PHY_INTERFACE/IF_Module.c
View file @
b059f7f5
...
@@ -261,7 +261,7 @@ void handle_ulsch(UL_IND_t *UL_info) {
...
@@ -261,7 +261,7 @@ void handle_ulsch(UL_IND_t *UL_info) {
j
,
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
crc_pdu_list
[
j
].
rx_ue_information
.
rnti
,
i
,
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
rx_pdu_list
[
i
].
rx_ue_information
.
rnti
);
j
,
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
crc_pdu_list
[
j
].
rx_ue_information
.
rnti
,
i
,
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
rx_pdu_list
[
i
].
rx_ue_information
.
rnti
);
if
(
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
crc_pdu_list
[
j
].
rx_ue_information
.
rnti
==
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
rx_pdu_list
[
i
].
rx_ue_information
.
rnti
)
{
if
(
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
crc_pdu_list
[
j
].
rx_ue_information
.
rnti
==
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
rx_pdu_list
[
i
].
rx_ue_information
.
rnti
)
{
LOG_D
(
PHY
,
"UL_info->crc_ind.crc_indication_body.crc_pdu_list[%d].crc_indication_rel8.crc_flag:%d
\n
"
,
LOG_D
(
PHY
,
"UL_info->crc_ind.crc_indication_body.crc_pdu_list[%d].crc_indication_rel8.crc_flag:%d
\n
"
,
j
,
UL_
info
->
crc_ind
.
crc_indication_body
.
crc_pdu_list
[
j
].
crc_indication_rel8
.
crc_flag
);
j
,
UL_
RCC_INFO
.
crc_ind
[
k
]
.
crc_indication_body
.
crc_pdu_list
[
j
].
crc_indication_rel8
.
crc_flag
);
if
(
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
crc_pdu_list
[
j
].
crc_indication_rel8
.
crc_flag
==
1
)
{
// CRC error indication
if
(
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
crc_pdu_list
[
j
].
crc_indication_rel8
.
crc_flag
==
1
)
{
// CRC error indication
LOG_D
(
MAC
,
"Frame %d, Subframe %d Calling rx_sdu (CRC error)
\n
"
,
UL_info
->
frame
,
UL_info
->
subframe
);
LOG_D
(
MAC
,
"Frame %d, Subframe %d Calling rx_sdu (CRC error)
\n
"
,
UL_info
->
frame
,
UL_info
->
subframe
);
rx_sdu
(
UL_info
->
module_id
,
rx_sdu
(
UL_info
->
module_id
,
...
...
targets/RT/USER/lte-ru.c
View file @
b059f7f5
...
@@ -1966,7 +1966,7 @@ void* pre_scd_thread( void* param ){
...
@@ -1966,7 +1966,7 @@ void* pre_scd_thread( void* param ){
frame
=
0
;
frame
=
0
;
subframe
=
4
;
subframe
=
4
;
thread_top_init
(
"pre_scd_thread"
,
0
,
870000
,
1000000
,
1000000
);
thread_top_init
(
"pre_scd_thread"
,
1
,
870000
,
1000000
,
1000000
);
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
if
(
oai_exit
){
if
(
oai_exit
){
...
...
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