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
lizhongxiao
OpenXG-RAN
Commits
d3df77bc
Commit
d3df77bc
authored
Jul 20, 2017
by
Calisson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix for eNB and TDD subframe 1
parent
d89cf68f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
openair1/PHY/INIT/lte_parms.c
openair1/PHY/INIT/lte_parms.c
+3
-2
openair1/PHY/MODULATION/ofdm_mod.c
openair1/PHY/MODULATION/ofdm_mod.c
+3
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+4
-1
No files found.
openair1/PHY/INIT/lte_parms.c
View file @
d3df77bc
...
...
@@ -192,8 +192,9 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf)
if
(
frame_parms
->
frame_type
==
TDD
)
{
set_S_config
(
frame_parms
);
LOG_I
(
PHY
,
"TDD: Configuration %d, S-Subframe config %d: num DL symbols in S-subframe %d, num UL symbols in S-subframe
\n
"
,
frame_parms
->
tdd_config
,
frame_parms
->
tdd_config_S
,
LOG_I
(
PHY
,
"TDD: Configuration %d, S-Subframe config %d: num DL symbols in S-subframe %d, num UL symbols in S-subframe %d
\n
"
,
frame_parms
->
tdd_config
,
frame_parms
->
tdd_config_S
,
frame_parms
->
dl_symbols_in_S_subframe
,
frame_parms
->
ul_symbols_in_S_subframe
);
}
...
...
openair1/PHY/MODULATION/ofdm_mod.c
View file @
d3df77bc
...
...
@@ -282,6 +282,8 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne
}
extern
PHY_VARS_eNB
***
PHY_vars_eNB_g
;
// OFDM modulation for each symbol
void
do_OFDM_mod_symbol
(
LTE_eNB_COMMON
*
eNB_common_vars
,
int
eNB_id
,
uint16_t
next_slot
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
int
do_precoding
)
{
...
...
@@ -295,7 +297,7 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
slot_offsetF
=
(
next_slot
)
*
(
frame_parms
->
ofdm_symbol_size
)
*
((
frame_parms
->
Ncp
==
EXTENDED
)
?
6
:
7
);
//printf("Thread %d starting ... aa %d (%llu)\n",omp_get_thread_num(),aa,rdtsc());
for
(
l
=
0
;
l
<
frame_parms
->
symbols_per_tti
>>
1
;
l
++
)
{
if
(
PHY_vars_eNB_g
[
0
][
0
]
->
proc
.
frame_tx
==
0
)
LOG_I
(
PHY
,
"Generating symbol %d for slot %d
\n
"
,
l
,
next_slot
);
for
(
aa
=
0
;
aa
<
frame_parms
->
nb_antennas_tx
;
aa
++
)
{
//printf("do_OFDM_mod_l, slot=%d, l=%d, NUMBER_OF_OFDM_CARRIERS=%d,OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES=%d\n",next_slot, l,NUMBER_OF_OFDM_CARRIERS,OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
d3df77bc
...
...
@@ -497,6 +497,7 @@ void common_signal_procedures (PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
// generate Cell-Specific Reference Signals for both slots
if
(
eNB
->
abstraction_flag
==
0
)
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX
,
1
);
if
(
frame
==
0
)
LOG_I
(
PHY
,
"Generating RS for slot %d
\n
"
,
subframe
<<
1
);
generate_pilots_slot
(
eNB
,
txdataF
,
AMP
,
...
...
@@ -598,6 +599,7 @@ void common_signal_procedures (PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
if
((
fp
->
frame_type
==
TDD
)
&&
(
eNB
->
abstraction_flag
==
0
)){
if
(
frame
==
0
)
LOG_I
(
PHY
,
"Generating SSS for slot %d
\n
"
,
1
+
(
subframe
<<
1
));
generate_sss
(
txdataF
,
AMP
,
fp
,
...
...
@@ -624,6 +626,7 @@ void common_signal_procedures (PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
else
if
((
subframe
==
1
)
&&
(
fp
->
frame_type
==
TDD
)
&&
(
eNB
->
abstraction_flag
==
0
))
{
if
(
frame
==
0
)
LOG_I
(
PHY
,
"Generating PSS for slot %d
\n
"
,
subframe
<<
1
);
generate_pss
(
txdataF
,
AMP
,
fp
,
...
...
@@ -1383,7 +1386,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
LOG_D
(
PHY
,
"[eNB %"
PRIu8
"] Frame %d, subframe %d: Calling generate_dci_top (pdcch) (common %"
PRIu8
",ue_spec %"
PRIu8
")
\n
"
,
eNB
->
Mod_id
,
frame
,
subframe
,
DCI_pdu
->
Num_common_dci
,
DCI_pdu
->
Num_ue_spec_dci
);
}
if
(
frame
==
0
)
LOG_I
(
PHY
,
"Generating PDCCCH/PCFICH for slot %d
\n
"
,
subframe
<<
1
);
num_pdcch_symbols
=
generate_dci_top
(
DCI_pdu
->
Num_ue_spec_dci
,
DCI_pdu
->
Num_common_dci
,
DCI_pdu
->
dci_alloc
,
...
...
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