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
40cc7245
Commit
40cc7245
authored
Oct 02, 2018
by
Hongzhi Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add dlsch llr computation
parent
442d5b40
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8693 additions
and
62 deletions
+8693
-62
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-0
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+31
-37
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
+8641
-0
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+20
-25
No files found.
cmake_targets/CMakeLists.txt
View file @
40cc7245
...
@@ -1326,6 +1326,7 @@ set(PHY_SRC_UE
...
@@ -1326,6 +1326,7 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_pbch.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_pbch.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/dci_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/dci_nr.c
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
40cc7245
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
0 → 100644
View file @
40cc7245
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
View file @
40cc7245
...
@@ -106,7 +106,7 @@ void qpsk_qpsk(int16_t *stream0_in,
...
@@ -106,7 +106,7 @@ void qpsk_qpsk(int16_t *stream0_in,
@param nb_rb number of RBs for this allocation
@param nb_rb number of RBs for this allocation
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param llr128p pointer to pointer to symbol in dlsch_llr*/
@param llr128p pointer to pointer to symbol in dlsch_llr*/
int32_t
dlsch_qpsk_qpsk_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
nr_
dlsch_qpsk_qpsk_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp_i
,
int32_t
**
rxdataF_comp_i
,
int32_t
**
rho_i
,
int32_t
**
rho_i
,
...
@@ -142,7 +142,7 @@ void qpsk_qam16(int16_t *stream0_in,
...
@@ -142,7 +142,7 @@ void qpsk_qam16(int16_t *stream0_in,
@param nb_rb number of RBs for this allocation
@param nb_rb number of RBs for this allocation
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param llr128p pointer to pointer to symbol in dlsch_llr*/
@param llr128p pointer to pointer to symbol in dlsch_llr*/
int32_t
dlsch_qpsk_16qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
nr_
dlsch_qpsk_16qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp_i
,
int32_t
**
rxdataF_comp_i
,
int
**
dl_ch_mag_i
,
//|h_1|^2*(2/sqrt{10})
int
**
dl_ch_mag_i
,
//|h_1|^2*(2/sqrt{10})
...
@@ -154,6 +154,7 @@ int32_t dlsch_qpsk_16qam_llr(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -154,6 +154,7 @@ int32_t dlsch_qpsk_16qam_llr(NR_DL_FRAME_PARMS *frame_parms,
uint16_t
pbch_pss_sss_adj
,
uint16_t
pbch_pss_sss_adj
,
int16_t
**
llr128p
);
int16_t
**
llr128p
);
/** \brief This function computes the LLRs for ML (max-logsum approximation) dual-stream QPSK/64QAM reception.
/** \brief This function computes the LLRs for ML (max-logsum approximation) dual-stream QPSK/64QAM reception.
@param stream0_in Input from channel compensated (MR combined) stream 0
@param stream0_in Input from channel compensated (MR combined) stream 0
@param stream1_in Input from channel compensated (MR combined) stream 1
@param stream1_in Input from channel compensated (MR combined) stream 1
...
@@ -179,7 +180,7 @@ void qpsk_qam64(int16_t *stream0_in,
...
@@ -179,7 +180,7 @@ void qpsk_qam64(int16_t *stream0_in,
@param nb_rb number of RBs for this allocation
@param nb_rb number of RBs for this allocation
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param llr128p pointer to pointer to symbol in dlsch_llr*/
@param llr128p pointer to pointer to symbol in dlsch_llr*/
int32_t
dlsch_qpsk_64qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
nr_
dlsch_qpsk_64qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp_i
,
int32_t
**
rxdataF_comp_i
,
int
**
dl_ch_mag_i
,
//|h_1|^2*(2/sqrt{10})
int
**
dl_ch_mag_i
,
//|h_1|^2*(2/sqrt{10})
...
@@ -217,7 +218,7 @@ void qam16_qpsk(short *stream0_in,
...
@@ -217,7 +218,7 @@ void qam16_qpsk(short *stream0_in,
@param nb_rb number of RBs for this allocation
@param nb_rb number of RBs for this allocation
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param llr16p pointer to pointer to symbol in dlsch_llr*/
@param llr16p pointer to pointer to symbol in dlsch_llr*/
int
dlsch_16qam_qpsk_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
nr_
dlsch_16qam_qpsk_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp_i
,
int
**
rxdataF_comp_i
,
int
**
dl_ch_mag
,
//|h_0|^2*(2/sqrt{10})
int
**
dl_ch_mag
,
//|h_0|^2*(2/sqrt{10})
...
@@ -258,7 +259,7 @@ void qam16_qam16(short *stream0_in,
...
@@ -258,7 +259,7 @@ void qam16_qam16(short *stream0_in,
@param nb_rb number of RBs for this allocation
@param nb_rb number of RBs for this allocation
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param llr16p pointer to pointer to symbol in dlsch_llr*/
@param llr16p pointer to pointer to symbol in dlsch_llr*/
int
dlsch_16qam_16qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
nr_
dlsch_16qam_16qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp_i
,
int
**
rxdataF_comp_i
,
int
**
dl_ch_mag
,
//|h_0|^2*(2/sqrt{10})
int
**
dl_ch_mag
,
//|h_0|^2*(2/sqrt{10})
...
@@ -300,7 +301,7 @@ void qam16_qam64(short *stream0_in,
...
@@ -300,7 +301,7 @@ void qam16_qam64(short *stream0_in,
@param nb_rb number of RBs for this allocation
@param nb_rb number of RBs for this allocation
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param pbch_pss_sss_adj Number of channel bits taken by PBCH/PSS/SSS
@param llr16p pointer to pointer to symbol in dlsch_llr*/
@param llr16p pointer to pointer to symbol in dlsch_llr*/
int
dlsch_16qam_64qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
nr_
dlsch_16qam_64qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp_i
,
int
**
rxdataF_comp_i
,
int
**
dl_ch_mag
,
//|h_0|^2*(2/sqrt{10})
int
**
dl_ch_mag
,
//|h_0|^2*(2/sqrt{10})
...
@@ -480,14 +481,12 @@ int dlsch_64qam_64qam_llr(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -480,14 +481,12 @@ int dlsch_64qam_64qam_llr(NR_DL_FRAME_PARMS *frame_parms,
@param llr128p pointer to pointer to symbol in dlsch_llr
@param llr128p pointer to pointer to symbol in dlsch_llr
@param beamforming_mode beamforming mode
@param beamforming_mode beamforming mode
*/
*/
int32_t
dlsch_qpsk_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
nr_
dlsch_qpsk_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int16_t
*
dlsch_llr
,
int16_t
*
dlsch_llr
,
uint8_t
symbol
,
uint8_t
symbol
,
uint8_t
first_symbol_flag
,
uint8_t
first_symbol_flag
,
uint16_t
nb_rb
,
uint16_t
nb_rb
,
uint16_t
pbch_pss_sss_adj
,
//int16_t **llr128p,
uint8_t
beamforming_mode
);
uint8_t
beamforming_mode
);
/**
/**
...
@@ -504,7 +503,7 @@ int32_t dlsch_qpsk_llr(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -504,7 +503,7 @@ int32_t dlsch_qpsk_llr(NR_DL_FRAME_PARMS *frame_parms,
@param beamforming_mode beamforming mode
@param beamforming_mode beamforming mode
*/
*/
int32_t
dlsch_qpsk_llr_SIC
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
nr_
dlsch_qpsk_llr_SIC
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
**
rxdataF_comp
,
int
**
rxdataF_comp
,
int32_t
**
sic_buffer
,
int32_t
**
sic_buffer
,
int
**
rho_i
,
int
**
rho_i
,
...
@@ -515,15 +514,14 @@ int32_t dlsch_qpsk_llr_SIC(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -515,15 +514,14 @@ int32_t dlsch_qpsk_llr_SIC(NR_DL_FRAME_PARMS *frame_parms,
uint16_t
mod_order_0
,
uint16_t
mod_order_0
,
uint32_t
rb_alloc
);
uint32_t
rb_alloc
);
void
dlsch_16qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
void
nr_
dlsch_16qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int16_t
*
dlsch_llr
,
int16_t
*
dlsch_llr
,
int32_t
**
dl_ch_mag
,
int32_t
**
dl_ch_mag
,
uint8_t
symbol
,
uint8_t
symbol
,
uint8_t
first_symbol_flag
,
uint8_t
first_symbol_flag
,
uint16_t
nb_rb
,
uint16_t
nb_rb
,
uint16_t
pbch_pss_sss_adjust
,
int16_t
**
llr32p
,
int16_t
**
llr128p
,
uint8_t
beamforming_mode
);
uint8_t
beamforming_mode
);
/**
/**
\brief This function generates log-likelihood ratios (decoder input) for single-stream 16QAM received waveforms
\brief This function generates log-likelihood ratios (decoder input) for single-stream 16QAM received waveforms
...
@@ -538,7 +536,7 @@ void dlsch_16qam_llr(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -538,7 +536,7 @@ void dlsch_16qam_llr(NR_DL_FRAME_PARMS *frame_parms,
@param pbch_pss_sss_adjust PBCH/PSS/SSS RE adjustment (in REs)
@param pbch_pss_sss_adjust PBCH/PSS/SSS RE adjustment (in REs)
@param beamforming_mode beamforming mode
@param beamforming_mode beamforming mode
*/
*/
void
dlsch_16qam_llr_SIC
(
NR_DL_FRAME_PARMS
*
frame_parms
,
void
nr_
dlsch_16qam_llr_SIC
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int32_t
**
sic_buffer
,
//Q15
int32_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int32_t
**
rho_i
,
...
@@ -563,8 +561,7 @@ void dlsch_64qam_llr_SIC(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -563,8 +561,7 @@ void dlsch_64qam_llr_SIC(NR_DL_FRAME_PARMS *frame_parms,
uint16_t
mod_order_0
,
uint16_t
mod_order_0
,
uint32_t
rb_alloc
);
uint32_t
rb_alloc
);
void
nr_dlsch_64qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
void
dlsch_64qam_llr
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
int32_t
**
rxdataF_comp
,
int16_t
*
dlsch_llr
,
int16_t
*
dlsch_llr
,
int32_t
**
dl_ch_mag
,
int32_t
**
dl_ch_mag
,
...
@@ -572,8 +569,6 @@ void dlsch_64qam_llr(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -572,8 +569,6 @@ void dlsch_64qam_llr(NR_DL_FRAME_PARMS *frame_parms,
uint8_t
symbol
,
uint8_t
symbol
,
uint8_t
first_symbol_flag
,
uint8_t
first_symbol_flag
,
uint16_t
nb_rb
,
uint16_t
nb_rb
,
uint16_t
pbch_pss_sss_adjust
,
//int16_t **llr_save,
uint32_t
llr_offset
,
uint32_t
llr_offset
,
uint8_t
beamforming_mode
);
uint8_t
beamforming_mode
);
...
@@ -1044,7 +1039,7 @@ int32_t nr_rx_pdsch(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -1044,7 +1039,7 @@ int32_t nr_rx_pdsch(PHY_VARS_NR_UE *phy_vars_ue,
uint8_t
i_mod
,
uint8_t
i_mod
,
uint8_t
harq_pid
);
uint8_t
harq_pid
);
int32_t
rx_pdcch
(
PHY_VARS_NR_UE
*
ue
,
int32_t
nr_
rx_pdcch
(
PHY_VARS_NR_UE
*
ue
,
uint32_t
frame
,
uint32_t
frame
,
uint8_t
subframe
,
uint8_t
subframe
,
uint8_t
eNB_id
,
uint8_t
eNB_id
,
...
...
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