Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
20
Merge Requests
20
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
bfb65b57
Commit
bfb65b57
authored
Nov 16, 2018
by
Louis Adrien Dufrene
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
astyle applied
parent
6a3687fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+1
-1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+0
-2
No files found.
openair2/ENB_APP/enb_config.c
View file @
bfb65b57
...
...
@@ -2308,7 +2308,7 @@ int RCconfig_S1(
default:
{
LOG_E
(
S1AP
,
"Default I-DRX value in conf file is invalid (%i). Should be 32, 64, 128 or 256. \
Default DRX set to 32 in MME configuration
\n
"
,
Default DRX set to 32 in MME configuration
\n
"
,
pcch_defaultPagingCycle
);
S1AP_REGISTER_ENB_REQ
(
msg_p
).
default_drx
=
0
;
}
...
...
targets/RT/USER/lte-enb.c
View file @
bfb65b57
...
...
@@ -684,8 +684,6 @@ void wakeup_prach_eNB_br(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
}
}
<<<<<<<
HEAD
// check if we have to detect PRACH first
if
(
is_prach_subframe
(
fp
,
frame
,
subframe
)
>
0
)
{
LOG_D
(
PHY
,
"Triggering prach br processing, frame %d, subframe %d
\n
"
,
frame
,
subframe
);
...
...
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