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
lizhongxiao
OpenXG-RAN
Commits
399ad2ec
Commit
399ad2ec
authored
Nov 28, 2022
by
Stone WU
Committed by
jperaldi
Dec 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #123827: Issue 86 support stop sib1 transmission on eNB according to cell config req from SS
parent
195baf2a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+1
-0
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/L2_interface.c
+5
-0
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+3
-0
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+3
-1
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
399ad2ec
...
@@ -334,6 +334,7 @@ typedef struct RrcConfigurationReq_s {
...
@@ -334,6 +334,7 @@ typedef struct RrcConfigurationReq_s {
//MIB
//MIB
long
schedulingInfoSIB1_BR_r13
[
MAX_NUM_CCs
];
long
schedulingInfoSIB1_BR_r13
[
MAX_NUM_CCs
];
//SIB1 BR options
//SIB1 BR options
BOOLEAN_t
stopSib1Transmission
[
MAX_NUM_CCs
];
uint16_t
*
hyperSFN_r13
[
MAX_NUM_CCs
];
uint16_t
*
hyperSFN_r13
[
MAX_NUM_CCs
];
long
*
eDRX_Allowed_r13
[
MAX_NUM_CCs
];
long
*
eDRX_Allowed_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
cellSelectionInfoCE_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
cellSelectionInfoCE_r13
[
MAX_NUM_CCs
];
...
...
openair2/RRC/LTE/L2_interface.c
View file @
399ad2ec
...
@@ -117,6 +117,11 @@ mac_rrc_data_req(
...
@@ -117,6 +117,11 @@ mac_rrc_data_req(
"[eNB %d] MAC Request for SIB1 and SIB1 not initialized
\n
"
,
Mod_idP
);
"[eNB %d] MAC Request for SIB1 and SIB1 not initialized
\n
"
,
Mod_idP
);
if
((
frameP
%
2
)
==
0
)
{
if
((
frameP
%
2
)
==
0
)
{
if
(
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sizeof_SIB1
==
0
){
//stopSib1Transmission
LOG_D
(
RRC
,
"[eNB %d] CC_id:%d Frame %d : stopSib1Transmission
\n
"
,
Mod_idP
,
CC_id
,
frameP
);
return
0
;
}
memcpy
(
&
buffer_pP
[
0
],
memcpy
(
&
buffer_pP
[
0
],
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
SIB1
,
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
SIB1
,
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sizeof_SIB1
);
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sizeof_SIB1
);
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
399ad2ec
...
@@ -1368,6 +1368,9 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
...
@@ -1368,6 +1368,9 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
if
(
enc_rval
.
encoded
==-
1
)
{
if
(
enc_rval
.
encoded
==-
1
)
{
return
(
-
1
);
return
(
-
1
);
}
}
if
(
configuration
->
stopSib1Transmission
[
CC_id
])
{
return
0
;
}
return
((
enc_rval
.
encoded
+
7
)
/
8
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
}
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
399ad2ec
...
@@ -373,7 +373,9 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
...
@@ -373,7 +373,9 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
#define BCCH_CONFIG AddOrReconfigure->Basic.v.BcchConfig
#define BCCH_CONFIG AddOrReconfigure->Basic.v.BcchConfig
if
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
d
==
true
)
if
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
d
==
true
)
{
{
LOG_A
(
ENB_SS
,
"[SYS] BCCH Config update in Cell config
\n
"
);
LOG_A
(
ENB_SS
,
"[SYS] BCCH Config update in Cell config
\n
"
);
RRC_CONFIGURATION_REQ
(
msg_p
).
stopSib1Transmission
[
cell_index
]
=
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
StopSib1Transmission
.
d
)
?
1
:
0
;
LOG_A
(
ENB_SS
,
"[SYS] stopSib1Transmission for cellIndex(%d) %s
\n
"
,
cell_index
,
RRC_CONFIGURATION_REQ
(
msg_p
).
stopSib1Transmission
[
cell_index
]
?
"yes"
:
"no"
);
if
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
d
==
true
)
if
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
d
==
true
)
{
{
if
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
MIB
.
d
==
true
)
if
(
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
MIB
.
d
==
true
)
...
...
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