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
littleBu
OpenXG-RAN
Commits
5744749e
Commit
5744749e
authored
Feb 02, 2022
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make NR_BCCH_DL_SCH_Message_t (SIB1) available at MAC gNB
parent
aa9e3069
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
29 deletions
+39
-29
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+2
-2
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+2
-2
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+6
-4
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+3
-2
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+1
-0
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+22
-19
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_nsa.c
+2
-0
No files found.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
5744749e
...
@@ -796,9 +796,9 @@ int main(int argc, char **argv)
...
@@ -796,9 +796,9 @@ int main(int argc, char **argv)
AssertFatal
((
gNB
->
if_inst
=
NR_IF_Module_init
(
0
))
!=
NULL
,
"Cannot register interface"
);
AssertFatal
((
gNB
->
if_inst
=
NR_IF_Module_init
(
0
))
!=
NULL
,
"Cannot register interface"
);
gNB
->
if_inst
->
NR_PHY_config_req
=
nr_phy_config_request
;
gNB
->
if_inst
->
NR_PHY_config_req
=
nr_phy_config_request
;
// common configuration
// common configuration
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_tx
,
0
,
scc
,
NULL
,
0
,
0
,
NULL
);
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_tx
,
0
,
scc
,
NULL
,
NULL
,
0
,
0
,
NULL
);
// UE dedicated configuration
// UE dedicated configuration
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_tx
,
0
,
scc
,
NULL
,
1
,
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
newUE_Identity
,
secondaryCellGroup
);
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_tx
,
0
,
scc
,
NULL
,
NULL
,
1
,
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
newUE_Identity
,
secondaryCellGroup
);
// reset preprocessor to the one of DLSIM after it has been set during
// reset preprocessor to the one of DLSIM after it has been set during
// rrc_mac_config_req_gNB
// rrc_mac_config_req_gNB
gNB_mac
->
pre_processor_dl
=
nr_dlsim_preprocessor
;
gNB_mac
->
pre_processor_dl
=
nr_dlsim_preprocessor
;
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
5744749e
...
@@ -732,9 +732,9 @@ int main(int argc, char **argv)
...
@@ -732,9 +732,9 @@ int main(int argc, char **argv)
gNB
->
if_inst
->
NR_PHY_config_req
=
nr_phy_config_request
;
gNB
->
if_inst
->
NR_PHY_config_req
=
nr_phy_config_request
;
// common configuration
// common configuration
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_rx
,
0
,
scc
,
&
rrc
.
carrier
.
mib
,
0
,
0
,
NULL
);
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_rx
,
0
,
scc
,
&
rrc
.
carrier
.
mib
,
rrc
.
carrier
.
siblock1
,
0
,
0
,
NULL
);
// UE dedicated configuration
// UE dedicated configuration
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_rx
,
0
,
scc
,
&
rrc
.
carrier
.
mib
,
1
,
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
newUE_Identity
,
secondaryCellGroup
);
rrc_mac_config_req_gNB
(
0
,
0
,
n_tx
,
n_rx
,
0
,
scc
,
&
rrc
.
carrier
.
mib
,
rrc
.
carrier
.
siblock1
,
1
,
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
newUE_Identity
,
secondaryCellGroup
);
frame_parms
->
nb_antennas_tx
=
n_tx
;
frame_parms
->
nb_antennas_tx
=
n_tx
;
frame_parms
->
nb_antennas_rx
=
n_rx
;
frame_parms
->
nb_antennas_rx
=
n_rx
;
nfapi_nr_config_request_scf_t
*
cfg
=
&
gNB
->
gNB_config
;
nfapi_nr_config_request_scf_t
*
cfg
=
&
gNB
->
gNB_config
;
...
...
openair2/GNB_APP/gnb_config.c
View file @
5744749e
...
@@ -2035,6 +2035,7 @@ void configure_gnb_du_mac(int inst) {
...
@@ -2035,6 +2035,7 @@ void configure_gnb_du_mac(int inst) {
rrc
->
configuration
.
sib1_tda
,
rrc
->
configuration
.
sib1_tda
,
rrc
->
configuration
.
scc
,
rrc
->
configuration
.
scc
,
NULL
,
NULL
,
NULL
,
0
,
0
,
0
,
// rnti
0
,
// rnti
(
NR_CellGroupConfig_t
*
)
NULL
(
NR_CellGroupConfig_t
*
)
NULL
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
5744749e
...
@@ -431,6 +431,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -431,6 +431,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int
sib1_tda
,
int
sib1_tda
,
NR_ServingCellConfigCommon_t
*
scc
,
NR_ServingCellConfigCommon_t
*
scc
,
NR_BCCH_BCH_Message_t
*
mib
,
NR_BCCH_BCH_Message_t
*
mib
,
NR_BCCH_DL_SCH_Message_t
*
sib1
,
int
add_ue
,
int
add_ue
,
uint32_t
rnti
,
uint32_t
rnti
,
NR_CellGroupConfig_t
*
CellGroup
)
{
NR_CellGroupConfig_t
*
CellGroup
)
{
...
@@ -532,6 +533,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -532,6 +533,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
}
}
if
(
mib
)
RC
.
nrmac
[
Mod_idP
]
->
common_channels
[
0
].
mib
=
mib
;
if
(
mib
)
RC
.
nrmac
[
Mod_idP
]
->
common_channels
[
0
].
mib
=
mib
;
if
(
sib1
)
RC
.
nrmac
[
Mod_idP
]
->
common_channels
[
0
].
sib1
=
sib1
;
if
(
CellGroup
)
{
if
(
CellGroup
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
5744749e
...
@@ -52,6 +52,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -52,6 +52,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int
sib1_tda
,
int
sib1_tda
,
NR_ServingCellConfigCommon_t
*
scc
,
NR_ServingCellConfigCommon_t
*
scc
,
NR_BCCH_BCH_Message_t
*
mib
,
NR_BCCH_BCH_Message_t
*
mib
,
NR_BCCH_DL_SCH_Message_t
*
sib1
,
int
add_ue
,
int
add_ue
,
uint32_t
rnti
,
uint32_t
rnti
,
NR_CellGroupConfig_t
*
CellGroup
);
NR_CellGroupConfig_t
*
CellGroup
);
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
5744749e
...
@@ -186,6 +186,7 @@ typedef struct {
...
@@ -186,6 +186,7 @@ typedef struct {
lte_frame_type_t
frame_type
;
lte_frame_type_t
frame_type
;
uint64_t
dl_CarrierFreq
;
uint64_t
dl_CarrierFreq
;
NR_BCCH_BCH_Message_t
*
mib
;
NR_BCCH_BCH_Message_t
*
mib
;
NR_BCCH_DL_SCH_Message_t
*
sib1
;
NR_ServingCellConfigCommon_t
*
ServingCellConfigCommon
;
NR_ServingCellConfigCommon_t
*
ServingCellConfigCommon
;
NR_ARFCN_ValueEUTRA_t
ul_CarrierFreq
;
NR_ARFCN_ValueEUTRA_t
ul_CarrierFreq
;
long
ul_Bandwidth
;
long
ul_Bandwidth
;
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
5744749e
...
@@ -189,10 +189,10 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
...
@@ -189,10 +189,10 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
rrc
->
carrier
.
sib1_tda
,
rrc
->
carrier
.
sib1_tda
,
(
NR_ServingCellConfigCommon_t
*
)
rrc
->
carrier
.
servingcellconfigcommon
,
(
NR_ServingCellConfigCommon_t
*
)
rrc
->
carrier
.
servingcellconfigcommon
,
&
rrc
->
carrier
.
mib
,
&
rrc
->
carrier
.
mib
,
rrc
->
carrier
.
siblock1
,
0
,
0
,
0
,
// WIP hardcoded rnti
0
,
// WIP hardcoded rnti
(
NR_CellGroupConfig_t
*
)
NULL
(
NR_CellGroupConfig_t
*
)
NULL
);
);
}
}
/* set flag to indicate that cell information is configured. This is required
/* set flag to indicate that cell information is configured. This is required
...
@@ -301,6 +301,7 @@ void apply_macrlc_config(gNB_RRC_INST *rrc,
...
@@ -301,6 +301,7 @@ void apply_macrlc_config(gNB_RRC_INST *rrc,
rrc
->
carrier
.
sib1_tda
,
rrc
->
carrier
.
sib1_tda
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
0
,
0
,
ue_context_pP
->
ue_context
.
rnti
,
ue_context_pP
->
ue_context
.
rnti
,
get_softmodem_params
()
->
sa
?
ue_context_pP
->
ue_context
.
masterCellGroup
:
(
NR_CellGroupConfig_t
*
)
NULL
);
get_softmodem_params
()
->
sa
?
ue_context_pP
->
ue_context
.
masterCellGroup
:
(
NR_CellGroupConfig_t
*
)
NULL
);
...
@@ -494,6 +495,7 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
...
@@ -494,6 +495,7 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
rrc_instance_p
->
carrier
.
sib1_tda
,
rrc_instance_p
->
carrier
.
sib1_tda
,
(
NR_ServingCellConfigCommon_t
*
)
rrc_instance_p
->
carrier
.
servingcellconfigcommon
,
(
NR_ServingCellConfigCommon_t
*
)
rrc_instance_p
->
carrier
.
servingcellconfigcommon
,
&
rrc_instance_p
->
carrier
.
mib
,
&
rrc_instance_p
->
carrier
.
mib
,
rrc_instance_p
->
carrier
.
siblock1
,
0
,
0
,
ue_context_pP
->
ue_context
.
rnti
,
ue_context_pP
->
ue_context
.
rnti
,
(
NR_CellGroupConfig_t
*
)
NULL
(
NR_CellGroupConfig_t
*
)
NULL
...
@@ -1259,6 +1261,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
...
@@ -1259,6 +1261,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
rrc
->
carrier
.
sib1_tda
,
rrc
->
carrier
.
sib1_tda
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
0
,
0
,
ue_context_pP
->
ue_context
.
rnti
,
ue_context_pP
->
ue_context
.
rnti
,
ue_context_pP
->
ue_context
.
masterCellGroup
ue_context_pP
->
ue_context
.
masterCellGroup
...
...
openair2/RRC/NR/rrc_gNB_nsa.c
View file @
5744749e
...
@@ -384,6 +384,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
...
@@ -384,6 +384,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc
->
carrier
.
sib1_tda
,
rrc
->
carrier
.
sib1_tda
,
rrc
->
carrier
.
servingcellconfigcommon
,
rrc
->
carrier
.
servingcellconfigcommon
,
&
rrc
->
carrier
.
mib
,
&
rrc
->
carrier
.
mib
,
NULL
,
1
,
// add_ue flag
1
,
// add_ue flag
ue_context_p
->
ue_id_rnti
,
ue_context_p
->
ue_id_rnti
,
ue_context_p
->
ue_context
.
secondaryCellGroup
);
ue_context_p
->
ue_context
.
secondaryCellGroup
);
...
@@ -395,6 +396,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
...
@@ -395,6 +396,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc
->
carrier
.
sib1_tda
,
rrc
->
carrier
.
sib1_tda
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
1
,
// add_ue flag
1
,
// add_ue flag
ue_context_p
->
ue_id_rnti
,
ue_context_p
->
ue_id_rnti
,
ue_context_p
->
ue_context
.
secondaryCellGroup
);
ue_context_p
->
ue_context
.
secondaryCellGroup
);
...
...
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