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
ZhouShuya
OpenXG-RAN
Commits
10dd25b2
Commit
10dd25b2
authored
Feb 13, 2020
by
isip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove debug message
parent
187b7b05
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+7
-6
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+7
-7
No files found.
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
View file @
10dd25b2
...
...
@@ -88,15 +88,15 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t *dlsch,
PHY_VARS_gNB
*
gNB
=
RC
.
gNB
[
0
][
0
];
NR_DL_gNB_HARQ_t
*
harq
=
dlsch
->
harq_processes
[
dci_alloc
->
harq_pid
];
nfapi_nr_dl_config_dlsch_pdu_rel15_t
*
rel15
=
&
harq
->
dlsch_pdu
.
dlsch_pdu_rel15
;
nfapi_nr_dl_config_pdcch_parameters_rel15_t
pdcch_params
=
dci_alloc
->
pdcch_params
;
uint32_t
scrambled_output
[
NR_MAX_NB_CODEWORDS
][
NR_MAX_PDSCH_ENCODED_LENGTH
>>
5
];
//
nfapi_nr_dl_config_pdcch_parameters_rel15_t pdcch_params = dci_alloc->pdcch_params;
//
uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>5];
int16_t
**
mod_symbs
=
(
int16_t
**
)
dlsch
->
mod_symbs
;
int16_t
**
tx_layers
=
(
int16_t
**
)
dlsch
->
txdataF
;
int8_t
Wf
[
2
],
Wt
[
2
],
l0
,
l_prime
[
2
],
delta
;
uint16_t
nb_symbols
=
rel15
->
nb_mod_symbols
;
uint8_t
Qm
=
rel15
->
modulation_order
;
uint32_t
encoded_length
=
nb_symbols
*
Qm
;
printf
(
"encoded_length = %d
\n
"
,
encoded_length
);
//
uint8_t Qm = rel15->modulation_order;
//
uint32_t encoded_length = nb_symbols*Qm;
//
printf("encoded_length = %d\n",encoded_length);
gNB
->
complete_scrambling
=
0
;
gNB
->
complete_modulation
=
0
;
for
(
int
q
=
0
;
q
<
13
;
q
++
){
...
...
@@ -109,6 +109,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t *dlsch,
stop_meas
(
dlsch_encoding_stats
);
#ifdef DEBUG_DLSCH
printf
(
"PDSCH encoding:
\n
Payload:
\n
"
);
uint32_t
encoded_length
=
nb_symbols
*
Qm
;
for
(
int
i
=
0
;
i
<
harq
->
B
>>
7
;
i
++
)
{
for
(
int
j
=
0
;
j
<
16
;
j
++
)
printf
(
"0x%02x
\t
"
,
harq
->
pdu
[(
i
<<
4
)
+
j
]);
...
...
@@ -225,7 +226,7 @@ for (int i=0; i<n_dmrs>>4; i++) {
printf
(
"PDSCH resource mapping started (start SC %d
\t
start symbol %d
\t
N_PRB %d
\t
nb_symbols %d)
\n
"
,
start_sc
,
rel15
->
start_symbol
,
rel15
->
n_prb
,
rel15
->
nb_symbols
);
#endif
printf
(
"nb_layers = %d
\n
"
,
rel15
->
nb_layers
);
//
printf("nb_layers = %d\n",rel15->nb_layers);
for
(
int
ap
=
0
;
ap
<
rel15
->
nb_layers
;
ap
++
)
{
// DMRS params for this ap
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
10dd25b2
...
...
@@ -102,7 +102,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
//printf("slots_per_hf = %d\n",slots_per_hf);
n_hf
=
cfg
->
sch_config
.
half_frame_index
.
value
;
struct
timespec
tt1
,
tt2
;
int
result
;
//
int result;
//printf("n_hf = %d\n",n_hf);
// if SSB periodicity is 5ms, they are transmitted in both half frames
if
(
cfg
->
sch_config
.
ssb_periodicity
.
value
==
5
)
{
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
10dd25b2
...
...
@@ -133,7 +133,7 @@ static void *scrambling_proc(void *ptr){
//printf("cch_proc consumes %ld nanoseconds!\n",eNB->tt17.tv_nsec-eNB->tt13.tv_nsec);
static
int
scrambling_channel_status
;
scrambling_channel_status
=
0
;
scrambling_channel
*
cch
=
(
scrambling_channel
*
)
ptr
;
//scrambling_channel *scrambling_proc
=(scrambling_channel*)ptr;
//PHY_VARS_eNB *eNB = PHY_vars_eNB_g[0][0];
/**********************************************************************/
...
...
@@ -147,7 +147,7 @@ static void *scrambling_proc(void *ptr){
nfapi_nr_config_request_t
*
config
=
&
gNB
->
gNB_config
;
nfapi_nr_dl_config_pdcch_parameters_rel15_t
pdcch_params
=
dci_alloc
->
pdcch_params
;
//uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>5];
int16_t
**
mod_symbs
=
(
int16_t
**
)
dlsch
->
mod_symbs
;
//
int16_t **mod_symbs = (int16_t**)dlsch->mod_symbs;
//int16_t **tx_layers = (int16_t**)dlsch->txdataF;
//int8_t Wf[2], Wt[2], l0, l_prime[2], delta;
uint16_t
nb_symbols
=
rel15
->
nb_mod_symbols
;
...
...
@@ -183,7 +183,7 @@ static void *scrambling_proc(void *ptr){
printf
(
"complete_scrambling
\n
"
);
//
printf("complete_scrambling\n");
gNB
->
complete_scrambling
=
1
;
}
printf
(
"Exiting gNB thread scrambling_channel
\n
"
);
...
...
@@ -198,7 +198,7 @@ static void *modulation_proc(void *ptr){
//printf("cch_proc consumes %ld nanoseconds!\n",eNB->tt17.tv_nsec-eNB->tt13.tv_nsec);
static
int
modulation_channel_status
;
modulation_channel_status
=
0
;
modulation_channel
*
modulation_proc
=
(
modulation_channel
*
)
ptr
;
//
modulation_channel *modulation_proc=(modulation_channel*)ptr;
//PHY_VARS_eNB *eNB = PHY_vars_eNB_g[0][0];
/**********************************************************************/
...
...
@@ -212,7 +212,7 @@ static void *modulation_proc(void *ptr){
NR_DL_gNB_HARQ_t
*
harq
=
dlsch
->
harq_processes
[
dci_alloc
->
harq_pid
];
nfapi_nr_dl_config_dlsch_pdu_rel15_t
*
rel15
=
&
harq
->
dlsch_pdu
.
dlsch_pdu_rel15
;
//nfapi_nr_config_request_t *config = &gNB->gNB_config;
nfapi_nr_dl_config_pdcch_parameters_rel15_t
pdcch_params
=
dci_alloc
->
pdcch_params
;
//
nfapi_nr_dl_config_pdcch_parameters_rel15_t pdcch_params = dci_alloc->pdcch_params;
//uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>5];
int16_t
**
mod_symbs
=
(
int16_t
**
)
dlsch
->
mod_symbs
;
//int16_t **tx_layers = (int16_t**)dlsch->txdataF;
...
...
@@ -243,7 +243,7 @@ static void *modulation_proc(void *ptr){
printf
(
"
\n
"
);
}
#endif
printf
(
"complete_modulation
\n
"
);
//
printf("complete_modulation\n");
gNB
->
complete_modulation
=
1
;
}
printf
(
"Exiting gNB thread modulation_channel
\n
"
);
...
...
@@ -740,7 +740,7 @@ int main(int argc, char **argv)
LOG_M
(
"txsigF1.m"
,
"txsF1"
,
gNB
->
common_vars
.
txdataF
[
1
],
frame_length_complex_samples_no_prefix
,
1
,
1
);
int
tx_offset
=
slot
*
frame_parms
->
samples_per_slot
;
printf
(
"samples_per_slot_wCP = %d
\n
"
,
frame_parms
->
samples_per_slot_wCP
);
//
printf("samples_per_slot_wCP = %d\n", frame_parms->samples_per_slot_wCP);
//TODO: loop over slots
for
(
aa
=
0
;
aa
<
gNB
->
frame_parms
.
nb_antennas_tx
;
aa
++
)
{
...
...
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