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
promise
OpenXG-RAN
Commits
5bbb3ecf
Commit
5bbb3ecf
authored
Jan 26, 2019
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New configuration files for 2RRUs and 3RRUs
parent
6f691176
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
982 additions
and
31 deletions
+982
-31
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+4
-4
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
+1
-1
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+2
-2
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/prach.c
+1
-1
openair1/SCHED/phy_procedures_lte_common.c
openair1/SCHED/phy_procedures_lte_common.c
+1
-1
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+5
-5
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+9
-9
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+1
-1
openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.2RRUs.conf
...-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.2RRUs.conf
+382
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.3RRUs.conf
...-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.3RRUs.conf
+570
-0
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
targets/SIMU/USER/Makefile
targets/SIMU/USER/Makefile
+2
-3
No files found.
openair1/PHY/INIT/lte_init.c
View file @
5bbb3ecf
...
...
@@ -520,7 +520,7 @@ void phy_config_afterHO_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_id, Mobility
(
void
*
)
&
PHY_vars_UE_g
[
Mod_id
][
CC_id
]
->
frame_parms
,
sizeof
(
LTE_DL_FRAME_PARMS
));
PHY_vars_UE_g
[
Mod_id
][
CC_id
]
->
ho_triggered
=
1
;
//PHY_vars_UE_g[UE_id]->UE_mode[
0
] = PRACH;
//PHY_vars_UE_g[UE_id]->UE_mode[
eNB_id
] = PRACH;
LTE_DL_FRAME_PARMS
*
fp
=
&
PHY_vars_UE_g
[
Mod_id
][
CC_id
]
->
frame_parms
;
// int N_ZC;
...
...
@@ -763,7 +763,7 @@ void phy_config_harq_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
void
phy_config_dedicated_ue
(
uint8_t
Mod_id
,
int
CC_id
,
uint8_t
eNB_id
,
struct
PhysicalConfigDedicated
*
physicalConfigDedicated
)
{
printf
(
"phy_config_dedicated_ue: eNB_id %d
\n
"
,
eNB_id
);
static
uint8_t
first_dedicated_configuration
=
0
;
PHY_VARS_UE
*
phy_vars_ue
=
PHY_vars_UE_g
[
Mod_id
][
CC_id
];
...
...
@@ -1106,7 +1106,7 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
{
current_thread_id
[
i
]
=
i
%
2
;
ue
->
current_thread_id
[
i
]
=
i
%
2
;
printf
(
"
ue->Mod_id
%d, thread %d = %d
\n
"
,
ue
->
Mod_id
,
i
,
ue
->
current_thread_id
[
i
]);
printf
(
"
UE
%d, thread %d = %d
\n
"
,
ue
->
Mod_id
,
i
,
ue
->
current_thread_id
[
i
]);
}
printf
(
"Initializing UE vars (abstraction %"
PRIu8
") for eNB TXant %"
PRIu8
", UE RXant %"
PRIu8
"
\n
"
,
abstraction_flag
,
fp
->
nb_antennas_tx
,
fp
->
nb_antennas_rx
);
LOG_D
(
PHY
,
"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]
\n
"
,
ue
->
Mod_id
+
NB_eNB_INST
);
...
...
@@ -1138,7 +1138,7 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
}
ue
->
n_connected_eNB
=
nb_connected_eNB
;
//
printf("lte_init: n_connected_eNB = %d,%d\n",ue->n_connected_eNB,nb_connected_eNB);
printf
(
"lte_init: n_connected_eNB = %d,%d
\n
"
,
ue
->
n_connected_eNB
,
nb_connected_eNB
);
for
(
eNB_id
=
0
;
eNB_id
<
ue
->
n_connected_eNB
;
eNB_id
++
)
{
ue
->
total_TBS
[
eNB_id
]
=
0
;
ue
->
total_TBS_last
[
eNB_id
]
=
0
;
...
...
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
View file @
5bbb3ecf
...
...
@@ -38,7 +38,7 @@ void lte_adjust_synch(LTE_DL_FRAME_PARMS *frame_parms,
unsigned
char
clear
,
short
coef
)
{
printf
(
"lte_adjust_synch: eNB %d, UE %d
\n
"
,
eNB_id
,
ue
->
Mod_id
);
//
printf("lte_adjust_synch: eNB %d, UE %d\n",eNB_id,ue->Mod_id);
static
int
max_pos_fil
=
0
;
static
int
count_max_pos_ok
=
0
;
static
int
first_time
=
1
;
...
...
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
5bbb3ecf
...
...
@@ -144,10 +144,10 @@ void send_IF4p5(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF
,
1
);
LOG_D
(
PHY
,
"IF4p5_PULFFT: frame %d, subframe %d, symbol %d
\n
"
,
frame
,
subframe
,
symbol_id
);
for
(
element_id
=
0
;
element_id
<
db_halflength
;
element_id
++
)
{
i
=
(
uint16_t
*
)
&
rxdataF
[
eNB
->
CC_id
][
blockoffsetF
+
element_id
];
i
=
(
uint16_t
*
)
&
rxdataF
[
0
][
blockoffsetF
+
element_id
];
data_block
[
element_id
]
=
((
uint16_t
)
lin2alaw_if4p5
[
*
i
])
|
((
uint16_t
)(
lin2alaw_if4p5
[
*
(
i
+
1
)]
<<
8
));
i
=
(
uint16_t
*
)
&
rxdataF
[
eNB
->
CC_id
][
slotoffsetF
+
element_id
];
i
=
(
uint16_t
*
)
&
rxdataF
[
0
][
slotoffsetF
+
element_id
];
data_block
[
element_id
+
db_halflength
]
=
((
uint16_t
)
lin2alaw_if4p5
[
*
i
])
|
((
uint16_t
)(
lin2alaw_if4p5
[
*
(
i
+
1
)]
<<
8
));
//if (element_id==0) LOG_I(PHY,"send_if4p5: symbol %d rxdata0 = (%d,%d)\n",symbol_id,*i,*(i+1));
...
...
openair1/PHY/LTE_TRANSPORT/prach.c
View file @
5bbb3ecf
...
...
@@ -2163,7 +2163,7 @@ void rx_prach_freq(PHY_VARS_eNB *eNB,
int16_t
levdB
;
int
fft_size
,
log2_ifft_size
;
uint8_t
nb_ant_rx
=
1
;
//eNB->frame_parms.nb_antennas_rx;
//printf("rx_prach_freq: eNB %d, CC %d\n",eNB->Mod_id, eNB->CC_id);
/*for (aa=0; aa<nb_ant_rx; aa++) {
prach[aa] = (int16_t*)&eNB->common_vars.rxdata[0][aa][subframe*eNB->frame_parms.samples_per_tti-eNB->N_TA_offset];
}*/
...
...
openair1/SCHED/phy_procedures_lte_common.c
View file @
5bbb3ecf
...
...
@@ -1090,7 +1090,7 @@ int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *eNB)
uint8_t
i
;
for
(
i
=
0
;
i
<
NUMBER_OF_UE_MAX
;
i
++
)
{
printf
(
"eNB->dlsch[i] %d, eNB->dlsch[i][0] %d, eNB->dlsch[i][0]->rnti %d, rnti %d
\n
"
,
eNB
->
dlsch
[
i
],
eNB
->
dlsch
[
i
][
0
],
eNB
->
dlsch
[
i
][
0
]
->
rnti
,
rnti
);
//
printf("eNB->dlsch[i] %d, eNB->dlsch[i][0] %d, eNB->dlsch[i][0]->rnti %d, rnti %d\n",eNB->dlsch[i],eNB->dlsch[i][0],eNB->dlsch[i][0]->rnti,rnti);
if
((
eNB
->
dlsch
[
i
])
&&
(
eNB
->
dlsch
[
i
][
0
])
&&
(
eNB
->
dlsch
[
i
][
0
]
->
rnti
==
rnti
))
{
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
5bbb3ecf
...
...
@@ -1428,7 +1428,7 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
frame_tx
,
eNB_id
,
subframe_tx
);
LOG_D
(
PHY
,
"Got prach_resources for eNB %d address %p, RRCCommon %p
\n
"
,
eNB
_id
,
ue
->
prach_resources
[
eNB_id
],
UE_mac_inst
[
ue
->
Mod_id
].
radioResourceConfigCommon
);
LOG_D
(
PHY
,
"Got prach_resources for eNB %d address %p, RRCCommon %p
\n
"
,
/*eNB_id*/
ue
->
common_vars
.
eNb
_id
,
ue
->
prach_resources
[
eNB_id
],
UE_mac_inst
[
ue
->
Mod_id
].
radioResourceConfigCommon
);
LOG_D
(
PHY
,
"Prach resources %p
\n
"
,
ue
->
prach_resources
[
eNB_id
]);
//printf("Got prach_resources for eNB %d address %p, RRCCommon %p\n",ue->common_vars.eNb_id,ue->prach_resources[eNB_id],UE_mac_inst[ue->Mod_id].radioResourceConfigCommon);
//printf("Prach resources %p\n",ue->prach_resources[eNB_id]);
...
...
@@ -1514,8 +1514,8 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
eNB_id
);
//not necessary to change
}
LOG_I
(
PHY
,
"[UE %d][RAPROC] Frame %d, subframe %d: Generating PRACH (eNB %d
(ue->common_vars.eNb_id %d)
) preamble index %d for UL, TX power %d dBm (PL %d dB), l3msg
\n
"
,
ue
->
Mod_id
,
frame_tx
,
subframe_tx
,
eNB_id
,
ue
->
common_vars
.
eNb_id
,
LOG_I
(
PHY
,
"[UE %d][RAPROC] Frame %d, subframe %d: Generating PRACH (eNB %d) preamble index %d for UL, TX power %d dBm (PL %d dB), l3msg
\n
"
,
ue
->
Mod_id
,
frame_tx
,
subframe_tx
,
ue
->
common_vars
.
eNb_id
,
ue
->
prach_resources
[
eNB_id
]
->
ra_PreambleIndex
,
ue
->
prach_resources
[
eNB_id
]
->
ra_PREAMBLE_RECEIVED_TARGET_POWER
+
get_PL
(
ue
->
Mod_id
,
ue
->
CC_id
,
eNB_id
),
get_PL
(
ue
->
Mod_id
,
ue
->
CC_id
,
eNB_id
));
...
...
@@ -2547,7 +2547,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
// check if we have PRACH opportunity
if
(
is_prach_subframe
(
&
ue
->
frame_parms
,
frame_tx
,
subframe_tx
))
{
//printf("is there a PRACH opportunity? %d\n",is_prach_subframe(&ue->frame_parms,frame_tx,subframe_tx)
);
printf
(
"prach_procedures: eNB_id %d, ue-eNB_id %d
\n
"
,
eNB_id
,
ue
->
common_vars
.
eNb_id
);
ue_prach_procedures
(
ue
,
proc
,
eNB_id
,
abstraction_flag
,
mode
);
}
}
// mode is PRACH
...
...
@@ -5240,7 +5240,7 @@ else
if
(
do_pdcch_flag
)
{
if
((
l
==
pilot1
)
||
((
pmch_flag
==
1
)
&
(
l
==
l2
)))
{
LOG_D
(
PHY
,
"[UE %d] Frame %d: Calling pdcch procedures (eNB %d)
\n
"
,
ue
->
Mod_id
,
frame_rx
,
eNB
_id
);
LOG_D
(
PHY
,
"[UE %d] Frame %d: Calling pdcch procedures (eNB %d)
\n
"
,
ue
->
Mod_id
,
frame_rx
,
/*eNB_id*/
ue
->
common_vars
.
eNb
_id
);
//start_meas(&ue->rx_pdcch_stats[ue->current_thread_id[subframe_rx]]);
if
(
ue_pdcch_procedures
(
eNB_id
,
ue
,
proc
,
abstraction_flag
)
==
-
1
)
{
/*eNB_id=0*/
...
...
openair2/LAYER2/MAC/ue_procedures.c
View file @
5bbb3ecf
...
...
@@ -465,7 +465,7 @@ ue_send_sdu(
//printf("1\n");
}
else
if
((
rx_lcids
[
i
]
==
DCCH
)
||
(
rx_lcids
[
i
]
==
DCCH1
))
{
LOG_D
(
MAC
,
"[UE %d] Frame %d : DLSCH -> DL-DCCH%d, RRC message (eNB %d, %d bytes)
\n
"
,
module_idP
,
frameP
,
rx_lcids
[
i
],
eNB_index
,
rx_lengths
[
i
]);
LOG_D
(
MAC
,
"[UE %d] Frame %d : DLSCH -> DL-DCCH%d, RRC message (eNB %d, %d bytes)
\n
"
,
module_idP
,
frameP
,
rx_lcids
[
i
],
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
,
rx_lengths
[
i
]);
mac_rlc_data_ind
(
module_idP
,
UE_mac_inst
[
module_idP
].
crnti
,
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
,
//changed
...
...
@@ -480,7 +480,7 @@ ue_send_sdu(
}
else
if
((
rx_lcids
[
i
]
<
NB_RB_MAX
)
&&
(
rx_lcids
[
i
]
>
DCCH1
))
{
LOG_D
(
MAC
,
"[UE %d] Frame %d : DLSCH -> DL-DTCH%d (eNB %d, %d bytes)
\n
"
,
module_idP
,
frameP
,
rx_lcids
[
i
],
eNB_index
,
rx_lengths
[
i
]);
LOG_D
(
MAC
,
"[UE %d] Frame %d : DLSCH -> DL-DTCH%d (eNB %d, %d bytes)
\n
"
,
module_idP
,
frameP
,
rx_lcids
[
i
],
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
,
rx_lengths
[
i
]);
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
int
j
;
...
...
@@ -500,7 +500,7 @@ ue_send_sdu(
1
,
NULL
);
}
else
{
LOG_E
(
MAC
,
"[UE %d] Frame %d : unknown LCID %d (eNB %d)
\n
"
,
module_idP
,
frameP
,
rx_lcids
[
i
],
eNB_index
);
LOG_E
(
MAC
,
"[UE %d] Frame %d : unknown LCID %d (eNB %d)
\n
"
,
module_idP
,
frameP
,
rx_lcids
[
i
],
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
);
}
payload_ptr
+=
rx_lengths
[
i
];
}
...
...
@@ -1428,12 +1428,12 @@ for (lcid=DCCH; (lcid < MAX_NUM_LCID) && (is_all_lcid_processed == FALSE) ; lcid
lcid_rlc_pdu_count
=
0
;
is_lcid_processed
=
FALSE
;
lcid_buffer_occupancy_old
=
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
UE_mac_inst
[
module_idP
].
crnti
,
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
);
UE_mac_inst
[
module_idP
].
crnti
,
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
);
lcid_buffer_occupancy_new
=
lcid_buffer_occupancy_old
;
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
5bbb3ecf
...
...
@@ -1103,7 +1103,7 @@ rrc_pdcp_config_asn1_req (
MBMS_SessionInfoList_r9_t
*
mbms_SessionInfoList_r9_p
=
NULL
;
MBMS_SessionInfo_r9_t
*
MBMS_SessionInfo_p
=
NULL
;
#endif
printf
(
"pdcp.c:ctxt_pP->module_id %d"
,
ctxt_pP
->
module_id
);
LOG_T
(
PDCP
,
PROTOCOL_CTXT_FMT
" %s() SRB2ADD %p DRB2ADD %p DRB2RELEASE %p
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
__FUNCTION__
,
...
...
openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
View file @
5bbb3ecf
...
...
@@ -161,7 +161,7 @@ UE2:
MSIN
=
"0100001113"
;
USIM_API_K
=
"8baf473f2f8fd09487cccbd7097c6862"
;
OPC
=
"e734f8734007d6c5ce7a0508809e7e9c"
;
MSISDN
=
"336
11123458
"
;
MSISDN
=
"336
38020003
"
;
};
# Home PLMN Selector with Access Technology
...
...
@@ -194,10 +194,10 @@ UE3:
};
SIM
: {
MSIN
=
"010000111
3
"
;
MSIN
=
"010000111
4
"
;
USIM_API_K
=
"8baf473f2f8fd09487cccbd7097c6862"
;
OPC
=
"e734f8734007d6c5ce7a0508809e7e9c"
;
MSISDN
=
"336
11123459
"
;
MSISDN
=
"336
38020004
"
;
};
# Home PLMN Selector with Access Technology
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.2RRUs.conf
0 → 100644
View file @
5bbb3ecf
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.3RRUs.conf
0 → 100644
View file @
5bbb3ecf
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-enb.c
View file @
5bbb3ecf
...
...
@@ -865,7 +865,7 @@ void fh_if4p5_asynch_DL(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
symbol_number
=
0
;
LOG_D
(
PHY
,
"fh_asynch_DL_IF4p5: in, frame %d, subframe %d
\n
"
,
*
frame
,
*
subframe
);
//printf("fh_if4p5_asynch_DL: frame_tx:eNB_id %d, frame %d, subframe %d\n",eNB->Mod_id,*frame,*subframe);
// correct for TDD
if
(
fp
->
frame_type
==
TDD
)
{
while
(
subframe_select
(
fp
,
*
subframe
)
==
SF_UL
)
{
...
...
targets/SIMU/USER/Makefile
View file @
5bbb3ecf
# Include some shared directives
include
$(OPENAIR_TARGETS)/Makerules
default
:
oaisim
include
$(OPENAIR_TARGETS)/Makefile.common
...
...
@@ -11,6 +10,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
OPENAIR3_TOP
=
$(OPENAIR3_DIR)
OPENAIR3
=
$(OPENAIR3_DIR)
CFLAGS
+=
-pg
ifeq
($(DEBUG),1)
CFLAGS
+=
-g
-ggdb
-DDEBUG_PHY
-DDEBUG_MEAS
CFLAGS
+=
-DRRC_MSG_PRINT
...
...
@@ -169,7 +169,6 @@ endif
ifdef
GPROF
CFLAGS
+=
-pg
endif
#require kernel patch for oai driver to enable address autoconfiguration (IPv6 only)
ifdef
ADDCONF
CFLAGS
+=
-DADDRCONF
...
...
@@ -198,7 +197,7 @@ LIBS += $(OPENSSL_LIBS) $(NETTLE_LIBS)
endif
endif
endif
CFLAGS
+=
-pg
include
$(OPENAIR1_DIR)/PHY/Makefile.inc
include
$(OPENAIR1_DIR)/SCHED/Makefile.inc
include
$(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc
...
...
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