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
wangjie
OpenXG-RAN
Commits
f4b20822
Commit
f4b20822
authored
Dec 02, 2020
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build warnings
parent
c8dfaf8e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
11 deletions
+31
-11
executables/softmodem-common.h
executables/softmodem-common.h
+1
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+4
-0
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+4
-0
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+4
-0
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+8
-9
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
...ENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+10
-1
No files found.
executables/softmodem-common.h
View file @
f4b20822
...
@@ -56,7 +56,7 @@ extern "C"
...
@@ -56,7 +56,7 @@ extern "C"
#define CONFIG_HLP_UELOOP "get softmodem (UE) to loop through memory instead of acquiring from HW\n"
#define CONFIG_HLP_UELOOP "get softmodem (UE) to loop through memory instead of acquiring from HW\n"
#define CONFIG_HLP_PHYTST "test UE phy layer, mac disabled\n"
#define CONFIG_HLP_PHYTST "test UE phy layer, mac disabled\n"
#define CONFIG_HLP_DORA "test gNB and UE with RA procedures\n"
#define CONFIG_HLP_DORA "test gNB and UE with RA procedures\n"
#define CONFIG_HLP_SA "run gNB
in standalone mode\n"
#define CONFIG_HLP_SA "run gNB in standalone mode\n"
#define CONFIG_HLP_EXTS "tells hardware to use an external timing reference\n"
#define CONFIG_HLP_EXTS "tells hardware to use an external timing reference\n"
#define CONFIG_HLP_DMRSSYNC "tells RU to insert DMRS in subframe 1 slot 0"
#define CONFIG_HLP_DMRSSYNC "tells RU to insert DMRS in subframe 1 slot 0"
#define CONFIG_HLP_CLK "tells hardware to use a clock reference (0:internal, 1:external, 2:gpsdo)\n"
#define CONFIG_HLP_CLK "tells hardware to use a clock reference (0:internal, 1:external, 2:gpsdo)\n"
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
f4b20822
...
@@ -146,6 +146,10 @@ int is_x2ap_enabled(void)
...
@@ -146,6 +146,10 @@ int is_x2ap_enabled(void)
return
0
;
return
0
;
}
}
int8_t
nr_rrc_ue_decode_NR_SIB1_Message
(
module_id_t
module_id
,
uint8_t
gNB_index
,
uint8_t
*
const
bufferP
,
const
uint8_t
buffer_len
)
{
return
0
;
}
// needed for some functions
// needed for some functions
openair0_config_t
openair0_cfg
[
MAX_CARDS
];
openair0_config_t
openair0_cfg
[
MAX_CARDS
];
void
update_ptrs_config
(
NR_CellGroupConfig_t
*
secondaryCellGroup
,
uint16_t
*
rbSize
,
uint8_t
*
mcsIndex
,
int8_t
*
ptrs_arg
);
void
update_ptrs_config
(
NR_CellGroupConfig_t
*
secondaryCellGroup
,
uint16_t
*
rbSize
,
uint8_t
*
mcsIndex
,
int8_t
*
ptrs_arg
);
...
...
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
f4b20822
...
@@ -107,6 +107,10 @@ int is_x2ap_enabled(void)
...
@@ -107,6 +107,10 @@ int is_x2ap_enabled(void)
return
0
;
return
0
;
}
}
int8_t
nr_rrc_ue_decode_NR_SIB1_Message
(
module_id_t
module_id
,
uint8_t
gNB_index
,
uint8_t
*
const
bufferP
,
const
uint8_t
buffer_len
)
{
return
0
;
}
int
main
(
int
argc
,
char
**
argv
){
int
main
(
int
argc
,
char
**
argv
){
char
c
;
char
c
;
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
f4b20822
...
@@ -126,6 +126,10 @@ int is_x2ap_enabled(void)
...
@@ -126,6 +126,10 @@ int is_x2ap_enabled(void)
return
0
;
return
0
;
}
}
int8_t
nr_rrc_ue_decode_NR_SIB1_Message
(
module_id_t
module_id
,
uint8_t
gNB_index
,
uint8_t
*
const
bufferP
,
const
uint8_t
buffer_len
)
{
return
0
;
}
// needed for some functions
// needed for some functions
uint16_t
n_rnti
=
0x1234
;
uint16_t
n_rnti
=
0x1234
;
openair0_config_t
openair0_cfg
[
MAX_CARDS
];
openair0_config_t
openair0_cfg
[
MAX_CARDS
];
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
f4b20822
...
@@ -3208,14 +3208,13 @@ int get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PDC
...
@@ -3208,14 +3208,13 @@ int get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PDC
// type0-pdcch search space
// type0-pdcch search space
float
big_o
;
float
big_o
=
0
.
0
f
;
float
big_m
;
float
big_m
=
0
.
0
f
;
uint32_t
temp
;
type0_PDCCH_CSS_config
->
sfn_c
=
SFN_C_IMPOSSIBLE
;
// only valid for mux=1
type0_PDCCH_CSS_config
->
sfn_c
=
SFN_C_IMPOSSIBLE
;
// only valid for mux=1
type0_PDCCH_CSS_config
->
n_c
=
UINT_MAX
;
type0_PDCCH_CSS_config
->
n_c
=
UINT_MAX
;
type0_PDCCH_CSS_config
->
number_of_search_space_per_slot
=
UINT_MAX
;
type0_PDCCH_CSS_config
->
number_of_search_space_per_slot
=
UINT_MAX
;
type0_PDCCH_CSS_config
->
first_symbol_index
=
UINT_MAX
;
type0_PDCCH_CSS_config
->
first_symbol_index
=
UINT_MAX
;
type0_PDCCH_CSS_config
->
search_space_duration
=
0
;
// element of search space
type0_PDCCH_CSS_config
->
search_space_duration
=
0
;
// element of search space
// 38.213 table 10.1-1
// 38.213 table 10.1-1
/// MUX PATTERN 1
/// MUX PATTERN 1
...
@@ -3224,7 +3223,7 @@ int get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PDC
...
@@ -3224,7 +3223,7 @@ int get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PDC
type0_PDCCH_CSS_config
->
number_of_search_space_per_slot
=
table_38213_13_11_c2
[
index_4lsb
];
type0_PDCCH_CSS_config
->
number_of_search_space_per_slot
=
table_38213_13_11_c2
[
index_4lsb
];
big_m
=
table_38213_13_11_c3
[
index_4lsb
];
big_m
=
table_38213_13_11_c3
[
index_4lsb
];
temp
=
(
uint32_t
)(
big_o
*
pow
(
2
,
scs_pdcch
))
+
(
uint32_t
)(
type0_PDCCH_CSS_config
->
ssb_index
*
big_m
);
uint32_t
temp
=
(
uint32_t
)(
big_o
*
pow
(
2
,
scs_pdcch
))
+
(
uint32_t
)(
type0_PDCCH_CSS_config
->
ssb_index
*
big_m
);
type0_PDCCH_CSS_config
->
n_c
=
temp
/
num_slot_per_frame
;
type0_PDCCH_CSS_config
->
n_c
=
temp
/
num_slot_per_frame
;
if
((
temp
/
num_slot_per_frame
)
&
0x1
){
if
((
temp
/
num_slot_per_frame
)
&
0x1
){
type0_PDCCH_CSS_config
->
sfn_c
=
SFN_C_MOD_2_EQ_1
;
type0_PDCCH_CSS_config
->
sfn_c
=
SFN_C_MOD_2_EQ_1
;
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
100755 → 100644
View file @
f4b20822
...
@@ -282,12 +282,21 @@ RUs = (
...
@@ -282,12 +282,21 @@ RUs = (
THREAD_STRUCT
= (
THREAD_STRUCT
= (
{
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
worker_config
=
"WORKER_ENABLE"
;
}
}
);
);
rfsimulator
:
{
serveraddr
=
"server"
;
serverport
=
"4043"
;
options
= ();
#("saviq"); or/and "chanmod"
modelname
=
"AWGN"
;
IQfile
=
"/tmp/rfsimulator.iqs"
;
};
log_config
:
log_config
:
{
{
global_log_level
=
"info"
;
global_log_level
=
"info"
;
...
...
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