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
lizhongxiao
OpenXG-RAN
Commits
95762833
Commit
95762833
authored
Nov 25, 2015
by
lukashov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-59-tm4: fixing merge bugs in lte_phy_scope
parent
c26f9fea
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
119 additions
and
111 deletions
+119
-111
openair1/PHY/TOOLS/lte_phy_scope.c
openair1/PHY/TOOLS/lte_phy_scope.c
+118
-107
openair1/PHY/TOOLS/lte_phy_scope.h
openair1/PHY/TOOLS/lte_phy_scope.h
+0
-3
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+1
-1
No files found.
openair1/PHY/TOOLS/lte_phy_scope.c
View file @
95762833
This diff is collapsed.
Click to expand it.
openair1/PHY/TOOLS/lte_phy_scope.h
View file @
95762833
...
@@ -87,7 +87,4 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
...
@@ -87,7 +87,4 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
#endif
/* FD_lte_scope_h_ */
#endif
/* FD_lte_scope_h_ */
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
95762833
...
@@ -385,7 +385,7 @@ int main(int argc, char **argv)
...
@@ -385,7 +385,7 @@ int main(int argc, char **argv)
num_layers
=
1
;
num_layers
=
1
;
perfect_ce
=
0
;
perfect_ce
=
0
;
while
((
c
=
getopt
(
argc
,
argv
,
"ahdpZDe:m:n:o:s:f:t:c:g:r:F:x:y:z:AM:N:I:i:O:R:S:C:T:b:u:v:w:B:PLl:Y"
))
!=
-
1
)
{
while
((
c
=
getopt
(
argc
,
argv
,
"ahdpZDe:m:n:o:s:f:t:c:g:r:F:x:y:z:AM:N:I:i:O:R:S:C:T:b:u:v:w:B:PLl:Y
:X
"
))
!=
-
1
)
{
switch
(
c
)
{
switch
(
c
)
{
case
'a'
:
case
'a'
:
awgn_flag
=
1
;
awgn_flag
=
1
;
...
...
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