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
canghaiwuhen
OpenXG-RAN
Commits
da54778c
Commit
da54778c
authored
4 years ago
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warnings
parent
cd82d94c
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
31 additions
and
96 deletions
+31
-96
executables/nr-ru.c
executables/nr-ru.c
+0
-1
executables/nr-softmodem.c
executables/nr-softmodem.c
+0
-1
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+1
-2
openair1/PHY/NR_TRANSPORT/nr_transport.h
openair1/PHY/NR_TRANSPORT/nr_transport.h
+7
-0
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
+2
-67
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+1
-2
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+1
-2
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+1
-0
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+2
-3
openair1/PHY/TOOLS/nr_phy_scope.c
openair1/PHY/TOOLS/nr_phy_scope.c
+3
-3
openair1/SCHED_NR/nr_prach_procedures.c
openair1/SCHED_NR/nr_prach_procedures.c
+1
-1
openair1/SCHED_NR_UE/phy_frame_config_nr.h
openair1/SCHED_NR_UE/phy_frame_config_nr.h
+3
-2
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
+1
-1
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+3
-4
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+3
-3
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+0
-2
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-2
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-0
No files found.
executables/nr-ru.c
View file @
da54778c
...
...
@@ -2147,7 +2147,6 @@ void init_NR_RU(char *rf_config_file)
PHY_VARS_gNB
*
gNB0
=
(
PHY_VARS_gNB
*
)
NULL
;
NR_DL_FRAME_PARMS
*
fp
=
(
NR_DL_FRAME_PARMS
*
)
NULL
;
int
i
;
int
CC_id
;
// create status mask
RC
.
ru_mask
=
0
;
pthread_mutex_init
(
&
RC
.
ru_mutex
,
NULL
);
...
...
This diff is collapsed.
Click to expand it.
executables/nr-softmodem.c
View file @
da54778c
...
...
@@ -708,7 +708,6 @@ int stop_L1L2(module_id_t gnb_id) {
*/
int
restart_L1L2
(
module_id_t
gnb_id
)
{
RU_t
*
ru
=
RC
.
ru
[
gnb_id
];
int
cc_id
;
MessageDef
*
msg_p
=
NULL
;
LOG_W
(
GNB_APP
,
"restarting nr-softmodem
\n
"
);
/* block threads */
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
View file @
da54778c
...
...
@@ -64,7 +64,6 @@ void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr,uint16_t N_RB)
a_segments
=
a_segments
/
273
;
}
uint16_t
dlsch_bytes
=
a_segments
*
1056
;
// allocated bytes per segment
#ifdef DEBUG_DLSCH_FREE
...
...
@@ -82,7 +81,7 @@ void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr,uint16_t N_RB)
#endif
if
(
dlsch
->
harq_processes
[
i
]
->
b
)
{
free16
(
dlsch
->
harq_processes
[
i
]
->
b
,
dlsch_bytes
);
free16
(
dlsch
->
harq_processes
[
i
]
->
b
,
a_segments
*
1056
);
dlsch
->
harq_processes
[
i
]
->
b
=
NULL
;
#ifdef DEBUG_DLSCH_FREE
LOG_D
(
PHY
,
"Freeing dlsch process %d b (%p)
\n
"
,
i
,
dlsch
->
harq_processes
[
i
]
->
b
);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_transport.h
View file @
da54778c
...
...
@@ -123,4 +123,11 @@ void rx_nr_prach_ru(RU_t *ru,
int
frame
,
int
subframe
);
void
compute_nr_prach_seq
(
uint16_t
rootSequenceIndex
,
uint8_t
prach_ConfigIndex
,
uint8_t
zeroCorrelationZoneConfig
,
uint8_t
highSpeedFlag
,
lte_frame_type_t
frame_type
,
nr_frequency_range_e
fr
,
uint32_t
X_u
[
64
][
839
]);
#endif
/*__NR_TRANSPORT__H__*/
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
View file @
da54778c
...
...
@@ -29,8 +29,8 @@
* \note
* \warning
*/
#ifndef __NR_TRANSPORT_PROTO_
UE_
_H__
#define __NR_TRANSPORT_PROTO_
UE_
_H__
#ifndef __NR_TRANSPORT_PROTO_
COMMON
_H__
#define __NR_TRANSPORT_PROTO_
COMMON
_H__
#include "PHY/defs_nr_UE.h"
#include "SCHED_NR_UE/defs.h"
//#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
...
...
@@ -43,29 +43,6 @@
* @{
*/
/** \fn free_ue_dlsch(NR_UE_DLSCH_t *dlsch)
\brief This function frees memory allocated for a particular DLSCH at UE
@param dlsch Pointer to DLSCH to be removed
*/
void
free_nr_ue_dlsch
(
NR_UE_DLSCH_t
*
dlsch
);
/** \fn new_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t abstraction_flag)
\brief This function allocates structures for a particular DLSCH at UE
@returns Pointer to DLSCH to be removed
@param Kmimo Kmimo factor from 36-212/36-213
@param Mdlharq Maximum number of HARQ rounds (36-212/36-213)
@param Nsoft Soft-LLR buffer size from UE-Category
@params N_RB_DL total number of resource blocks (determine the operating BW)
@param abstraction_flag Flag to indicate abstracted interface
*/
NR_UE_DLSCH_t
*
new_nr_ue_dlsch
(
uint8_t
Kmimo
,
uint8_t
Mdlharq
,
uint32_t
Nsoft
,
uint8_t
max_turbo_iterations
,
uint8_t
N_RB_DL
,
uint8_t
abstraction_flag
);
void
free_nr_ue_ulsch
(
NR_UE_ULSCH_t
*
ulsch
);
NR_UE_ULSCH_t
*
new_nr_ue_ulsch
(
unsigned
char
N_RB_UL
,
int
number_of_harq_pids
,
uint8_t
abstraction_flag
);
void
fill_UE_dlsch_MCH
(
PHY_VARS_NR_UE
*
ue
,
int
mcs
,
int
ndi
,
int
rvidx
,
int
eNB_id
);
int
rx_pmch
(
PHY_VARS_NR_UE
*
phy_vars_ue
,
...
...
@@ -1055,21 +1032,6 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
NR_DL_FRAME_PARMS
*
frame_parms
,
uint8_t
harq_pid
);
/*! \brief Perform PUSCH scrambling. TS 38.211 V15.4.0 subclause 6.3.1.1
@param[in] in Pointer to input bits
@param[in] size of input bits
@param[in] Nid cell id
@param[in] n_RNTI CRNTI
@param[out] out the scrambled bits
*/
void
nr_pusch_codeword_scrambling
(
uint8_t
*
in
,
uint16_t
size
,
uint32_t
Nid
,
uint32_t
n_RNTI
,
uint32_t
*
out
);
uint32_t
nr_dlsch_decoding_mthread
(
PHY_VARS_NR_UE
*
phy_vars_ue
,
UE_nr_rxtx_proc_t
*
proc
,
int
eNB_id
,
...
...
@@ -1128,17 +1090,6 @@ int32_t nr_rx_pdsch(PHY_VARS_NR_UE *phy_vars_ue,
uint8_t
i_mod
,
uint8_t
harq_pid
);
int32_t
nr_rx_pdcch
(
PHY_VARS_NR_UE
*
ue
,
uint32_t
frame
,
uint8_t
nr_tti_rx
,
uint8_t
eNB_id
,
MIMO_mode_t
mimo_mode
,
uint32_t
high_speed_flag
,
uint8_t
is_secondary_ue
,
int
nb_coreset_active
,
uint16_t
symbol_mon
,
NR_SEARCHSPACE_TYPE_t
searchSpaceType
);
/*! \brief Extract PSS and SSS resource elements
@param phy_vars_ue Pointer to UE variables
@param[out] pss_ext contain the PSS signals after the extraction
...
...
@@ -1471,18 +1422,6 @@ void init_transport_channels(uint8_t);
void
generate_RIV_tables
(
void
);
/*!
\brief This function performs the initial cell search procedure - PSS detection, SSS detection and PBCH detection. At the
end, the basic frame parameters are known (Frame configuration - TDD/FDD and cyclic prefix length,
N_RB_DL, PHICH_CONFIG and Nid_cell) and the UE can begin decoding PDCCH and DLSCH SI to retrieve the rest. Once these
parameters are know, the routine calls some basic initialization routines (cell-specific reference signals, etc.)
@param phy_vars_ue Pointer to UE variables
@param mode current running mode
*/
int
nr_initial_sync
(
UE_nr_rxtx_proc_t
*
proc
,
PHY_VARS_NR_UE
*
phy_vars_ue
,
runmode_t
mode
);
/*!
\brief Encoding of PUSCH/ACK/RI/ACK from 36-212.
@param a Pointer to ulsch SDU
...
...
@@ -1724,10 +1663,6 @@ uint8_t get_prach_prb_offset(NR_DL_FRAME_PARMS *frame_parms,
uint8_t
n_ra_prboffset
,
uint8_t
tdd_mapindex
,
uint16_t
Nf
);
void
nr_pdcch_unscrambling
(
uint16_t
crnti
,
NR_DL_FRAME_PARMS
*
frame_parms
,
uint8_t
nr_tti_rx
,
int16_t
*
z
,
uint32_t
length
,
uint16_t
pdcch_DMRS_scrambling_id
,
int
do_common
);
uint32_t
lte_gold_generic
(
uint32_t
*
x1
,
uint32_t
*
x2
,
uint8_t
reset
);
int
nr_rx_pdsch
(
PHY_VARS_NR_UE
*
ue
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @
da54778c
...
...
@@ -70,13 +70,12 @@ void free_gNB_ulsch(NR_gNB_ULSCH_t **ulschptr,uint8_t N_RB_UL)
a_segments
=
a_segments
/
273
;
}
uint16_t
ulsch_bytes
=
a_segments
*
1056
;
// allocated bytes per segment
for
(
i
=
0
;
i
<
NR_MAX_ULSCH_HARQ_PROCESSES
;
i
++
)
{
if
(
ulsch
->
harq_processes
[
i
])
{
if
(
ulsch
->
harq_processes
[
i
]
->
b
)
{
free16
(
ulsch
->
harq_processes
[
i
]
->
b
,
ulsch_bytes
);
free16
(
ulsch
->
harq_processes
[
i
]
->
b
,
a_segments
*
1056
);
ulsch
->
harq_processes
[
i
]
->
b
=
NULL
;
}
for
(
r
=
0
;
r
<
a_segments
;
r
++
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
View file @
da54778c
...
...
@@ -69,12 +69,11 @@ void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlschptr,uint8_t N_RB_DL)
a_segments
=
a_segments
/
273
;
}
uint16_t
dlsch_bytes
=
a_segments
*
1056
;
// allocated bytes per segment
for
(
i
=
0
;
i
<
dlsch
->
Mdlharq
;
i
++
)
{
if
(
dlsch
->
harq_processes
[
i
])
{
if
(
dlsch
->
harq_processes
[
i
]
->
b
)
{
free16
(
dlsch
->
harq_processes
[
i
]
->
b
,
dlsch_bytes
);
free16
(
dlsch
->
harq_processes
[
i
]
->
b
,
a_segments
*
1056
);
dlsch
->
harq_processes
[
i
]
->
b
=
NULL
;
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
View file @
da54778c
...
...
@@ -40,6 +40,7 @@
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "T.h"
#include <openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h>
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
View file @
da54778c
...
...
@@ -60,17 +60,16 @@ void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr,unsigned char N_RB_UL)
a_segments
=
a_segments
/
273
;
}
uint16_t
ulsch_bytes
=
a_segments
*
1056
;
// allocated bytes per segment
for
(
i
=
0
;
i
<
NR_MAX_ULSCH_HARQ_PROCESSES
;
i
++
)
{
if
(
ulsch
->
harq_processes
[
i
])
{
if
(
ulsch
->
harq_processes
[
i
]
->
a
)
{
free16
(
ulsch
->
harq_processes
[
i
]
->
a
,
ulsch_bytes
);
free16
(
ulsch
->
harq_processes
[
i
]
->
a
,
a_segments
*
1056
);
ulsch
->
harq_processes
[
i
]
->
a
=
NULL
;
}
if
(
ulsch
->
harq_processes
[
i
]
->
b
)
{
free16
(
ulsch
->
harq_processes
[
i
]
->
b
,
ulsch_bytes
);
free16
(
ulsch
->
harq_processes
[
i
]
->
b
,
a_segments
*
1056
);
ulsch
->
harq_processes
[
i
]
->
b
=
NULL
;
}
if
(
ulsch
->
harq_processes
[
i
]
->
e
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/TOOLS/nr_phy_scope.c
View file @
da54778c
...
...
@@ -157,9 +157,9 @@ void phy_scope_gNB(FD_phy_scope_gnb *form,
{
int
i
,
arx
;
//int i,i2,arx,atx,ind,k;
NR_DL_FRAME_PARMS
*
frame_parms
=
&
phy_vars_gnb
->
frame_parms
;
int
nsymb_ce
=
12
*
frame_parms
->
N_RB_UL
*
frame_parms
->
symbols_per_tti
;
//
int nsymb_ce = 12*frame_parms->N_RB_UL*frame_parms->symbols_per_tti;
uint8_t
nb_antennas_rx
=
frame_parms
->
nb_antennas_rx
;
uint8_t
nb_antennas_tx
=
1
;
// frame_parms->nb_antennas_tx; // in LTE Rel. 8 and 9 only a single transmit antenna is assumed at the UE
//
uint8_t nb_antennas_tx = 1; // frame_parms->nb_antennas_tx; // in LTE Rel. 8 and 9 only a single transmit antenna is assumed at the UE
int16_t
**
rxsig_t
,
**
rxsig_f
;
// int16_t **chest_t=NULL;
// int16_t **chest_f=NULL;
...
...
@@ -966,7 +966,7 @@ FD_stats_form * create_form_stats_form( void ) {
}
void
startScope
(
scopeParms_t
*
p
)
{
FD_stats_form
*
form_stats
=
NULL
,
*
form_stats_l2
=
NULL
;
//
FD_stats_form *form_stats=NULL,*form_stats_l2=NULL;
char
title
[
255
];
fl_initialize
(
p
->
argc
,
p
->
argv
,
NULL
,
0
,
0
);
/*
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR/nr_prach_procedures.c
View file @
da54778c
...
...
@@ -55,7 +55,7 @@ extern int oai_nfapi_nr_rach_ind(nfapi_rach_indication_t *rach_ind);
void
L1_nr_prach_procedures
(
PHY_VARS_gNB
*
gNB
,
int
frame
,
int
slot
,
nfapi_nr_prach_pdu_t
*
prach_pdu
)
{
uint16_t
max_preamble
[
4
]
,
max_preamble_energy
[
4
],
max_preamble_delay
[
4
]
;
uint16_t
max_preamble
[
4
]
=
{
0
},
max_preamble_energy
[
4
]
=
{
0
},
max_preamble_delay
[
4
]
=
{
0
}
;
uint16_t
i
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR_UE/phy_frame_config_nr.h
View file @
da54778c
...
...
@@ -29,8 +29,8 @@
*
************************************************************************/
#ifndef PHY_FRAME_CONFIG_NR_H
#define PHY_FRAME_CONFIG_NR_H
#ifndef PHY_FRAME_CONFIG_NR_
UE_
H
#define PHY_FRAME_CONFIG_NR_
UE_
H
/************** DEFINE ********************************************/
...
...
@@ -78,5 +78,6 @@ void free_tdd_configuration_nr(NR_DL_FRAME_PARMS *frame_parms);
void
free_tdd_configuration_dedicated_nr
(
NR_DL_FRAME_PARMS
*
frame_parms
);
void
nr_ue_prach_procedures
(
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
abstraction_flag
,
runmode_t
mod
);
#endif
/* PHY_FRAME_CONFIG_NR_H */
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @
da54778c
...
...
@@ -410,7 +410,7 @@ int main(int argc, char **argv)
uint8_t
n_hf
=
0
;
int
cyclic_prefix_type
=
NFAPI_CP_NORMAL
;
double
fs
,
eps
;
double
fs
=
0
,
eps
;
double
scs
=
30000
;
double
bw
=
100e6
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
da54778c
...
...
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
uint8_t
hs_flag
=
0
;
int
n_frames
=
1
;
channel_desc_t
*
UE2gNB
;
uint32_t
nsymb
,
tx_lev
;
//,tx_lev_dB;
uint32_t
tx_lev
=
0
;
//,tx_lev_dB;
// int8_t interf1=-19,interf2=-19;
NR_DL_FRAME_PARMS
*
frame_parms
;
...
...
@@ -120,7 +120,6 @@ int main(int argc, char **argv)
uint32_t
prach_errors
=
0
;
uint8_t
subframe
=
9
;
uint16_t
preamble_energy_list
[
64
],
preamble_tx
=
50
,
preamble_delay_list
[
64
];
uint16_t
preamble_max
,
preamble_energy_max
;
PRACH_RESOURCES_t
prach_resources
;
//uint8_t prach_fmt;
//int N_ZC;
...
...
@@ -397,7 +396,7 @@ int main(int argc, char **argv)
frame_parms
->
frame_type
=
TDD
;
frame_parms
->
freq_range
=
nr_FR1
;
nsymb
=
(
frame_parms
->
Ncp
==
0
)
?
14
:
12
;
//
nsymb = (frame_parms->Ncp == 0) ? 14 : 12;
printf
(
"FFT Size %d, Extended Prefix %d, Samples per subframe %d,Frame type %s, Frequency Range %s
\n
"
,
NUMBER_OF_OFDM_CARRIERS
,
frame_parms
->
Ncp
,
frame_parms
->
samples_per_subframe
,
frame_parms
->
frame_type
==
FDD
?
"FDD"
:
"TDD"
,
frame_parms
->
freq_range
==
nr_FR1
?
"FR1"
:
"FR2"
);
...
...
@@ -434,7 +433,7 @@ int main(int argc, char **argv)
bw
=
N_RB_UL
*
(
180e3
)
*
(
1
<<
gNB
->
frame_parms
.
numerology_index
);
AssertFatal
(
bw
<=
122.88e6
,
"Illegal channel bandwidth %f (mu %d,N_RB_UL %d)
\n
"
,
gNB
->
frame_parms
.
numerology_index
,
N_RB_UL
);
AssertFatal
(
bw
<=
122.88e6
,
"Illegal channel bandwidth %f (mu %d,N_RB_UL %d)
\n
"
,
bw
,
gNB
->
frame_parms
.
numerology_index
,
N_RB_UL
);
if
(
bw
<=
30.72e6
)
fs
=
30.72e6
;
else
if
(
bw
<=
61.44e6
)
fs
=
61.44e6
;
else
if
(
bw
<=
122.88e6
)
fs
=
122.88e6
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
da54778c
...
...
@@ -105,7 +105,7 @@ openair0_config_t openair0_cfg[MAX_CARDS];
int
main
(
int
argc
,
char
**
argv
)
{
char
c
;
int
i
,
sf
;
int
i
;
double
SNR
,
snr0
=
-
2
.
0
,
snr1
=
2
.
0
;
double
sigma
,
sigma_dB
;
double
snr_step
=
1
;
...
...
@@ -393,7 +393,7 @@ int main(int argc, char **argv)
for
(
i
=
0
;
i
<
RC
.
nb_nr_macrlc_inst
;
i
++
)
RC
.
nb_nr_mac_CC
[
i
]
=
1
;
mac_top_init_gNB
();
gNB_MAC_INST
*
gNB_mac
=
RC
.
nrmac
[
0
];
//
gNB_MAC_INST* gNB_mac = RC.nrmac[0];
gNB_RRC_INST
rrc
;
memset
((
void
*
)
&
rrc
,
0
,
sizeof
(
rrc
));
...
...
@@ -449,7 +449,7 @@ int main(int argc, char **argv)
init_nr_ue_transport
(
UE
,
0
);
/*
for (sf = 0; sf < 2; sf++) {
for (
int
sf = 0; sf < 2; sf++) {
for (i = 0; i < 2; i++) {
UE->ulsch[sf][0][i] = new_nr_ue_ulsch(N_RB_UL, 8, 0);
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
da54778c
...
...
@@ -978,8 +978,6 @@ void NRRCConfig(void) {
paramlist_def_t
RUParamList
=
{
CONFIG_STRING_RU_LIST
,
NULL
,
0
};
paramdef_t
GNBSParams
[]
=
GNBSPARAMS_DESC
;
char
aprefix
[
MAX_OPTNAME_SIZE
*
2
+
8
];
/* get global parameters, defined outside any section in the config file */
LOG_I
(
GNB_APP
,
"Getting GNBSParams
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
da54778c
...
...
@@ -468,7 +468,6 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
uint32_t
number_of_search_space_per_slot
=
UINT_MAX
;
uint32_t
first_symbol_index
=
UINT_MAX
;
uint32_t
search_space_duration
;
// element of search space
uint32_t
coreset_duration
;
// element of coreset
// 38.213 table 10.1-1
/// MUX PATTERN 1
...
...
@@ -604,8 +603,8 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
}
AssertFatal
(
number_of_search_space_per_slot
!=
UINT_MAX
,
""
);
coreset_duration
=
num_symbols
*
number_of_search_space_per_slot
;
/*
uint32_t coreset_duration = num_symbols * number_of_search_space_per_slot;
mac->type0_pdcch_dci_config.number_of_candidates[0] = table_38213_10_1_1_c2[0];
mac->type0_pdcch_dci_config.number_of_candidates[1] = table_38213_10_1_1_c2[1];
mac->type0_pdcch_dci_config.number_of_candidates[2] = table_38213_10_1_1_c2[2]; // CCE aggregation level = 4
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
da54778c
...
...
@@ -81,6 +81,7 @@
#include "SIMULATION/TOOLS/sim.h" // for taus
#include "executables/softmodem-common.h"
#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
//#define XER_PRINT
...
...
This diff is collapsed.
Click to expand it.
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