Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
b8c0055a
Commit
b8c0055a
authored
Jun 22, 2016
by
Xiwen JIANG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
distinguish beamforming mode in rx_pdsch for SI, RA and data
parent
53682761
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+6
-3
No files found.
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
View file @
b8c0055a
...
@@ -100,7 +100,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
...
@@ -100,7 +100,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
int
avgs
,
rb
;
int
avgs
,
rb
;
LTE_DL_UE_HARQ_t
*
dlsch0_harq
,
*
dlsch1_harq
=
0
;
LTE_DL_UE_HARQ_t
*
dlsch0_harq
,
*
dlsch1_harq
=
0
;
uint8_t
beamforming_mode
=
phy_vars_ue
->
transmission_mode
[
eNB_id
]
<
7
?
0
:
phy_vars_ue
->
transmission_mode
[
eNB_id
]
;
uint8_t
beamforming_mode
;
uint32_t
*
rballoc
;
uint32_t
*
rballoc
;
switch
(
type
)
{
switch
(
type
)
{
...
@@ -108,12 +108,14 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
...
@@ -108,12 +108,14 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
lte_ue_pdsch_vars
=
&
phy_vars_ue
->
lte_ue_pdsch_vars_SI
[
eNB_id
];
lte_ue_pdsch_vars
=
&
phy_vars_ue
->
lte_ue_pdsch_vars_SI
[
eNB_id
];
dlsch_ue
=
&
phy_vars_ue
->
dlsch_ue_SI
[
eNB_id
];
dlsch_ue
=
&
phy_vars_ue
->
dlsch_ue_SI
[
eNB_id
];
dlsch0_harq
=
dlsch_ue
[
0
]
->
harq_processes
[
harq_pid
];
dlsch0_harq
=
dlsch_ue
[
0
]
->
harq_processes
[
harq_pid
];
beamforming_mode
=
0
;
break
;
break
;
case
RA_PDSCH
:
case
RA_PDSCH
:
lte_ue_pdsch_vars
=
&
phy_vars_ue
->
lte_ue_pdsch_vars_ra
[
eNB_id
];
lte_ue_pdsch_vars
=
&
phy_vars_ue
->
lte_ue_pdsch_vars_ra
[
eNB_id
];
dlsch_ue
=
&
phy_vars_ue
->
dlsch_ue_ra
[
eNB_id
];
dlsch_ue
=
&
phy_vars_ue
->
dlsch_ue_ra
[
eNB_id
];
dlsch0_harq
=
dlsch_ue
[
0
]
->
harq_processes
[
harq_pid
];
dlsch0_harq
=
dlsch_ue
[
0
]
->
harq_processes
[
harq_pid
];
beamforming_mode
=
0
;
break
;
break
;
case
PDSCH
:
case
PDSCH
:
...
@@ -121,6 +123,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
...
@@ -121,6 +123,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
dlsch_ue
=
phy_vars_ue
->
dlsch_ue
[
eNB_id
];
dlsch_ue
=
phy_vars_ue
->
dlsch_ue
[
eNB_id
];
dlsch0_harq
=
dlsch_ue
[
0
]
->
harq_processes
[
harq_pid
];
dlsch0_harq
=
dlsch_ue
[
0
]
->
harq_processes
[
harq_pid
];
dlsch1_harq
=
dlsch_ue
[
1
]
->
harq_processes
[
harq_pid
];
dlsch1_harq
=
dlsch_ue
[
1
]
->
harq_processes
[
harq_pid
];
beamforming_mode
=
phy_vars_ue
->
transmission_mode
[
eNB_id
]
<
7
?
0
:
phy_vars_ue
->
transmission_mode
[
eNB_id
];
break
;
break
;
default:
default:
...
@@ -204,7 +207,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
...
@@ -204,7 +207,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
phy_vars_ue
->
high_speed_flag
,
phy_vars_ue
->
high_speed_flag
,
frame_parms
);
frame_parms
);
}
}
}
else
if
(
beamforming_mode
==
0
)
{
// if n_tx>1
}
else
if
(
beamforming_mode
==
0
)
{
//else if nb_antennas_ports_eNB==1 && beamforming_mode == 0
nb_rb
=
dlsch_extract_rbs_single
(
lte_ue_common_vars
->
rxdataF
,
nb_rb
=
dlsch_extract_rbs_single
(
lte_ue_common_vars
->
rxdataF
,
lte_ue_common_vars
->
dl_ch_estimates
[
eNB_id
],
lte_ue_common_vars
->
dl_ch_estimates
[
eNB_id
],
lte_ue_pdsch_vars
[
eNB_id
]
->
rxdataF_ext
,
lte_ue_pdsch_vars
[
eNB_id
]
->
rxdataF_ext
,
...
@@ -243,7 +246,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
...
@@ -243,7 +246,7 @@ int rx_pdsch(PHY_VARS_UE *phy_vars_ue,
phy_vars_ue
->
high_speed_flag
,
phy_vars_ue
->
high_speed_flag
,
frame_parms
);
frame_parms
);
}
}
}
else
if
(
beamforming_mode
==
7
)
{
//else
n_tx>1
}
else
if
(
beamforming_mode
==
7
)
{
//else
if beamforming_mode == 7
nb_rb
=
dlsch_extract_rbs_TM7
(
lte_ue_common_vars
->
rxdataF
,
nb_rb
=
dlsch_extract_rbs_TM7
(
lte_ue_common_vars
->
rxdataF
,
lte_ue_pdsch_vars
[
eNB_id
]
->
dl_bf_ch_estimates
,
lte_ue_pdsch_vars
[
eNB_id
]
->
dl_bf_ch_estimates
,
lte_ue_pdsch_vars
[
eNB_id
]
->
rxdataF_ext
,
lte_ue_pdsch_vars
[
eNB_id
]
->
rxdataF_ext
,
...
...
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