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
lizhongxiao
OpenXG UE
Commits
0417d35d
Commit
0417d35d
authored
Sep 15, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for SIB2/3 handling in DU
parent
0f3d4203
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
94 additions
and
75 deletions
+94
-75
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+16
-8
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_interface_management.c
+3
-0
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_interface_management.c
+5
-1
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+58
-60
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+7
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
...OJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
+2
-2
No files found.
openair2/ENB_APP/enb_config.c
View file @
0417d35d
...
...
@@ -2923,8 +2923,10 @@ void extract_and_decode_SI(int inst,int si_ind,uint8_t *si_container,int si_cont
case
BCCH_DL_SCH_MessageType__c1_PR_systemInformation
:
{
SystemInformation_t
*
si
=
&
bcch_message
->
message
.
choice
.
c1
.
choice
.
systemInformation
;
for
(
int
i
=
0
;
i
<
si
->
criticalExtensions
.
choice
.
systemInformation_r8
.
sib_TypeAndInfo
.
list
.
count
;
i
++
)
{
LOG_I
(
ENB_APP
,
"Extracting SI %d/%d
\n
"
,
i
,
si
->
criticalExtensions
.
choice
.
systemInformation_r8
.
sib_TypeAndInfo
.
list
.
count
);
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
*
typeandinfo
;
typeandinfo
=
si
->
criticalExtensions
.
choice
.
systemInformation_r8
.
sib_TypeAndInfo
.
list
.
array
[
i
];
...
...
@@ -3019,6 +3021,8 @@ void configure_du_mac(int inst) {
eNB_RRC_INST
*
rrc
=
RC
.
rrc
[
inst
];
rrc_eNB_carrier_data_t
*
carrier
=
&
rrc
->
carrier
[
0
];
LOG_I
(
ENB_APP
,
"Configuring MAC/L1 %d, carrier->sib2 %p
\n
"
,
inst
,
&
carrier
->
sib2
->
radioResourceConfigCommon
);
rrc_mac_config_req_eNB
(
inst
,
0
,
carrier
->
physCellId
,
carrier
->
p_eNB
,
...
...
@@ -3030,9 +3034,8 @@ void configure_du_mac(int inst) {
#endif
0
,
// rnti
(
BCCH_BCH_Message_t
*
)
NULL
,
(
RadioResourceConfigCommonSIB_t
*
)
&
carrier
->
sib2
->
radioResourceConfigCommon
,
&
carrier
->
mib
,
(
RadioResourceConfigCommonSIB_t
*
)
&
carrier
->
sib2
->
radioResourceConfigCommon
,
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
(
RadioResourceConfigCommonSIB_t
*
)
NULL
,
...
...
@@ -3079,10 +3082,15 @@ void handle_f1ap_setup_resp(f1ap_setup_resp_t *resp) {
if
(
check_plmn_identity
(
carrier
,
resp
->
mcc
[
j
],
resp
->
mnc
[
j
],
resp
->
mnc_digit_length
[
j
])
>
0
&&
resp
->
nrpci
[
j
]
==
carrier
->
physCellId
)
{
// copy system information and decode it
for
(
si_ind
=
0
;
si_ind
<
resp
->
num_SI
[
j
];
si_ind
++
)
extract_and_decode_SI
(
i
,
si_ind
,
resp
->
SI_container
[
j
][
si_ind
],
resp
->
SI_container_length
[
j
][
si_ind
]);
for
(
si_ind
=
0
;
si_ind
<
resp
->
num_SI
[
j
];
si_ind
++
)
{
printf
(
"SI %d: "
,
si_ind
);
for
(
int
n
=
0
;
n
<
resp
->
SI_container_length
[
j
][
si_ind
];
n
++
)
printf
(
"%2x "
,
resp
->
SI_container
[
j
][
si_ind
][
n
]);
printf
(
"
\n
"
);
extract_and_decode_SI
(
i
,
si_ind
,
resp
->
SI_container
[
j
][
si_ind
],
resp
->
SI_container_length
[
j
][
si_ind
]);
}
// perform MAC/L1 common configuration
configure_du_mac
(
i
);
}
...
...
openair2/F1AP/f1ap_cu_interface_management.c
View file @
0417d35d
...
...
@@ -328,6 +328,9 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
F1AP_GNB_CUSystemInformation_t
*
gNB_CUSystemInformation
=
(
F1AP_GNB_CUSystemInformation_t
*
)
calloc
(
1
,
sizeof
(
F1AP_GNB_CUSystemInformation_t
));
printf
(
"SI %d: "
);
for
(
int
n
=
0
;
n
<
f1ap_setup_resp
->
SI_container_length
[
i
][
0
];
n
++
)
printf
(
"%2x "
,
f1ap_setup_resp
->
SI_container
[
i
][
0
][
n
]);
printf
(
"
\n
"
);
OCTET_STRING_fromBuf
(
&
gNB_CUSystemInformation
->
sImessage
,
f1ap_setup_resp
->
SI_container
[
i
][
0
],
f1ap_setup_resp
->
SI_container_length
[
i
][
0
]);
...
...
openair2/F1AP/f1ap_du_interface_management.c
View file @
0417d35d
...
...
@@ -486,7 +486,11 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
size_t
size
=
ext
->
list
.
array
[
si
]
->
extensionValue
.
choice
.
GNB_CUSystemInformation
.
sImessage
.
size
;
F1AP_SETUP_RESP
(
msg_p
).
SI_container_length
[
i
][
si
]
=
size
;
printf
(
"F1AP: F1Setup-Resp SI_container_length[%d][%d] %d bytes
\n
"
,
i
,
si
,
size
);
F1AP_SETUP_RESP
(
msg_p
).
SI_container
[
i
][
si
]
=
ext
->
list
.
array
[
si
]
->
extensionValue
.
choice
.
GNB_CUSystemInformation
.
sImessage
.
buf
;
F1AP_SETUP_RESP
(
msg_p
).
SI_container
[
i
][
si
]
=
malloc
(
F1AP_SETUP_RESP
(
msg_p
).
SI_container_length
[
i
][
si
]);
memcpy
((
void
*
)
F1AP_SETUP_RESP
(
msg_p
).
SI_container
[
i
][
si
],
(
void
*
)
ext
->
list
.
array
[
si
]
->
extensionValue
.
choice
.
GNB_CUSystemInformation
.
sImessage
.
buf
,
F1AP_SETUP_RESP
(
msg_p
).
SI_container_length
[
i
][
si
]);
}
}
break
;
...
...
openair2/LAYER2/MAC/config.c
View file @
0417d35d
...
...
@@ -780,68 +780,66 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
sib1_v13ext
=
sib1_v13ext
;
}
#endif
if
(
radioResourceConfigCommon
!=
NULL
)
{
LOG_I
(
MAC
,
"[CONFIG]SIB2/3 Contents (partial)
\n
"
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.n_SB = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
n_SB
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.hoppingMode = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
hoppingMode
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.pusch_HoppingOffset = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
pusch_HoppingOffset
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.enable64QAM = %d
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
enable64QAM
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.groupHoppingEnabled = %d
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
groupHoppingEnabled
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.groupAssignmentPUSCH = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.sequenceHoppingEnabled = %d
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
sequenceHoppingEnabled
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.cyclicShift = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
cyclicShift
);
AssertFatal
(
radioResourceConfigCommon
->
rach_ConfigCommon
.
maxHARQ_Msg3Tx
>
0
,
"radioResourceconfigCommon %d == 0
\n
"
,
(
int
)
radioResourceConfigCommon
->
rach_ConfigCommon
.
maxHARQ_Msg3Tx
);
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
radioResourceConfigCommon
=
radioResourceConfigCommon
;
if
(
ul_CarrierFreq
>
0
)
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
ul_CarrierFreq
=
ul_CarrierFreq
;
if
(
ul_Bandwidth
)
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
ul_Bandwidth
=
*
ul_Bandwidth
;
else
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
ul_Bandwidth
=
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mib
->
message
.
dl_Bandwidth
;
config_sib2
(
Mod_idP
,
CC_idP
,
radioResourceConfigCommon
,
AssertFatal
(
radioResourceConfigCommon
!=
NULL
,
"radioResourceConfigCommon is null
\n
"
);
LOG_I
(
MAC
,
"[CONFIG]SIB2/3 Contents (partial)
\n
"
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.n_SB = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
n_SB
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.hoppingMode = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
hoppingMode
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.pusch_HoppingOffset = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
pusch_HoppingOffset
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.enable64QAM = %d
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
pusch_ConfigBasic
.
enable64QAM
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.groupHoppingEnabled = %d
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
groupHoppingEnabled
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.groupAssignmentPUSCH = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.sequenceHoppingEnabled = %d
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
sequenceHoppingEnabled
);
LOG_I
(
MAC
,
"[CONFIG]pusch_config_common.cyclicShift = %ld
\n
"
,
radioResourceConfigCommon
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
cyclicShift
);
AssertFatal
(
radioResourceConfigCommon
->
rach_ConfigCommon
.
maxHARQ_Msg3Tx
>
0
,
"radioResourceconfigCommon %d == 0
\n
"
,
(
int
)
radioResourceConfigCommon
->
rach_ConfigCommon
.
maxHARQ_Msg3Tx
);
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
radioResourceConfigCommon
=
radioResourceConfigCommon
;
if
(
ul_CarrierFreq
>
0
)
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
ul_CarrierFreq
=
ul_CarrierFreq
;
if
(
ul_Bandwidth
)
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
ul_Bandwidth
=
*
ul_Bandwidth
;
else
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
ul_Bandwidth
=
RC
.
mac
[
Mod_idP
]
->
common_channels
[
CC_idP
].
mib
->
message
.
dl_Bandwidth
;
config_sib2
(
Mod_idP
,
CC_idP
,
radioResourceConfigCommon
,
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
radioResourceConfigCommon_BR
,
radioResourceConfigCommon_BR
,
#endif
NULL
,
ul_Bandwidth
,
additionalSpectrumEmission
,
mbsfn_SubframeConfigList
);
}
NULL
,
ul_Bandwidth
,
additionalSpectrumEmission
,
mbsfn_SubframeConfigList
);
}
// mib != NULL
// SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
0417d35d
...
...
@@ -390,6 +390,7 @@ init_SI(
#endif
}
/*
if (rrc->node_type == ngran_eNB_DU) {
LOG_D(RRC, "About to call rrc_mac_config_req_eNB for ngran_eNB_DU\n");
...
...
@@ -437,7 +438,9 @@ init_SI(
#endif
);
}
else
if
(
rrc
->
node_type
==
ngran_eNB
)
{
else
*/
if
(
rrc
->
node_type
==
ngran_eNB
)
{
LOG_D
(
RRC
,
"About to call rrc_mac_config_req_eNB for ngran_eNB
\n
"
);
rrc_mac_config_req_eNB
(
ctxt_pP
->
module_id
,
CC_id
,
...
...
@@ -7357,6 +7360,9 @@ void handle_f1_setup_req(f1ap_setup_req_t *f1_setup_req) {
if
(
rrc
->
carrier
[
0
].
SIB23
)
{
F1AP_SETUP_RESP
(
msg_p
).
SI_container
[
cu_cell_ind
][
num_SI
]
=
rrc
->
carrier
[
0
].
SIB23
;
F1AP_SETUP_RESP
(
msg_p
).
SI_container_length
[
cu_cell_ind
][
num_SI
]
=
rrc
->
carrier
[
0
].
sizeof_SIB23
;
printf
(
"SI %d: "
,
0
);
for
(
int
n
=
0
;
n
<
F1AP_SETUP_RESP
(
msg_p
).
SI_container_length
[
j
][
num_SI
];
n
++
)
printf
(
"%2x "
,
F1AP_SETUP_RESP
(
msg_p
).
SI_container
[
0
][
num_SI
][
n
]);
printf
(
"
\n
"
);
num_SI
++
;
}
F1AP_SETUP_RESP
(
msg_p
).
num_SI
[
cu_cell_ind
]
=
num_SI
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
View file @
0417d35d
...
...
@@ -77,9 +77,9 @@ L1s = (
RUs
= (
{
local_if_name
=
"
eth1
"
;
remote_address
=
"1
0.10.10.19
"
;
local_address
=
"1
0.10.10.18
"
;
local_if_name
=
"
lo
"
;
remote_address
=
"1
27.0.0.2
"
;
local_address
=
"1
27.0.0.1
"
;
local_portc
=
50000
;
remote_portc
=
50000
;
local_portd
=
50001
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
View file @
0417d35d
...
...
@@ -22,9 +22,9 @@ log_config = {
global_log_verbosity
=
"medium"
;
hw_log_level
=
"info"
;
hw_log_verbosity
=
"medium"
;
phy_log_level
=
"
debug
"
;
phy_log_level
=
"
info`
"
;
phy_log_verbosity
=
"medium"
;
mac_log_level
=
"
debug
"
;
mac_log_level
=
"
info
"
;
mac_log_verbosity
=
"high"
;
rlc_log_level
=
"info"
;
rlc_log_verbosity
=
"medium"
;
...
...
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