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
alex037yang
OpenXG-RAN
Commits
4480ed0f
Commit
4480ed0f
authored
Nov 27, 2017
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing some UL channel issues
parent
3f358655
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
360 additions
and
17 deletions
+360
-17
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/prach.c
+0
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
...ENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
+1
-1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+8
-6
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+2
-2
targets/SIMU/USER/channel_sim.c
targets/SIMU/USER/channel_sim.c
+345
-7
targets/SIMU/USER/oaisim.h
targets/SIMU/USER/oaisim.h
+4
-0
No files found.
openair1/PHY/LTE_TRANSPORT/prach.c
View file @
4480ed0f
...
...
@@ -1782,7 +1782,6 @@ void rx_prach(PHY_VARS_eNB *eNB,
break
;
case
50
:
printf
(
"[prach.c] prach2 %x, +24576 %x
\n
"
,
prach2
,
prach2
+
24576
);
if
(
prach_fmt
==
4
)
{
dft2048
(
prach2
,
rxsigF
[
aa
],
1
);
//7.5Khz*2=15Khz-->2*1024=2048 PRACH subcarriers
}
else
{
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
View file @
4480ed0f
...
...
@@ -139,7 +139,7 @@ eNBs =
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"172.24.1
0.179
"
;
mme_ip_address
= ( {
ipv4
=
"172.24.1
1.201
"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
preference
=
"ipv4"
;
...
...
targets/RT/USER/lte-enb.c
View file @
4480ed0f
...
...
@@ -948,6 +948,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
lte_subframe_t
SF_type
=
subframe_select
(
fp
,(
proc
->
subframe_rx
+
tx_sfoffset
)
%
10
);
lte_subframe_t
prevSF_type
=
subframe_select
(
fp
,(
proc
->
subframe_rx
+
tx_sfoffset
+
9
)
%
10
);
lte_subframe_t
nextSF_type
=
subframe_select
(
fp
,(
proc
->
subframe_rx
+
tx_sfoffset
+
1
)
%
10
);
printf
(
"[lte-enb_time]frame %d, subframe %d
\n
"
,
*
frame
,
*
subframe
);
if
((
SF_type
==
SF_DL
)
||
(
SF_type
==
SF_S
))
{
...
...
@@ -1094,7 +1095,7 @@ void rx_rf_freq(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
lte_subframe_t
SF_type
=
subframe_select
(
fp
,(
proc
->
subframe_rx
%
10
));
lte_subframe_t
prevSF_type
=
subframe_select
(
fp
,(
proc
->
subframe_rx
+
9
)
%
10
);
lte_subframe_t
nextSF_type
=
subframe_select
(
fp
,(
proc
->
subframe_rx
+
1
)
%
10
);
printf
(
"[lte-enb]frame %d, subframe %d
\n
"
,
*
frame
,
*
subframe
);
printf
(
"[lte-enb
_freq
]frame %d, subframe %d
\n
"
,
*
frame
,
*
subframe
);
if
((
SF_type
==
SF_DL
)
||
(
SF_type
==
SF_S
))
{
...
...
@@ -1490,7 +1491,8 @@ void *eNB_thread_synch(void *arg) {
wait_sync
(
"eNB_thread_synch"
);
// initialize variables for PSS detection
lte_sync_time_init
(
&
eNB
->
frame_parms
);
if
(
!
do_ofdm_mod
)
lte_sync_time_init
(
&
eNB
->
frame_parms
);
while
(
!
oai_exit
)
{
...
...
@@ -1727,8 +1729,7 @@ static void* eNB_thread_single( void* param ) {
int
subframe
=
0
,
frame
=
0
;
int32_t
dummy_rx_freq
[
fp
->
nb_antennas_rx
][
fp
->
symbols_per_tti
*
fp
->
ofdm_symbol_size
]
__attribute__
((
aligned
(
32
)));
int32_t
dummy_rx
[
fp
->
nb_antennas_rx
][
fp
->
samples_per_tti
]
__attribute__
((
aligned
(
32
)));
int32_t
dummy_rx
[
fp
->
nb_antennas_rx
][(
do_ofdm_mod
)
?
fp
->
symbols_per_tti
*
fp
->
ofdm_symbol_size
:
fp
->
samples_per_tti
]
__attribute__
((
aligned
(
32
)));
int
ic
;
...
...
@@ -1824,7 +1825,7 @@ static void* eNB_thread_single( void* param ) {
// until we are done with the synchronization procedure
if
(
do_ofdm_mod
){
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
rxp2_freq
[
i
]
=
(
void
*
)
&
dummy_rx
_freq
[
i
][
0
];
rxp2_freq
[
i
]
=
(
void
*
)
&
dummy_rx
[
i
][
0
];
for
(
i
=
0
;
i
<
10
;
i
++
)
rxs_freq
=
eNB
->
rfdevice
.
trx_read_func
(
&
eNB
->
rfdevice
,
&
(
proc
->
timestamp_rx
),
...
...
@@ -1854,6 +1855,7 @@ static void* eNB_thread_single( void* param ) {
}
// ic>=0
}
// in_synch==0
// read in rx_offset samples
printf
(
"[lte-enb] rx_offset %d/n"
,
eNB
->
rx_offset
);
LOG_I
(
PHY
,
"Resynchronizing by %d samples
\n
"
,
eNB
->
rx_offset
);
if
(
do_ofdm_mod
){
rxs_freq
=
eNB
->
rfdevice
.
trx_read_func
(
&
eNB
->
rfdevice
,
...
...
@@ -1913,7 +1915,7 @@ static void* eNB_thread_single( void* param ) {
proc_rxtx
->
timestamp_tx
=
proc
->
timestamp_tx
;
// adjust for timing offset between RRU
if
(
eNB
->
CC_id
!=
0
)
proc_rxtx
->
frame_tx
=
(
proc_rxtx
->
frame_tx
+
proc
->
frame_offset
)
&
1023
;
printf
(
"[lte-enb] frame offset %d
\n
"
,
proc
->
frame_offset
);
// At this point, all information for subframe has been received on FH interface
// If this proc is to provide synchronization, do so
wakeup_slaves
(
proc
);
...
...
targets/RT/USER/lte-ue.c
View file @
4480ed0f
...
...
@@ -1389,8 +1389,8 @@ void *UE_thread_freq(void *arg) {
}
if
(
sub_frame
<
10
&&
((
proc
->
frame_rx
&
0x1
)
==
0
)){
write_output
(
"lteue_rxsigF_frame0.m"
,
"lteue_rxsF0"
,
UE
->
common_vars
.
common_vars_rx_data_per_thread
[
0
].
rxdataF
[
0
],
10
*
UE
->
frame_parms
.
ofdm_symbol_size
*
UE
->
frame_parms
.
symbols_per_tti
,
1
,
16
);
write_output
(
"lteue_rxsigF_frame1.m"
,
"lteue_rxsF1"
,
UE
->
common_vars
.
common_vars_rx_data_per_thread
[
1
].
rxdataF
[
0
],
10
*
UE
->
frame_parms
.
ofdm_symbol_size
*
UE
->
frame_parms
.
symbols_per_tti
,
1
,
16
);
//
write_output("lteue_rxsigF_frame0.m","lteue_rxsF0", UE->common_vars.common_vars_rx_data_per_thread[0].rxdataF[0],10*UE->frame_parms.ofdm_symbol_size*UE->frame_parms.symbols_per_tti,1,16);
//
write_output("lteue_rxsigF_frame1.m","lteue_rxsF1", UE->common_vars.common_vars_rx_data_per_thread[1].rxdataF[0],10*UE->frame_parms.ofdm_symbol_size*UE->frame_parms.symbols_per_tti,1,16);
//exit(-1);
}
//UE->proc.proc_rxtx[0].gotIQs=readTime(gotIQs);
...
...
targets/SIMU/USER/channel_sim.c
View file @
4480ed0f
This diff is collapsed.
Click to expand it.
targets/SIMU/USER/oaisim.h
View file @
4480ed0f
...
...
@@ -51,6 +51,10 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
node_desc_t
*
enb_data
[
NUMBER_OF_eNB_MAX
],
node_desc_t
*
ue_data
[
NUMBER_OF_UE_MAX
],
uint16_t
subframe
,
uint8_t
abstraction_flag
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
uint32_t
frame
,
int
eNB_id
,
uint8_t
CC_id
);
void
do_UL_sig_freq_prach
(
channel_desc_t
*
UE2eNB
[
NUMBER_OF_UE_MAX
][
NUMBER_OF_eNB_MAX
][
MAX_NUM_CCs
],
node_desc_t
*
enb_data
[
NUMBER_OF_eNB_MAX
],
node_desc_t
*
ue_data
[
NUMBER_OF_UE_MAX
],
uint16_t
subframe
,
uint8_t
abstraction_flag
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
uint32_t
frame
,
int
eNB_id
,
uint8_t
CC_id
);
void
do_UL_prach
(
channel_desc_t
*
UE2eNB
[
NUMBER_OF_UE_MAX
][
NUMBER_OF_eNB_MAX
][
MAX_NUM_CCs
],
node_desc_t
*
enb_data
[
NUMBER_OF_eNB_MAX
],
node_desc_t
*
ue_data
[
NUMBER_OF_UE_MAX
],
uint16_t
subframe
,
uint8_t
abstraction_flag
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
...
...
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