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
c6f58152
Commit
c6f58152
authored
Oct 04, 2022
by
Vaibhav Shrivastava
Committed by
jperaldi
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Multi Cell Changes fix for running 6.1.2.2
parent
db1f1577
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
113 deletions
+32
-113
ci-scripts/conf_files/firecell/proxy_rcc.band1.tm1.nfapi.conf
...cripts/conf_files/firecell/proxy_rcc.band1.tm1.nfapi.conf
+2
-84
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+1
-1
openair2/PHY_INTERFACE/IF_Module.c
openair2/PHY_INTERFACE/IF_Module.c
+28
-27
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
No files found.
ci-scripts/conf_files/firecell/proxy_rcc.band1.tm1.nfapi.conf
View file @
c6f58152
...
@@ -106,88 +106,6 @@ eNBs =
...
@@ -106,88 +106,6 @@ eNBs =
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
ue_TransmissionMode
=
1
;
},
{
node_function
=
"3GPP_eNODEB"
;
node_timing
=
"synch_to_ext_device"
;
node_synch_ref
=
0
;
frame_type
=
"FDD"
;
tdd_config
=
0
;
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
1
;
downlink_frequency
=
2150000000
L
;
uplink_frequency_offset
= -
200000000
L
;
Nid_cell
=
1
;
N_RB_DL
=
50
;
Nid_cell_mbsfn
=
0
;
nb_antenna_ports
=
1
;
nb_antennas_tx
=
1
;
nb_antennas_rx
=
1
;
tx_gain
=
90
;
rx_gain
=
125
;
pbch_repetition
=
"FALSE"
;
prach_root
=
22
;
prach_config_index
=
3
;
prach_high_speed
=
"DISABLE"
;
prach_zero_correlation
=
5
;
prach_freq_offset
=
4
;
pucch_delta_shift
=
1
;
pucch_nRB_CQI
=
0
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
0
;
pdsch_referenceSignalPower
= -
27
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_enable64QAM
=
"DISABLE"
;
pusch_hoppingMode
=
"interSubFrame"
;
pusch_hoppingOffset
=
0
;
pusch_groupHoppingEnabled
=
"ENABLE"
;
pusch_groupAssignment
=
0
;
pusch_sequenceHoppingEnabled
=
"DISABLE"
;
pusch_nDMRS1
=
1
;
phich_duration
=
"NORMAL"
;
phich_resource
=
"ONESIXTH"
;
srs_enable
=
"DISABLE"
;
/*
srs_BandwidthConfig
=;
srs_SubframeConfig
=;
srs_ackNackST
=;
srs_MaxUpPts
=;*/
pusch_p0_Nominal
= -
96
;
pusch_alpha
=
"AL1"
;
pucch_p0_Nominal
= -
104
;
msg3_delta_Preamble
=
6
;
pucch_deltaF_Format1
=
"deltaF2"
;
pucch_deltaF_Format1b
=
"deltaF3"
;
pucch_deltaF_Format2
=
"deltaF0"
;
pucch_deltaF_Format2a
=
"deltaF0"
;
pucch_deltaF_Format2b
=
"deltaF0"
;
rach_numberOfRA_Preambles
=
64
;
rach_preamblesGroupAConfig
=
"DISABLE"
;
/*
rach_sizeOfRA_PreamblesGroupA
= ;
rach_messageSizeGroupA
= ;
rach_messagePowerOffsetGroupB
= ;
*/
rach_powerRampingStep
=
4
;
rach_preambleInitialReceivedTargetPower
= -
108
;
rach_preambleTransMax
=
10
;
rach_raResponseWindowSize
=
10
;
rach_macContentionResolutionTimer
=
48
;
rach_maxHARQ_Msg3Tx
=
4
;
pcch_default_PagingCycle
=
128
;
pcch_nB
=
"oneT"
;
bcch_modificationPeriodCoeff
=
2
;
ue_TimersAndConstants_t300
=
1000
;
ue_TimersAndConstants_t301
=
1000
;
ue_TimersAndConstants_t310
=
1000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
}
}
);
);
...
@@ -260,13 +178,13 @@ SSConfig = (
...
@@ -260,13 +178,13 @@ SSConfig = (
Vtp_port
=
7780
;
#Port Number for System Simulator VTP Port
Vtp_port
=
7780
;
#Port Number for System Simulator VTP Port
Drb_port
=
7781
;
#Port Number for System Simulator DRB Port
Drb_port
=
7781
;
#Port Number for System Simulator DRB Port
SysInd_port
=
7782
;
#Port Number for System Simulator SysIND Port
SysInd_port
=
7782
;
#Port Number for System Simulator SysIND Port
SSMode
=
0
;
#SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
SSMode
=
1
;
#SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
}
}
);
);
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
2
;
num_cc
=
1
;
local_s_if_name
=
"lo"
;
local_s_if_name
=
"lo"
;
remote_s_address
=
"127.0.0.1"
;
remote_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
...
...
nfapi/oai_integration/nfapi_vnf.c
View file @
c6f58152
...
@@ -214,7 +214,7 @@ void oai_create_enb(void) {
...
@@ -214,7 +214,7 @@ void oai_create_enb(void) {
eNB
->
CC_id
=
CC_id
;
eNB
->
CC_id
=
CC_id
;
eNB
->
abstraction_flag
=
0
;
eNB
->
abstraction_flag
=
0
;
eNB
->
single_thread_flag
=
0
;
//single_thread_flag;
eNB
->
single_thread_flag
=
0
;
//single_thread_flag;
RC
.
nb_CC
[
CC_id
]
=
2
;
RC
.
nb_CC
[
CC_id
]
=
MAX_NUM_CCs
;
if
(
eNB
->
if_inst
==
0
)
{
if
(
eNB
->
if_inst
==
0
)
{
eNB
->
if_inst
=
IF_Module_init
(
bodge_counter
);
eNB
->
if_inst
=
IF_Module_init
(
bodge_counter
);
...
...
openair2/PHY_INTERFACE/IF_Module.c
View file @
c6f58152
...
@@ -756,37 +756,38 @@ void UL_indication(UL_IND_t *UL_info, void *proc) {
...
@@ -756,37 +756,38 @@ void UL_indication(UL_IND_t *UL_info, void *proc) {
eNB_dlsch_ulsch_scheduler
(
module_id
,
eNB_dlsch_ulsch_scheduler
(
module_id
,
(
UL_info
->
frame
+
((
UL_info
->
subframe
>
(
9
-
sf_ahead
))
?
1
:
0
))
%
1024
,
(
UL_info
->
frame
+
((
UL_info
->
subframe
>
(
9
-
sf_ahead
))
?
1
:
0
))
%
1024
,
(
UL_info
->
subframe
+
sf_ahead
)
%
10
);
(
UL_info
->
subframe
+
sf_ahead
)
%
10
);
ifi
->
CC_mask
=
0
;
for
(
int
CC_Id
=
0
;
CC_Id
<
MAX_NUM_CCs
;
CC_Id
++
)
{
sched_info
->
module_id
=
module_id
;
ifi
->
CC_mask
=
0
;
sched_info
->
CC_id
=
CC_id
;
sched_info
->
module_id
=
module_id
;
sched_info
->
frame
=
(
UL_info
->
frame
+
((
UL_info
->
subframe
>
(
9
-
sf_ahead
))
?
1
:
0
))
%
1024
;
sched_info
->
CC_id
=
CC_Id
;
sched_info
->
subframe
=
(
UL_info
->
subframe
+
sf_ahead
)
%
10
;
sched_info
->
frame
=
(
UL_info
->
frame
+
((
UL_info
->
subframe
>
(
9
-
sf_ahead
))
?
1
:
0
))
%
1024
;
sched_info
->
DL_req
=
&
mac
->
DL_req
[
CC_id
];
sched_info
->
subframe
=
(
UL_info
->
subframe
+
sf_ahead
)
%
10
;
sched_info
->
HI_DCI0_req
=
&
mac
->
HI_DCI0_req
[
CC_id
][
sched_info
->
subframe
];
sched_info
->
DL_req
=
&
mac
->
DL_req
[
CC_Id
];
sched_info
->
HI_DCI0_req
=
&
mac
->
HI_DCI0_req
[
CC_Id
][
sched_info
->
subframe
];
if
((
mac
->
common_channels
[
CC_id
].
tdd_Config
==
NULL
)
||
(
is_UL_sf
(
&
mac
->
common_channels
[
CC_id
],
sched_info
->
subframe
)
>
0
))
if
((
mac
->
common_channels
[
CC_Id
].
tdd_Config
==
NULL
)
||
sched_info
->
UL_req
=
&
mac
->
UL_req
[
CC_id
];
(
is_UL_sf
(
&
mac
->
common_channels
[
CC_Id
],
sched_info
->
subframe
)
>
0
))
else
sched_info
->
UL_req
=
&
mac
->
UL_req
[
CC_Id
];
sched_info
->
UL_req
=
NULL
;
else
sched_info
->
UL_req
=
NULL
;
sched_info
->
TX_req
=
&
mac
->
TX_req
[
CC_id
];
pthread_mutex_lock
(
&
lock_ue_freelist
);
sched_info
->
TX_req
=
&
mac
->
TX_req
[
CC_Id
];
sched_info
->
UE_release_req
=
&
mac
->
UE_release_req
;
pthread_mutex_lock
(
&
lock_ue_freelist
);
pthread_mutex_unlock
(
&
lock_ue_freelist
);
sched_info
->
UE_release_req
=
&
mac
->
UE_release_req
;
pthread_mutex_unlock
(
&
lock_ue_freelist
);
#ifdef DUMP_FAPI
#ifdef DUMP_FAPI
dump_dl
(
sched_info
);
dump_dl
(
sched_info
);
#endif
#endif
if
(
ifi
->
schedule_response
)
{
if
(
ifi
->
schedule_response
)
{
AssertFatal
(
ifi
->
schedule_response
!=
NULL
,
AssertFatal
(
ifi
->
schedule_response
!=
NULL
,
"schedule_response is null (mod %d, cc %d)
\n
"
,
"schedule_response is null (mod %d, cc %d)
\n
"
,
module_id
,
module_id
,
CC_id
);
CC_Id
);
ifi
->
schedule_response
(
sched_info
,
proc
);
ifi
->
schedule_response
(
sched_info
,
proc
);
}
LOG_D
(
PHY
,
"Schedule_response: SFN_SF:%d%d dl_pdus:%d CC_id: %d
\n
"
,
sched_info
->
frame
,
sched_info
->
subframe
,
sched_info
->
DL_req
->
dl_config_request_body
.
number_pdu
,
sched_info
->
CC_id
);
}
}
LOG_D
(
PHY
,
"Schedule_response: SFN_SF:%d%d dl_pdus:%d
\n
"
,
sched_info
->
frame
,
sched_info
->
subframe
,
sched_info
->
DL_req
->
dl_config_request_body
.
number_pdu
);
}
}
}
}
}
}
...
...
targets/RT/USER/lte-enb.c
View file @
c6f58152
...
@@ -310,7 +310,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
...
@@ -310,7 +310,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
<
2
;
CC_id
++
)
{
for
(
int
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
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
,
proc
);
eNB
->
if_inst
->
UL_indication
(
&
eNB
->
UL_INFO
,
proc
);
...
...
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