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
b522db88
Commit
b522db88
authored
Oct 18, 2019
by
zhenghuangkun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: UE attach ng(Msg4 error)
parent
6f2314a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+5
-5
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+6
-4
No files found.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
b522db88
...
@@ -997,11 +997,11 @@ generate_Msg4(module_id_t module_idP,
...
@@ -997,11 +997,11 @@ generate_Msg4(module_id_t module_idP,
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
harq_process
,
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
harq_process
,
&
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
resource_block_coding
,
&
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
resource_block_coding
,
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
resource_block_coding
);
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
resource_block_coding
);
AssertFatal
(
dl_config_pdu
->
dci_dl_pdu
.
//
AssertFatal(dl_config_pdu->dci_dl_pdu.
dci_dl_pdu_rel8
.
resource_block_coding
<
8192
,
//
dci_dl_pdu_rel8.resource_block_coding < 8192,
"resource_block_coding %u < 8192
\n
"
,
//
"resource_block_coding %u < 8192\n",
dl_config_pdu
->
dci_dl_pdu
.
//
dl_config_pdu->dci_dl_pdu.
dci_dl_pdu_rel8
.
resource_block_coding
);
//
dci_dl_pdu_rel8.resource_block_coding);
if
(
!
CCE_allocation_infeasible
(
module_idP
,
CC_idP
,
1
,
subframeP
,
if
(
!
CCE_allocation_infeasible
(
module_idP
,
CC_idP
,
1
,
subframeP
,
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
aggregation_level
,
ra
->
rnti
))
{
dl_config_pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel8
.
aggregation_level
,
ra
->
rnti
))
{
...
...
targets/RT/USER/lte-ru.c
View file @
b522db88
...
@@ -2268,8 +2268,10 @@ void init_RU_proc(RU_t *ru) {
...
@@ -2268,8 +2268,10 @@ void init_RU_proc(RU_t *ru) {
}
}
else
if
(
ru
->
function
==
eNodeB_3GPP
&&
ru
->
if_south
==
LOCAL_RF
)
{
// DJP - need something else to distinguish between monolithic and PNF
else
if
(
ru
->
function
==
eNodeB_3GPP
&&
ru
->
if_south
==
LOCAL_RF
)
{
// DJP - need something else to distinguish between monolithic and PNF
LOG_I
(
PHY
,
"%s() DJP - added creation of pthread_prach
\n
"
,
__FUNCTION__
);
if
(
ru
->
do_prach
>
0
)
{
pthread_create
(
&
proc
->
pthread_prach
,
attr_prach
,
ru_thread_prach
,
(
void
*
)
ru
);
LOG_I
(
PHY
,
"%s() DJP - added creation of pthread_prach
\n
"
,
__FUNCTION__
);
pthread_create
(
&
proc
->
pthread_prach
,
attr_prach
,
ru_thread_prach
,
(
void
*
)
ru
);
}
ru
->
state
=
RU_RUN
;
ru
->
state
=
RU_RUN
;
fill_rf_config
(
ru
,
ru
->
rf_config_file
);
fill_rf_config
(
ru
,
ru
->
rf_config_file
);
init_frame_parms
(
&
ru
->
frame_parms
,
1
);
init_frame_parms
(
&
ru
->
frame_parms
,
1
);
...
@@ -2279,10 +2281,10 @@ void init_RU_proc(RU_t *ru) {
...
@@ -2279,10 +2281,10 @@ void init_RU_proc(RU_t *ru) {
openair0_device_load
(
&
ru
->
rfdevice
,
&
ru
->
openair0_cfg
);
openair0_device_load
(
&
ru
->
rfdevice
,
&
ru
->
openair0_cfg
);
if
(
setup_RU_buffers
(
ru
)
!=
0
)
{
if
(
setup_RU_buffers
(
ru
)
!=
0
)
{
printf
(
"Exiting, cannot initialize RU Buffers
\n
"
);
printf
(
"Exiting, cannot initialize RU Buffers
\n
"
);
exit
(
-
1
);
exit
(
-
1
);
}
}
}
}
if
(
get_thread_worker_conf
()
==
WORKER_ENABLE
)
{
if
(
get_thread_worker_conf
()
==
WORKER_ENABLE
)
{
...
...
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