Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
f372c733
Commit
f372c733
authored
Jun 29, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix in dci_tools_ue.c (check_format1_1a_coherency issue)
parent
e56b02d3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
13 deletions
+21
-13
openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
+5
-5
openair1/PHY/impl_defs_top.h
openair1/PHY/impl_defs_top.h
+4
-4
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+10
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
...JECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
...TS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
+1
-1
No files found.
openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
View file @
f372c733
...
...
@@ -943,7 +943,7 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format,
}
}
if
(
(
rnti
==
si_rnti
)
||
(
rnti
==
p_rnti
)
||
(
rnti
==
ra_rnti
))
if
(
dci_format
==
format1a
&&
((
rnti
==
si_rnti
)
||
(
rnti
==
p_rnti
)
||
(
rnti
==
ra_rnti
)
))
{
NPRB
=
(
TPC
&
1
)
+
2
;
switch
(
N_RB_DL
)
{
...
...
@@ -960,8 +960,8 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format,
RIV_max
=
RIV_max100
;
break
;
}
}
else
}
else
if
(
dci_format
==
format1a
)
{
switch
(
N_RB_DL
)
{
case
6
:
...
...
@@ -996,13 +996,13 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format,
}
if
(
dci_format
==
format1
)
else
if
(
dci_format
==
format1
)
{
NPRB
=
conv_nprb
(
rah
,
rballoc
,
N_RB_DL
);
}
if
(
rballoc
>
RIV_max
)
if
(
dci_format
==
format1a
&&
rballoc
>
RIV_max
)
{
// LOG_I(PHY,"bad dci rballoc rballoc %d RIV_max %lld \n",rballoc, RIV_max);
// DCI false detection
...
...
openair1/PHY/impl_defs_top.h
View file @
f372c733
...
...
@@ -287,9 +287,9 @@ typedef struct {
#ifndef malloc16
# ifdef __AVX2__
# define malloc16(x) memalign(32,x)
# define malloc16(x) memalign(32,x
+32
)
# else
# define malloc16(x) memalign(16,x)
# define malloc16(x) memalign(16,x
+16
)
# endif
#endif
#define free16(y,x) free(y)
...
...
@@ -306,9 +306,9 @@ typedef struct {
static
inline
void
*
malloc16_clear
(
size_t
size
)
{
#ifdef __AVX2__
void
*
ptr
=
memalign
(
32
,
size
);
void
*
ptr
=
memalign
(
32
,
size
+
32
);
#else
void
*
ptr
=
memalign
(
16
,
size
);
void
*
ptr
=
memalign
(
16
,
size
+
16
);
#endif
DevAssert
(
ptr
);
memset
(
ptr
,
0
,
size
);
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
f372c733
...
...
@@ -521,6 +521,7 @@ int main(int argc, char **argv)
int
k
,
i
,
j
,
aa
;
int
re
;
int
s
,
Kr
,
Kr_bytes
;
double
SNR
,
snr0
=-
2
.
0
,
snr1
,
rate
=
0
;
...
...
@@ -1306,7 +1307,9 @@ int main(int argc, char **argv)
}
*/
UE
->
pdcch_vars
[
UE
->
current_thread_id
[
subframe
]][
0
]
->
crnti
=
n_rnti
;
UE
->
n_connected_eNB
=
1
;
printf
(
"Allocating %dx%d eNB->UE channel descriptor
\n
"
,
eNB
->
frame_parms
.
nb_antennas_tx
,
UE
->
frame_parms
.
nb_antennas_rx
);
eNB2UE
[
0
]
=
new_channel_desc_scm
(
eNB
->
frame_parms
.
nb_antennas_tx
,
...
...
@@ -1318,8 +1321,10 @@ int main(int argc, char **argv)
rx_sample_offset
,
0
);
reset_meas
(
&
eNB2UE
[
0
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
0
]
->
interp_time
);
if
(
num_rounds
>
1
)
{
for
(
n
=
1
;
n
<
4
;
n
++
)
for
(
n
=
1
;
n
<
4
;
n
++
)
{
eNB2UE
[
n
]
=
new_channel_desc_scm
(
eNB
->
frame_parms
.
nb_antennas_tx
,
UE
->
frame_parms
.
nb_antennas_rx
,
channel_model
,
...
...
@@ -1328,8 +1333,11 @@ int main(int argc, char **argv)
forgetting_factor
,
rx_sample_offset
,
0
);
reset_meas
(
&
eNB2UE
[
n
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
n
]
->
interp_time
);
}
}
if
(
eNB2UE
[
0
]
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
exit
(
-
1
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
View file @
f372c733
...
...
@@ -39,7 +39,7 @@ eNBs =
downlink_frequency
=
2685000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
5
0
;
N_RB_DL
=
10
0
;
Nid_cell_mbsfn
=
0
;
nb_antenna_ports
=
1
;
nb_antennas_tx
=
1
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
View file @
f372c733
...
...
@@ -39,7 +39,7 @@ eNBs =
downlink_frequency
=
2685000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
5
0
;
N_RB_DL
=
10
0
;
Nid_cell_mbsfn
=
0
;
nb_antenna_ports
=
1
;
nb_antennas_tx
=
1
;
...
...
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