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
85672239
Commit
85672239
authored
Nov 28, 2017
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
random access procedure succeeded. UE connected in frequency
parent
4480ed0f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+1
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+3
-1
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+1
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+0
-2
targets/SIMU/USER/channel_sim.c
targets/SIMU/USER/channel_sim.c
+5
-5
targets/SIMU/USER/oaisim_functions.c
targets/SIMU/USER/oaisim_functions.c
+2
-2
No files found.
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
85672239
...
...
@@ -56,7 +56,7 @@ void send_IF4p5(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type
uint16_t
symbol_id
=
0
,
element_id
=
0
;
uint16_t
db_fulllength
,
db_halflength
;
int
slotoffsetF
=
0
,
blockoffsetF
=
0
;
write_output
(
"sendif405_rxsigF_UL.m"
,
"sendif4p5_rxsF_UL"
,
rxdataF
[
0
],
2
*
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
,
1
,
16
);
write_output
(
"sendif405_rxsigF_UL.m"
,
"sendif4p5_rxsF_UL"
,
rxdataF
[
0
],
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
,
1
,
16
);
write_output
(
"sendif405_txsigF_UL.m"
,
"sendif4p5_txsF_UL"
,
&
PHY_vars_UE_g
[
0
][
0
]
->
common_vars
.
txdataF
[
0
][
0
],
10
*
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
,
1
,
16
);
for
(
int
idx
=
0
;
idx
<
10
;
idx
++
)
printf
(
"dumping UL raw rx send_if4p5 subframe %d: rxdataF[%d] = (%d,%d)
\n
"
,
subframe
,
idx
,
((
short
*
)
&
rxdataF
[
0
][
idx
])[
0
],
((
short
*
)
&
rxdataF
[
0
][
idx
])[
1
]);
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
85672239
...
...
@@ -2814,7 +2814,8 @@ void eNB_fep_full(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc_rxtx) {
start_fh_prev_sf
=
start_fh_sf
;
clock_gettime
(
CLOCK_MONOTONIC
,
&
start_fh
);
start_fh_sf
=
proc_rxtx
->
subframe_rx
;
}
}
}
void
eNB_fep_rru_if5
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc_rxtx
)
{
...
...
@@ -2891,6 +2892,7 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc){
if
(
eNB
->
node_function
==
NGFI_RRU_IF4p5
)
{
/// **** in TDD during DL send_IF4 of ULTICK to RCC **** ///
LOG_D
(
PHY
,
"send_IF4p5 (phy_procedures_eNB_common_RX): frame %d, subframe %d
\n
"
,
proc
->
frame_rx
,
proc
->
subframe_rx
);
send_IF4p5
(
eNB
,
proc
->
frame_rx
,
proc
->
subframe_rx
,
IF4p5_PULTICK
,
0
);
}
return
;
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
85672239
...
...
@@ -2892,7 +2892,7 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin
int
frame_rx
=
proc
->
frame_rx
;
int
subframe_rx
=
proc
->
subframe_rx
;
printf
(
"pbch0_before. ue->proc->frame_rx %d, ue->subframe_rx %d, enb->proc->frame_tx %d, enb->subframe_tx %d
\n
"
,
ue
->
proc
.
proc_rxtx
[
0
].
frame_rx
,
ue
->
proc
.
proc_rxtx
[
0
].
subframe_rx
,
PHY_vars_eNB_g
[
eNB_id
][
0
]
->
proc
.
proc_rxtx
[
0
].
frame_tx
,
PHY_vars_eNB_g
[
eNB_id
][
0
]
->
proc
.
proc_rxtx
[
0
].
subframe_tx
);
printf
(
"pbch1_before. ue->proc->frame_rx %d, ue->subframe_rx %d, enb->proc->frame_tx %d, enb->subframe_tx %d
\n
"
,
ue
->
proc
.
proc_rxtx
[
1
].
frame_rx
,
ue
->
proc
.
proc_rxtx
[
1
].
subframe_rx
,
PHY_vars_eNB_g
[
eNB_id
][
0
]
->
proc
.
proc_rxtx
[
0
].
frame_tx
,
PHY_vars_eNB_g
[
eNB_id
][
0
]
->
proc
.
proc_rxtx
[
0
].
subframe_tx
);
printf
(
"pbch1_before. ue->proc->frame_rx %d, ue->subframe_rx %d, enb->proc->frame_tx %d, enb->subframe_tx %d
\n
"
,
ue
->
proc
.
proc_rxtx
[
1
].
frame_rx
,
ue
->
proc
.
proc_rxtx
[
1
].
subframe_rx
,
PHY_vars_eNB_g
[
eNB_id
][
0
]
->
proc
.
proc_rxtx
[
1
].
frame_tx
,
PHY_vars_eNB_g
[
eNB_id
][
0
]
->
proc
.
proc_rxtx
[
1
].
subframe_tx
);
printf
(
"pbch0_after. ue->proc->frame_rx %d, ue->subframe_rx %d, enb->proc->frame_tx %d, enb->subframe_tx %d
\n
"
,
ue
->
proc
.
proc_rxtx
[
0
].
frame_rx
,
ue
->
proc
.
proc_rxtx
[
0
].
subframe_rx
,
PHY_vars_eNB_g
[
0
][
0
]
->
proc
.
proc_rxtx
[
0
].
frame_tx
,
PHY_vars_eNB_g
[
0
][
0
]
->
proc
.
proc_rxtx
[
0
].
subframe_tx
);
printf
(
"pbch1_after. ue->proc->frame_rx %d, ue->subframe_rx %d, enb->proc->frame_tx %d, enb->subframe_tx %d
\n
"
,
ue
->
proc
.
proc_rxtx
[
1
].
frame_rx
,
ue
->
proc
.
proc_rxtx
[
1
].
subframe_rx
,
PHY_vars_eNB_g
[
0
][
0
]
->
proc
.
proc_rxtx
[
1
].
frame_tx
,
PHY_vars_eNB_g
[
0
][
0
]
->
proc
.
proc_rxtx
[
1
].
subframe_tx
);
...
...
targets/RT/USER/lte-ue.c
View file @
85672239
...
...
@@ -1299,12 +1299,10 @@ void *UE_thread_freq(void *arg) {
UE
->
frame_parms
.
ofdm_symbol_size
,
UE
->
frame_parms
.
nb_antennas_rx
),
""
);
slot_fep_freq
(
UE
,
0
,
0
,
0
,
0
,
0
);
printf
(
"slot_fep_freq in lte_ue (if)
\n
"
);
}
//UE->mode != loop_through_memory
else
{
rt_sleep_ns
(
1000
*
1000
);
printf
(
"slot_fep_freq in lte_ue (else)
\n
"
);
}
}
else
{
...
...
targets/SIMU/USER/channel_sim.c
View file @
85672239
...
...
@@ -584,8 +584,8 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
12
);
//for (int idx=0;idx<10;idx++) printf("dumping DL raw rx subframe %d: rxdataF[%d] = (%d,%d)=====>%s\n", subframe, idx, ((short*)&rxdataF[0][sf_offset+idx])[0], ((short*)&rxdataF[0][sf_offset+idx])[1],(((((r_re_p_f[0][idx]<0)&&(((short*)&rxdataF[0][sf_offset+idx])[0]<0))||((r_re_p_f[0][idx]>=0)&&(((short*)&rxdataF[0][sf_offset+idx])[0]>=0))))&&(((r_im_p_f[0][idx]<0)&&(((short*)&rxdataF[0][sf_offset+idx])[1]<0))||((r_im_p_f[0][idx]>=0)&&(((short*)&rxdataF[0][sf_offset+idx])[1]>=0))))?"OK":"ERROR");
write_output
(
"chsim_rxsigF_frame0.m"
,
"chsm_rxsF0"
,
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
common_vars
.
common_vars_rx_data_per_thread
[
0
].
rxdataF
[
0
],
10
*
frame_parms
->
ofdm_symbol_size
*
frame_parms
->
symbols_per_tti
,
1
,
16
);
write_output
(
"chsim_rxsigF_frame1.m"
,
"chsm_rxsF1"
,
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
common_vars
.
common_vars_rx_data_per_thread
[
1
].
rxdataF
[
0
],
10
*
frame_parms
->
ofdm_symbol_size
*
frame_parms
->
symbols_per_tti
,
1
,
16
);
//
write_output("chsim_rxsigF_frame0.m","chsm_rxsF0", PHY_vars_UE_g[UE_id][CC_id]->common_vars.common_vars_rx_data_per_thread[0].rxdataF[0],10*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,1,16);
//
write_output("chsim_rxsigF_frame1.m","chsm_rxsF1", PHY_vars_UE_g[UE_id][CC_id]->common_vars.common_vars_rx_data_per_thread[1].rxdataF[0],10*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,1,16);
#ifdef DEBUG_SIM
rx_pwr2
=
signal_energy
((
rxdataF
[
0
])
+
sf_offset
,
frame_parms
->
ofdm_symbol_size
)
/
(
12
.
0
*
frame_parms
->
N_RB_DL
);
...
...
@@ -958,7 +958,7 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
if (((short*)&txdataF[0][idx])[0]!=0 || ((short*)&txdataF[0][idx])[1]!=0)
printf("dumping raw UL tx subframe (output) %d: r_re0_f[%d] = (%f,%f)\n", subframe, idx, r_re0_f[0][idx-subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti],r_im0_f[0][idx-subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti]);
}*/
write_output
(
"chsim_r_re0_f_UL.m"
,
"chsim_rre0f_UL.m"
,
r_re0_f
,
frame_parms
->
ofdm_symbol_size
*
frame_parms
->
symbols_per_tti
,
1
,
16
);
//
write_output("chsim_r_re0_f_UL.m","chsim_rre0f_UL.m", r_re0_f,frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,1,16);
rx_pwr
=
signal_energy_fp2
(
UE2eNB
[
UE_id
][
eNB_id
][
CC_id
]
->
ch
[
0
],
UE2eNB
[
UE_id
][
eNB_id
][
CC_id
]
->
channel_length
)
*
UE2eNB
[
UE_id
][
eNB_id
][
CC_id
]
->
channel_length
;
#ifdef DEBUG_SIM
...
...
@@ -1206,7 +1206,7 @@ void do_UL_sig_freq_prach(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB
if (((short*)&txdataF[0][idx])[0]!=0 || ((short*)&txdataF[0][idx])[1]!=0)
printf("dumping UL raw subframet %d: txdataF[%d] = (%d,%d)\n", subframe, idx, ((short*)&txdataF[0][idx])[0], ((short*)&txdataF[0][idx])[1]);
}*/
write_output
(
"chsim_txsigF_UL.m"
,
"chsm_txsF_UL"
,
&
txdataF
[
0
][
0
],
10
*
frame_parms
->
ofdm_symbol_size
*
frame_parms
->
symbols_per_tti
,
1
,
16
);
//
write_output("chsim_txsigF_UL.m","chsm_txsF_UL", &txdataF[0][0],10*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,1,16);
if
(((
double
)
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
tx_power_dBm
[
subframe
]
+
UE2eNB
[
UE_id
][
eNB_id
][
CC_id
]
->
path_loss_dB
)
<=
-
125
.
0
)
{
...
...
@@ -1573,7 +1573,7 @@ void do_UL_prach(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][MAX
nb_antennas_rx
,
(
prach_fmt
<
4
)
?
839
:
139
,
12
);
write_output
(
"chsim_rxsigF.m"
,
"chsim_rx_sigF"
,
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
prach_vars
.
rxsigF
[
0
],
4
*
frame_parms
->
ofdm_symbol_size
*
frame_parms
->
symbols_per_tti
,
1
,
16
);
//
write_output("chsim_rxsigF.m","chsim_rx_sigF", PHY_vars_eNB_g[eNB_id][CC_id]->prach_vars.rxsigF[0],4*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,1,16);
#ifdef DEBUG_SIM
//rx_pwr2 = signal_energy(rxdataF[0]+sf_offset,subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti)*(double)frame_parms->ofdm_symbol_size/(12.0*frame_parms->N_RB_DL);
...
...
targets/SIMU/USER/oaisim_functions.c
View file @
85672239
...
...
@@ -1124,7 +1124,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
do_UL_sig_freq
(
UE2eNB
,
enb_data
,
ue_data
,
subframe
,
(
subframe
-
1
<
0
)
?
9
:
subframe
-
1
,
0
,
// abstraction_flag
&
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
,
0
,
// frame is only used for abstraction
...
...
@@ -1355,7 +1355,7 @@ void init_devices(void){
if
(
PHY_vars_UE_g
[
0
][
0
]
->
do_ofdm_mod
)
current_eNB_rx_timestamp
[
eNB_id
][
CC_id
]
=
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
ofdm_symbol_size
*
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
symbols_per_tti
;
else
current_eNB_rx_timestamp
[
eNB_id
][
CC_id
]
=
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
samples_per_tti
;
current_eNB_rx_timestamp
[
eNB_id
][
CC_id
]
=
PHY_vars_eNB_g
[
eNB_id
][
CC_id
]
->
frame_parms
.
samples_per_tti
;
last_eNB_rx_timestamp
[
eNB_id
][
CC_id
]
=
0
;
}
for
(
UE_id
=
0
;
UE_id
<
NB_UE_INST
;
UE_id
++
)
{
...
...
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