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
常顺宇
OpenXG-RAN
Commits
dc931f87
Commit
dc931f87
authored
Nov 13, 2017
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
message4 uplink
parent
59b0b394
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
46 additions
and
36 deletions
+46
-36
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci.c
+1
-1
openair1/PHY/LTE_TRANSPORT/drs_modulation.c
openair1/PHY/LTE_TRANSPORT/drs_modulation.c
+1
-0
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+4
-4
openair1/SIMULATION/RF/dac.c
openair1/SIMULATION/RF/dac.c
+11
-5
openair1/SIMULATION/RF/defs.h
openair1/SIMULATION/RF/defs.h
+2
-1
openair1/SIMULATION/TOOLS/abstraction.c
openair1/SIMULATION/TOOLS/abstraction.c
+1
-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/SIMU/USER/channel_sim.c
targets/SIMU/USER/channel_sim.c
+25
-23
No files found.
openair1/PHY/LTE_TRANSPORT/dci.c
View file @
dc931f87
...
...
@@ -3510,7 +3510,7 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
dci_alloc
[
*
dci_cnt
].
L
=
L
;
dci_alloc
[
*
dci_cnt
].
firstCCE
=
CCEind
;
//
printf("DCI FOUND !!! crc =>%x, sizeof_bits %d, sizeof_bytes %d \n",crc, sizeof_bits, sizeof_bytes);
printf
(
"DCI FOUND !!! crc =>%x, sizeof_bits %d, sizeof_bytes %d
\n
"
,
crc
,
sizeof_bits
,
sizeof_bytes
);
if
(
sizeof_bytes
<=
4
)
{
dci_alloc
[
*
dci_cnt
].
dci_pdu
[
3
]
=
dci_decoded_output
[
current_thread_id
][
0
];
dci_alloc
[
*
dci_cnt
].
dci_pdu
[
2
]
=
dci_decoded_output
[
current_thread_id
][
1
];
...
...
openair1/PHY/LTE_TRANSPORT/drs_modulation.c
View file @
dc931f87
...
...
@@ -141,6 +141,7 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
(
ref_im
*
alpha_re
[
alpha_ind
]))
>>
15
);
((
short
*
)
txdataF
)[
2
*
(
symbol_offset
+
re_offset
)]
=
(
short
)
((((
short
*
)
txdataF
)[
2
*
(
symbol_offset
+
re_offset
)]
*
(
int32_t
)
amp
)
>>
15
);
((
short
*
)
txdataF
)[
2
*
(
symbol_offset
+
re_offset
)
+
1
]
=
(
short
)
((((
short
*
)
txdataF
)[
2
*
(
symbol_offset
+
re_offset
)
+
1
]
*
(
int32_t
)
amp
)
>>
15
);
printf
(
"[drs_modulation]txdataF drs(%d,%d)
\n
"
,((
short
*
)
txdataF
)[
2
*
(
symbol_offset
+
re_offset
)],((
short
*
)
txdataF
)[
2
*
(
symbol_offset
+
re_offset
)
+
1
]);
alpha_ind
=
(
alpha_ind
+
cyclic_shift
);
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
dc931f87
...
...
@@ -1247,7 +1247,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, uint8_t empt
int
overflow
=
0
;
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
int
k
,
l
;
int
dummy_tx_buffer
[
frame_parms
->
samples_per_tti
]
__attribute__
((
aligned
(
16
)));
int
dummy_tx_buffer
[
ue
->
do_ofdm_mod
?
frame_parms
->
symbols_per_tti
*
frame_parms
->
ofdm_symbol_size
:
frame_parms
->
samples_per_tti
]
__attribute__
((
aligned
(
16
)));
#endif
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON
,
VCD_FUNCTION_IN
);
...
...
@@ -1909,7 +1909,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
subframe_tx
,
&
ue
->
frame_parms
,
ue
->
ulsch
[
eNB_id
]);
for
(
aa
=
0
;
aa
<
1
/*frame_parms->nb_antennas_tx*/
;
aa
++
)
for
(
aa
=
0
;
aa
<
1
/*frame_parms->nb_antennas_tx*/
;
aa
++
){
printf
(
"Generating drs pusch
\n
"
);
generate_drs_pusch
(
ue
,
proc
,
eNB_id
,
...
...
@@ -1918,6 +1919,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
first_rb
,
nb_rb
,
aa
);
}
#if UE_TIMING_TRACE
stop_meas
(
&
ue
->
ulsch_modulation_stats
);
#endif
...
...
@@ -3108,7 +3110,6 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
if
(
abstraction_flag
==
0
)
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH
,
VCD_FUNCTION_IN
);
printf
(
"[phy_procedures_lte_ue]before is %s
\n
"
,
"ok"
);
rx_pdcch
(
ue
,
proc
->
frame_rx
,
subframe_rx
,
...
...
@@ -3116,7 +3117,6 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
(
ue
->
frame_parms
.
mode1_flag
==
1
)
?
SISO
:
ALAMOUTI
,
ue
->
high_speed_flag
,
ue
->
is_secondary_ue
);
printf
(
"[phy_procedures_lte_ue]after is %s
\n
"
,
"ok"
);
printf
(
"[phy_procedures_lte_ue] ue->prach_resources[%d] %d
\n
"
,
eNB_id
,
ue
->
prach_resources
[
eNB_id
]);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH
,
VCD_FUNCTION_OUT
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_DCI_DECODING
,
VCD_FUNCTION_IN
);
...
...
openair1/SIMULATION/RF/dac.c
View file @
dc931f87
...
...
@@ -136,12 +136,14 @@ double dac_fixed_gain_prach(double *s_re[2],
uint32_t
length_meas
,
uint8_t
B
,
double
txpwr_dBm
,
int
NB_RE
)
int
NB_RE
,
int
ofdm_symbol_size
)
{
int
i
;
int
aa
;
double
amp
,
amp1
;
int
k
;
amp
=
//sqrt(NB_RE)*pow(10.0,.05*txpwr_dBm)/sqrt(nb_tx_antennas); //this is amp per tx antenna
pow
(
10
.
0
,.
05
*
txpwr_dBm
)
/
sqrt
(
nb_tx_antennas
);
//this is amp per tx antenna
...
...
@@ -168,16 +170,20 @@ double dac_fixed_gain_prach(double *s_re[2],
#ifdef DEBUG_DAC
printf
(
"DAC: input_offset %d, amp %e, amp1 %e
\n
"
,
input_offset
,
amp
,
amp1
);
#endif
k
=
input_offset
;
for
(
i
=
0
;
i
<
length
*
2
;
i
+=
2
)
{
for
(
aa
=
0
;
aa
<
nb_tx_antennas
;
aa
++
)
{
s_re
[
aa
][
i
/
2
]
=
amp
*
((
double
)(((
short
*
)
input
))[((
i
+
input_offset
))])
/
amp1
;
///(1<<(B-1));
s_im
[
aa
][
i
/
2
]
=
amp
*
((
double
)(((
short
*
)
input
))[((
i
+
input_offset
))
+
1
])
/
amp1
;
///(1<<(B-1));
s_re
[
aa
][
i
/
2
]
=
amp
*
((
double
)(((
short
*
)
input
))[((
k
))])
/
amp1
;
///(1<<(B-1));
s_im
[
aa
][
i
/
2
]
=
amp
*
((
double
)(((
short
*
)
input
))[((
k
))
+
1
])
/
amp1
;
///(1<<(B-1));
#ifdef DEBUG_DAC
if
(
i
<
20
)
printf
(
"DAC[%d]: input (%d,%d). output (%e,%e)
\n
"
,
i
/
2
,(((
short
*
)
input
))[((
i
+
input_offset
))],(((
short
*
)
input
))[((
i
+
input_offset
))
+
1
],
s_re
[
aa
][
i
/
2
],
s_im
[
aa
][
i
/
2
]);
printf
(
"DAC[%d]: input (%d,%d). output (%e,%e)
\n
"
,
i
/
2
,(((
short
*
)
input
))[((
k
))],(((
short
*
)
input
))[((
k
))
+
1
],
s_re
[
aa
][
i
/
2
],
s_im
[
aa
][
i
/
2
]);
if
(
i
>
length
*
2
-
20
&&
i
<
length
*
2
)
printf
(
"DAC[%d]: input (%d,%d). output (%e,%e)
\n
"
,
i
/
2
,(((
short
*
)
input
))[((
i
+
input_offset
))],(((
short
*
)
input
))[((
i
+
input_offset
))
+
1
],
s_re
[
aa
][
i
/
2
],
s_im
[
aa
][
i
/
2
]);
printf
(
"DAC[%d]: input (%d,%d). output (%e,%e)
\n
"
,
i
/
2
,(((
short
*
)
input
))[((
k
))],(((
short
*
)
input
))[((
k
))
+
1
],
s_re
[
aa
][
i
/
2
],
s_im
[
aa
][
i
/
2
]);
#endif
k
+=
2
;
if
(
k
==
12
*
2
*
ofdm_symbol_size
)
k
=
0
;
}
}
...
...
openair1/SIMULATION/RF/defs.h
View file @
dc931f87
...
...
@@ -127,4 +127,5 @@ double dac_fixed_gain_prach(double *s_re[2],
unsigned
int
length_meas
,
unsigned
char
B
,
double
gain
,
int
NB_RE
);
int
NB_RE
,
int
ofdm_symbol_size
);
openair1/SIMULATION/TOOLS/abstraction.c
View file @
dc931f87
...
...
@@ -168,7 +168,7 @@ int init_freq_channel_prach(channel_desc_t *desc,uint16_t nb_rb,int16_t n_sample
printf
(
"prach_samples = %d, delta_f = %e, max_nb_rb_samples= %d, prach_pbr_offset_samples = %d, nb_taps = %d
\n
"
,
prach_samples
,
delta_f
,
max_nb_rb_samples
,
prach_pbr_offset_samples
,
desc
->
nb_taps
);
for
(
f
=
max_nb_rb_samples
/
2
-
prach_pbr_offset_samples
,
f1
=
0
;
f
<
max_nb_rb_samples
/
2
-
prach_pbr_offset_samples
+
prach_samples
;
f
++
,
f1
++
)
{
//3600-864,3600-864+864|3600-7200,3600-7200+839
freq
=
delta_f
*
(
double
)
f
*
1e-6
;
// due to the fact that delays is in mus
printf
(
"[init_freq_channel_prach] freq %e
\n
"
,
freq
);
//
printf("[init_freq_channel_prach] freq %e\n",freq);
cos_lut
[
f1
]
=
(
double
*
)
malloc
((
int
)
desc
->
nb_taps
*
sizeof
(
double
));
sin_lut
[
f1
]
=
(
double
*
)
malloc
((
int
)
desc
->
nb_taps
*
sizeof
(
double
));
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
View file @
dc931f87
...
...
@@ -139,7 +139,7 @@ eNBs =
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"172.24.10.1
12
"
;
mme_ip_address
= ( {
ipv4
=
"172.24.10.1
79
"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
preference
=
"ipv4"
;
...
...
targets/SIMU/USER/channel_sim.c
View file @
dc931f87
This diff is collapsed.
Click to expand it.
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