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
ZhouShuya
OpenXG-RAN
Commits
e6a957e1
Commit
e6a957e1
authored
Jul 23, 2018
by
Matthieu Kanj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
9d4cb04f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
19 deletions
+18
-19
openair1/PHY/LTE_REFSIG/lte_ul_ref_NB_IoT.c
openair1/PHY/LTE_REFSIG/lte_ul_ref_NB_IoT.c
+8
-9
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+10
-10
No files found.
openair1/PHY/LTE_REFSIG/lte_ul_ref_NB_IoT.c
View file @
e6a957e1
...
...
@@ -271,17 +271,16 @@ void generate_ul_ref_sigs_rx_NB_IoT(void)
ul_ref_sigs_rx_NB_IoT
[
u
][
index_Nsc_RU
][
12
*
(
n
<<
1
)
+
24
]
=
ref_sigs_sc1
[
n
<<
1
];
// ul_ref_sigs_rx_NB_IoT is filled every 12 RE, real part
ul_ref_sigs_rx_NB_IoT
[
u
][
index_Nsc_RU
][
1
+
12
*
(
n
<<
1
)
+
24
]
=
ref_sigs_sc1
[
1
+
(
n
<<
1
)];
// ul_ref_sigs_rx_NB_IoT is filled every 12 RE, imaginary part
for
(
n
=
0
;
n
<
4
;
n
++
)
}
for
(
n
=
0
;
n
<
4
;
n
++
)
{
for
(
m
=
0
;
m
<
3
;
m
++
)
{
for
(
m
=
0
;
m
<
3
;
m
++
)
{
ul_ref_sigs_f2_rx_NB_IoT
[
u
][
12
*
((
3
*
n
+
m
)
<<
1
)
+
24
]
=
ref_sigs_sc1
[
n
<<
1
];
// ul_ref_sigs_rx_NB_IoT is filled every 12 RE, real part
ul_ref_sigs_f2_rx_NB_IoT
[
u
][
1
+
12
*
((
3
*
n
+
m
)
<<
1
)
+
24
]
=
ref_sigs_sc1
[
1
+
(
n
<<
1
)];
// ul_ref_sigs_rx_NB_IoT is filled every 12 RE, imaginary part
}
}
ul_ref_sigs_f2_rx_NB_IoT
[
u
][
12
*
((
3
*
n
+
m
)
<<
1
)
+
24
]
=
ref_sigs_sc1
[
n
<<
1
];
// ul_ref_sigs_rx_NB_IoT is filled every 12 RE, real part
ul_ref_sigs_f2_rx_NB_IoT
[
u
][
1
+
12
*
((
3
*
n
+
m
)
<<
1
)
+
24
]
=
ref_sigs_sc1
[
1
+
(
n
<<
1
)];
// ul_ref_sigs_rx_NB_IoT is filled every 12 RE, imaginary part
}
}
break
;
}
}
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
e6a957e1
...
...
@@ -558,13 +558,13 @@ void common_signal_procedures (PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
//uint8_t reset;
//uint8_t counter_ack; // ack counter for decision ack/nack
//int32_t counter_ack_soft;
printf
(
"
\n\n
msg5 received in frame %d subframe %d
\n\n
"
,
framerx
,
subframerx
);
printf
(
"
\n\n
msg5 received in frame %d subframe %d
\n\n
"
,
framerx
,
subframerx
);
if
(
proc
->
counter_msg5
==
2
)
{
proc
->
frame_dscr_msg5
=
framerx
;
proc
->
subframe_dscr_msg5
=
subframerx
;
}
if
(
proc
->
counter_msg5
==
2
)
{
proc
->
frame_dscr_msg5
=
framerx
;
proc
->
subframe_dscr_msg5
=
subframerx
;
}
rx_ulsch_Gen_NB_IoT
(
eNB
,
proc
,
...
...
@@ -575,8 +575,8 @@ void common_signal_procedures (PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
22
,
//UL_RB_ID_NB_IoT, // 22 , to be included in // to be replaced by NB_IoT_start ??
1
,
//subcarrier_spacing, // 0 (3.75 KHz) or 1 (15 KHz)
65522
,
//rnti_tmp, //= 65522
proc
->
subframe_dscr_msg
3
,
//subframerx,//scrambling_subframe_msg3, // first received subframe
proc
->
frame_dscr_msg
3
,
//framerx,// scrambling_frame_msg3, // first received frame
proc
->
subframe_dscr_msg
5
,
//subframerx,//scrambling_subframe_msg3, // first received subframe
proc
->
frame_dscr_msg
5
,
//framerx,// scrambling_frame_msg3, // first received frame
4
,
//nb_slot, // total number of occupied slots
0
,
// I_sc
1
,
// Nsc_RU
...
...
@@ -588,8 +588,8 @@ void common_signal_procedures (PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
proc
->
subframe_msg5
++
;
proc
->
counter_msg5
--
;
proc
->
subframe_msg5
++
;
proc
->
counter_msg5
--
;
///if (proc->counter_msg5==0) exit(0);
}
...
...
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