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
zzha zzha
OpenXG-RAN
Commits
6fc604d1
Commit
6fc604d1
authored
Feb 19, 2016
by
Xiwen JIANG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conflict resolve for pdcchsim.c
parent
3d2a1abb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
19 deletions
+0
-19
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
+0
-19
No files found.
openair1/SIMULATION/LTE_PHY/pdcchsim.c
View file @
6fc604d1
...
...
@@ -750,25 +750,6 @@ int main(int argc, char **argv)
subframe
,
NUMBER_OF_OFDM_CARRIERS
,
PHY_vars_eNB
->
lte_frame_parms
.
Ncp
,
PHY_vars_eNB
->
lte_frame_parms
.
samples_per_tti
,
nsymb
);
<<<<<<<
HEAD
switch
(
N_RB_DL
)
{
case
6
:
BW
=
1
.
25
;
break
;
case
25
:
BW
=
5
.
00
;
break
;
case
50
:
BW
=
10
.
00
;
break
;
case
100
:
BW
=
20
.
00
;
break
;
}
eNB2UE
=
new_channel_desc_scm
(
PHY_vars_eNB
->
lte_frame_parms
.
nb_antenna_ports_eNB
,
PHY_vars_UE
->
lte_frame_parms
.
nb_antennas_rx
,
channel_model
,
...
...
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