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
2e577b91
Commit
2e577b91
authored
Feb 12, 2019
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
I will change eNB_id to all UE_rrc_inst
parent
f77d01bc
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
86 additions
and
26 deletions
+86
-26
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+1
-1
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/prach.c
+2
-2
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+1
-1
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+3
-3
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+1
-1
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+70
-13
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LITE/rrc_common.c
+2
-1
openair2/RRC/LITE/rrc_config.c
openair2/RRC/LITE/rrc_config.c
+1
-0
openair2/RRC/LITE/rrm_2_rrc_msg.c
openair2/RRC/LITE/rrm_2_rrc_msg.c
+1
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+1
-1
targets/SIMU/USER/channel_sim.c
targets/SIMU/USER/channel_sim.c
+1
-0
targets/SIMU/USER/oaisim_functions.c
targets/SIMU/USER/oaisim_functions.c
+2
-2
No files found.
openair1/PHY/INIT/lte_init.c
View file @
2e577b91
...
...
@@ -1116,7 +1116,7 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
AssertFatal
(
ue
->
n_connected_eNB
<=
NUMBER_OF_CONNECTED_eNB_MAX
,
"n_connected_eNB is too large"
);
// do_ofdm_mod for frequency analysis
int
do_ofdm_mod
=
ue
->
do_ofdm_mod
=
0
;
int
do_ofdm_mod
=
ue
->
do_ofdm_mod
=
1
;
if
(
do_ofdm_mod
==
0
)
{
...
...
openair1/PHY/LTE_TRANSPORT/prach.c
View file @
2e577b91
...
...
@@ -590,7 +590,7 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t su
int32_t
generate_prach
(
PHY_VARS_UE
*
ue
,
uint8_t
eNB_id
,
uint8_t
subframe
,
uint16_t
Nf
)
{
printf
(
"generate_prach: eNB_id %d, UE %d
\n
"
,
eNB_id
,
ue
->
Mod_id
);
lte_frame_type_t
frame_type
=
ue
->
frame_parms
.
frame_type
;
//uint8_t tdd_config = ue->frame_parms.tdd_config;
uint16_t
rootSequenceIndex
=
ue
->
frame_parms
.
prach_config_common
.
rootSequenceIndex
;
...
...
@@ -1092,7 +1092,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
}
int32_t
generate_prach_freq
(
PHY_VARS_UE
*
ue
,
uint8_t
eNB_id
,
uint8_t
subframe
,
uint16_t
Nf
)
{
printf
(
"generate_prach_freq: eNB_id %d, UE %d
\n
"
,
eNB_id
,
ue
->
Mod_id
);
lte_frame_type_t
frame_type
=
ue
->
frame_parms
.
frame_type
;
//uint8_t tdd_config = ue->frame_parms.tdd_config;
uint16_t
rootSequenceIndex
=
ue
->
frame_parms
.
prach_config_common
.
rootSequenceIndex
;
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
2e577b91
...
...
@@ -1997,7 +1997,7 @@ void prach_procedures(PHY_VARS_eNB *eNB) {
int
frame
=
eNB
->
proc
.
frame_prach
;
uint8_t
CC_id
=
eNB
->
CC_id
;
int
do_ofdm_mod
=
PHY_vars_UE_g
[
0
][
0
]
->
do_ofdm_mod
;
//printf("prach_procedures: eNB_id %d\n",eNB->Mod_id);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX
,
1
);
memset
(
&
preamble_energy_list
[
0
],
0
,
64
*
sizeof
(
uint16_t
));
memset
(
&
preamble_delay_list
[
0
],
0
,
64
*
sizeof
(
uint16_t
));
...
...
openair2/LAYER2/MAC/ue_procedures.c
View file @
2e577b91
...
...
@@ -1836,7 +1836,7 @@ ue_scheduler(
const
int
CC_id
)
//------------------------------------------------------------------------------
{
printf
(
"ue_scheduler: UE %d, eNB_indexp %d, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id %d
\n
"
,
module_idP
,
eNB_indexP
,
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
);
//
printf("ue_scheduler: UE %d, eNB_indexp %d, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id %d \n",module_idP,eNB_indexP,PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id);
int
lcid
;
// lcid index
int
TTI
=
1
;
int
bucketsizeduration
=
-
1
;
...
...
@@ -2029,7 +2029,7 @@ ue_scheduler(
}
//Check whether Regular BSR is triggered
if
(
update_bsr
(
module_idP
,
txFrameP
,
txSubframeP
,
eNB_indexP
)
==
TRUE
)
{
//eNB_indexP change inside the function, so it is not necessary to change
if
(
update_bsr
(
module_idP
,
txFrameP
,
txSubframeP
,
eNB_indexP
)
==
TRUE
)
{
//eNB_indexP change inside the function, so it is not necessary to change
here
// call SR procedure to generate pending SR and BSR for next PUCCH/PUSCH TxOp. This should implement the procedures
// outlined in Sections 5.4.4 an 5.4.5 of 36.321
UE_mac_inst
[
module_idP
].
scheduling_info
.
SR_pending
=
1
;
...
...
@@ -2074,7 +2074,7 @@ ue_scheduler(
//LOG_D(MAC,"PHR normal operation %d active %d \n", UE_mac_inst[module_idP].scheduling_info.periodicPHR_SF, UE_mac_inst[module_idP].PHR_reporting_active);
if
((
UE_mac_inst
[
module_idP
].
scheduling_info
.
prohibitPHR_SF
<=
0
)
&&
((
mac_xface
->
get_PL
(
module_idP
,
0
,
eNB_indexP
)
<
UE_mac_inst
[
module_idP
].
scheduling_info
.
PathlossChange_db
)
||
/*eNB_indexP=0*/
(
UE_mac_inst
[
module_idP
].
power_backoff_db
[
/*eNB_indexP*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
]
>
UE_mac_inst
[
module_idP
].
scheduling_info
.
PathlossChange_db
)))
(
UE_mac_inst
[
module_idP
].
power_backoff_db
[
eNB_indexP
/*PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id*/
]
>
UE_mac_inst
[
module_idP
].
scheduling_info
.
PathlossChange_db
)))
// trigger PHR and reset the timer later when the PHR report is sent
{
UE_mac_inst
[
module_idP
].
PHR_reporting_active
=
1
;
...
...
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
2e577b91
...
...
@@ -1233,7 +1233,7 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv)
#ifdef USER_MODE
LOG_D
(
RRC
,
"[UE] RRCConnectionRequest Encoded %d bits (%d bytes), ecause %d
\n
"
,
enc_rval
.
encoded
,(
enc_rval
.
encoded
+
7
)
/
8
,
ecause
);
#endif
printf
(
"[UE] RRCConnectionRequest Encoded %d bits (%d bytes), ecause %d
\n
"
,
enc_rval
.
encoded
,(
enc_rval
.
encoded
+
7
)
/
8
,
ecause
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
2e577b91
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/rrc_common.c
View file @
2e577b91
...
...
@@ -60,6 +60,7 @@ openair_rrc_on(
)
//-----------------------------------------------------------------------------
{
//ok
unsigned
short
i
;
int
CC_id
;
...
...
@@ -408,7 +409,7 @@ rrc_rx_tx(
//-----------------------------------------------------------------------------
{
//uint8_t UE_id;
printf
(
"rrc_rx_tx: enb_indexP %d
\n
"
,
enb_indexP
);
//printf("rrc_rx_tx: enb_indexP %d, ctxt_pP->module_id %d\n",enb_indexP,ctxt_pP->module_id
);
int32_t
current_timestamp_ms
,
ref_timestamp_ms
;
struct
timeval
ts
;
struct
rrc_eNB_ue_context_s
*
ue_context_p
=
NULL
,
*
ue_to_be_removed
=
NULL
;
...
...
openair2/RRC/LITE/rrc_config.c
View file @
2e577b91
...
...
@@ -102,6 +102,7 @@ void rrc_init_ch_req(unsigned char Mod_id, rrm_init_ch_req_t *smsg)
void
rrc_init_mr_req
(
unsigned
char
Mod_id
,
rrci_init_mr_req_t
*
smsg
)
{
//printf("UE_rrc_inst:\n");NOt
uint16_t
Index
;
MAC_CONFIG_REQ
Mac_config_req
;
// MAC_MEAS_REQ Mac_meas_req;
...
...
openair2/RRC/LITE/rrm_2_rrc_msg.c
View file @
2e577b91
...
...
@@ -63,7 +63,7 @@ extern UE_MAC_INST *UE_mac_inst;
void
fn_rrc
(
void
)
{
/******************************************************************************/
//printf("fn_rrc:\n");Not
msg_head_t
*
Header
;
#ifdef USER_MODE
char
*
Data
;
...
...
targets/RT/USER/lte-ue.c
View file @
2e577b91
...
...
@@ -841,7 +841,7 @@ static void *UE_thread_rxn_txnp4(void *arg) {
start_meas
(
&
UE
->
generic_stat
);
#endif
if
(
UE
->
mac_enabled
==
1
)
{
printf
(
"UE_thread_rxn_txnp4: eNB_id %d, common_vars.enb_id %d, UE %d
\n
"
,
0
,
PHY_vars_UE_g
[
UE
->
Mod_id
][
0
]
->
common_vars
.
eNb_id
,
UE
->
Mod_id
);
//
printf("UE_thread_rxn_txnp4: eNB_id %d, common_vars.enb_id %d, UE %d\n",0,PHY_vars_UE_g[UE->Mod_id][0]->common_vars.eNb_id,UE->Mod_id);
ret
=
mac_xface
->
ue_scheduler
(
UE
->
Mod_id
,
proc
->
frame_rx
,
proc
->
subframe_rx
,
...
...
targets/SIMU/USER/channel_sim.c
View file @
2e577b91
...
...
@@ -1431,6 +1431,7 @@ void do_UL_sig_freq_prach(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB
//for (int i=0;i<NB_UE_INST;i++)
// Compute RX signal for eNB = eNB_id
for
(
UE_id
=
0
;
UE_id
<
NB_UE_INST
;
UE_id
++
)
{
if
(
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
common_vars
.
eNb_id
!=
eNB_id
)
continue
;
lte_frame_type_t
frame_type
=
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
frame_parms
.
frame_type
;
prach_ConfigIndex
=
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
frame_parms
.
prach_config_common
.
prach_ConfigInfo
.
prach_ConfigIndex
;
prach_fmt
=
get_prach_fmt
(
prach_ConfigIndex
,
frame_type
);
...
...
targets/SIMU/USER/oaisim_functions.c
View file @
2e577b91
...
...
@@ -1066,6 +1066,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
//count++;
int
ret
=
nsamps
;
int
eNB_id
=
device
->
Mod_id
;
//printf("eNB_id %d\n",eNB_id);
int
CC_id
=
device
->
CC_id
;
int
UE_id
=
0
;
...
...
@@ -1130,8 +1131,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
if
(
do_ofdm_mod
)
{
for
(
UE_id
=
0
;
UE_id
<
NB_UE_INST
;
UE_id
++
){
if
(
eNB_id
!=
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
common_vars
.
eNb_id
)
continue
;
if
(
eNB_id
!=
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
common_vars
.
eNb_id
)
continue
;
if
(
is_prach_subframe
(
&
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
frame_parms
,
frame
,
subframe
)
&&
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
generate_prach
)
{
//clock_t start=clock();
...
...
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