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
bb04e1d4
Commit
bb04e1d4
authored
May 06, 2023
by
Vijay Chadachan
Committed by
Vijay C
May 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Additional changes for crash fix
parent
b828a72c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
19 deletions
+31
-19
executables/lte-enb.c
executables/lte-enb.c
+5
-5
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+4
-4
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+6
-3
openair3/SS/ss_eNB_multicell_helper.c
openair3/SS/ss_eNB_multicell_helper.c
+6
-5
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+8
-1
radio/SS/ss_config.h
radio/SS/ss_config.h
+2
-1
No files found.
executables/lte-enb.c
View file @
bb04e1d4
...
@@ -319,7 +319,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
...
@@ -319,7 +319,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
int
tem_proc_ccid
=
proc
->
CC_id
;
int
tem_proc_ccid
=
proc
->
CC_id
;
/* MultiCell: Function modify for Multiple CC */
/* MultiCell: Function modify for Multiple CC */
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
eNB
->
Mod_id
];
CC_id
++
)
{
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_
mac_
CC
[
eNB
->
Mod_id
];
CC_id
++
)
{
eNB
->
UL_INFO
.
CC_id
=
CC_id
;
eNB
->
UL_INFO
.
CC_id
=
CC_id
;
proc
->
CC_id
=
CC_id
;
//Temp solution need to be fixed later
proc
->
CC_id
=
CC_id
;
//Temp solution need to be fixed later
eNB
->
if_inst
->
UL_indication
(
&
eNB
->
UL_INFO
,
(
void
*
)
proc
);
eNB
->
if_inst
->
UL_indication
(
&
eNB
->
UL_INFO
,
(
void
*
)
proc
);
...
@@ -964,7 +964,7 @@ void init_eNB_proc(int inst) {
...
@@ -964,7 +964,7 @@ void init_eNB_proc(int inst) {
pthread_attr_t
*
attr_prach_br
=
NULL
;
pthread_attr_t
*
attr_prach_br
=
NULL
;
LOG_I
(
PHY
,
"%s(inst:%d) RC.nb_CC[inst]:%d
\n
"
,
__FUNCTION__
,
inst
,
RC
.
nb_CC
[
inst
]);
LOG_I
(
PHY
,
"%s(inst:%d) RC.nb_CC[inst]:%d
\n
"
,
__FUNCTION__
,
inst
,
RC
.
nb_CC
[
inst
]);
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
inst
];
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_
mac_
CC
[
inst
];
CC_id
++
)
{
eNB
=
RC
.
eNB
[
inst
][
CC_id
];
eNB
=
RC
.
eNB
[
inst
][
CC_id
];
LOG_I
(
PHY
,
"Initializing eNB processes instance:%d CC_id %d
\n
"
,
inst
,
CC_id
);
LOG_I
(
PHY
,
"Initializing eNB processes instance:%d CC_id %d
\n
"
,
inst
,
CC_id
);
proc
=
&
eNB
->
proc
;
proc
=
&
eNB
->
proc
;
...
@@ -1253,10 +1253,10 @@ void init_eNB_afterRU(void) {
...
@@ -1253,10 +1253,10 @@ void init_eNB_afterRU(void) {
LOG_I
(
PHY
,
"%s() RC.nb_inst:%d
\n
"
,
__FUNCTION__
,
RC
.
nb_inst
);
LOG_I
(
PHY
,
"%s() RC.nb_inst:%d
\n
"
,
__FUNCTION__
,
RC
.
nb_inst
);
for
(
inst
=
0
;
inst
<
RC
.
nb_inst
;
inst
++
)
{
for
(
inst
=
0
;
inst
<
RC
.
nb_inst
;
inst
++
)
{
LOG_I
(
PHY
,
"RC.nb_
CC[inst]:%d
\n
"
,
RC
.
nb
_CC
[
inst
]);
LOG_I
(
PHY
,
"RC.nb_
mac_CC[inst]:%d
\n
"
,
RC
.
nb_mac
_CC
[
inst
]);
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
inst
];
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_
mac_
CC
[
inst
];
CC_id
++
)
{
LOG_I
(
PHY
,
"RC.nb_CC[inst:%d][CC_id:%d]:%p
\n
"
,
inst
,
CC_id
,
RC
.
eNB
[
inst
][
CC_id
]);
LOG_I
(
PHY
,
"RC.nb_
mac_
CC[inst:%d][CC_id:%d]:%p
\n
"
,
inst
,
CC_id
,
RC
.
eNB
[
inst
][
CC_id
]);
eNB
=
RC
.
eNB
[
inst
][
CC_id
];
eNB
=
RC
.
eNB
[
inst
][
CC_id
];
// map antennas and PRACH signals to eNB RX
// map antennas and PRACH signals to eNB RX
LOG_I
(
PHY
,
"Mapping RX ports from %d RUs to eNB %d
\n
"
,
eNB
->
num_RU
,
eNB
->
Mod_id
);
LOG_I
(
PHY
,
"Mapping RX ports from %d RUs to eNB %d
\n
"
,
eNB
->
num_RU
,
eNB
->
Mod_id
);
...
...
nfapi/oai_integration/nfapi_vnf.c
View file @
bb04e1d4
...
@@ -207,7 +207,7 @@ void oai_create_enb(void) {
...
@@ -207,7 +207,7 @@ void oai_create_enb(void) {
int
bodge_counter
=
0
;
int
bodge_counter
=
0
;
int
FAPI_configured_for_a_CC
=
0
;
int
FAPI_configured_for_a_CC
=
0
;
/* MultiCell: Function modify for Multiple CC */
/* MultiCell: Function modify for Multiple CC */
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
0
];
CC_id
++
)
{
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_
mac_
CC
[
0
];
CC_id
++
)
{
PHY_VARS_eNB
*
eNB
=
RC
.
eNB
[
0
][
CC_id
];
PHY_VARS_eNB
*
eNB
=
RC
.
eNB
[
0
][
CC_id
];
if
(
eNB
==
NULL
)
if
(
eNB
==
NULL
)
{
{
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
bb04e1d4
...
@@ -6751,7 +6751,10 @@ char openair_rrc_eNB_configuration(
...
@@ -6751,7 +6751,10 @@ char openair_rrc_eNB_configuration(
}
}
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
0
];
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_CC
[
0
];
CC_id
++
)
{
if
(
RC
.
ss
.
CC_update_flag
[
CC_id
])
{
init_SI
(
&
ctxt
,
CC_id
,
configuration
);
init_SI
(
&
ctxt
,
CC_id
,
configuration
);
RC
.
ss
.
CC_update_flag
[
CC_id
]
=
0
;
}
}
}
if
(
need_init
)
{
if
(
need_init
)
{
...
...
openair3/SS/ss_eNB_multicell_helper.c
View file @
bb04e1d4
...
@@ -82,7 +82,8 @@ int get_cell_index_pci(uint16_t physCellId, SS_Cell_Context_t SSCell_list[]){
...
@@ -82,7 +82,8 @@ int get_cell_index_pci(uint16_t physCellId, SS_Cell_Context_t SSCell_list[]){
void
init_ss_context
(
SS_Cell_Context_t
SSCell_list
[]){
void
init_ss_context
(
SS_Cell_Context_t
SSCell_list
[]){
memset
(
SSCell_list
,
0
,
(
sizeof
(
SS_Cell_Context_t
)
*
8
));
memset
(
SSCell_list
,
0
,
(
sizeof
(
SS_Cell_Context_t
)
*
8
));
memset
(
RC
.
ss
.
l1macind
,
0
,
sizeof
(
RC
.
ss
.
l1macind
));
memset
(
RC
.
ss
.
l1macind
,
0
,
sizeof
(
RC
.
ss
.
l1macind
));
memset
(
RC
.
ss
.
CC_update_flag
,
0
,
(
sizeof
(
RC
.
ss
.
CC_update_flag
)));
memset
(
RC
.
ss
.
CC_conf_flag
,
0
,
(
sizeof
(
RC
.
ss
.
CC_conf_flag
)));
for
(
int
Cell_idx
=
0
;
Cell_idx
<
8
;
Cell_idx
++
){
for
(
int
Cell_idx
=
0
;
Cell_idx
<
8
;
Cell_idx
++
){
SSCell_list
[
Cell_idx
].
eutra_cellId
=
-
1
;
SSCell_list
[
Cell_idx
].
eutra_cellId
=
-
1
;
}
}
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
bb04e1d4
...
@@ -1058,6 +1058,7 @@ int sys_handle_cell_config_req(struct SYSTEM_CTRL_REQ *req)
...
@@ -1058,6 +1058,7 @@ int sys_handle_cell_config_req(struct SYSTEM_CTRL_REQ *req)
{
{
//The flag is used to initilize the cell in the RRC layer during init_SI funciton
//The flag is used to initilize the cell in the RRC layer during init_SI funciton
RC
.
ss
.
CC_conf_flag
[
cell_index
]
=
1
;
RC
.
ss
.
CC_conf_flag
[
cell_index
]
=
1
;
RC
.
ss
.
CC_update_flag
[
cell_index
]
=
1
;
returnState
=
SS_STATE_CELL_CONFIGURED
;
returnState
=
SS_STATE_CELL_CONFIGURED
;
//Increment nb_cc only from 2nd cell as the initilization is done for 1 CC
//Increment nb_cc only from 2nd cell as the initilization is done for 1 CC
if
(
cell_index
)
if
(
cell_index
)
...
@@ -1071,11 +1072,17 @@ int sys_handle_cell_config_req(struct SYSTEM_CTRL_REQ *req)
...
@@ -1071,11 +1072,17 @@ int sys_handle_cell_config_req(struct SYSTEM_CTRL_REQ *req)
//Set the number of MAC_CC to current configured CC value
//Set the number of MAC_CC to current configured CC value
//*RC.nb_mac_CC= RC.nb_CC[0];
//*RC.nb_mac_CC= RC.nb_CC[0];
LOG_I
(
ENB_SS_SYS_TASK
,
"[SYS] CC-MGMT nb_cc is incremented current Configured
CC are %d current CC_index %d
nb_mac_CC %d
\n
"
,
LOG_I
(
ENB_SS_SYS_TASK
,
"[SYS] CC-MGMT nb_cc is incremented current Configured
RC.nb_CC %d current CC_index %d RC.
nb_mac_CC %d
\n
"
,
RC
.
nb_CC
[
0
],
cell_index
,
*
RC
.
nb_mac_CC
);
RC
.
nb_CC
[
0
],
cell_index
,
*
RC
.
nb_mac_CC
);
}
}
}
}
}
}
else
{
RC
.
ss
.
CC_update_flag
[
cell_index
]
=
1
;
LOG_I
(
ENB_SS_SYS_TASK
,
"[SYS] CC-MGMT configured RC.nb_CC %d current updated CC_index %d RC.nb_mac_CC %d
\n
"
,
RC
.
nb_CC
[
0
],
cell_index
,
*
RC
.
nb_mac_CC
);
}
break
;
break
;
...
...
radio/SS/ss_config.h
View file @
bb04e1d4
...
@@ -92,6 +92,7 @@ typedef struct ss_config_s {
...
@@ -92,6 +92,7 @@ typedef struct ss_config_s {
ss_rrc_pdcp_api_t
*
ss_pdcp_api
;
ss_rrc_pdcp_api_t
*
ss_pdcp_api
;
ss_crnti_config_t
ss_crnti
[
MAX_NUM_CCs
];
ss_crnti_config_t
ss_crnti
[
MAX_NUM_CCs
];
RrcHOAsSecurityConfig_t
HOASSecurityCOnfig
;
RrcHOAsSecurityConfig_t
HOASSecurityCOnfig
;
uint8_t
CC_update_flag
[
MAX_NUM_CCs
];
}
ss_config_t
;
}
ss_config_t
;
/**
/**
typedef enum {
typedef enum {
...
...
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