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
a30a1af7
Commit
a30a1af7
authored
Oct 30, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Missing cast
parent
bf0807e1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+4
-4
openair1/PHY/NR_TRANSPORT/nr_pss.c
openair1/PHY/NR_TRANSPORT/nr_pss.c
+1
-1
openair1/PHY/TOOLS/tools_defs.h
openair1/PHY/TOOLS/tools_defs.h
+4
-0
openair1/PHY/defs_common.h
openair1/PHY/defs_common.h
+2
-3
No files found.
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
View file @
a30a1af7
...
@@ -193,7 +193,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
...
@@ -193,7 +193,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
NR_DL_gNB_HARQ_t
*
harq
=
dlsch
.
harq_processes
[
dci_alloc
.
harq_pid
];
NR_DL_gNB_HARQ_t
*
harq
=
dlsch
.
harq_processes
[
dci_alloc
.
harq_pid
];
nfapi_nr_dl_config_dlsch_pdu_rel15_t
*
rel15
=
&
harq
->
dlsch_pdu
.
dlsch_pdu_rel15
;
nfapi_nr_dl_config_dlsch_pdu_rel15_t
*
rel15
=
&
harq
->
dlsch_pdu
.
dlsch_pdu_rel15
;
nfapi_nr_dl_config_pdcch_parameters_rel15_t
pdcch_params
=
dci_alloc
.
pdcch_params
;
nfapi_nr_dl_config_pdcch_parameters_rel15_t
pdcch_params
=
dci_alloc
.
pdcch_params
;
uint32_t
scrambled_output
[
NR_MAX_NB_CODEWORDS
][
NR_MAX_PDSCH_ENCODED_LENGTH
];
uint32_t
scrambled_output
[
NR_MAX_NB_CODEWORDS
][
NR_MAX_PDSCH_ENCODED_LENGTH
>>
5
];
int16_t
mod_symbs
[
NR_MAX_NB_CODEWORDS
][
NR_MAX_PDSCH_ENCODED_LENGTH
>>
1
];
int16_t
mod_symbs
[
NR_MAX_NB_CODEWORDS
][
NR_MAX_PDSCH_ENCODED_LENGTH
>>
1
];
int16_t
tx_layers
[
NR_MAX_NB_LAYERS
][
NR_MAX_PDSCH_ENCODED_LENGTH
>>
1
];
int16_t
tx_layers
[
NR_MAX_NB_LAYERS
][
NR_MAX_PDSCH_ENCODED_LENGTH
>>
1
];
uint16_t
n_symbs
;
uint16_t
n_symbs
;
...
@@ -232,7 +232,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
...
@@ -232,7 +232,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
TBS
,
TBS
,
mod_symbs
[
q
]);
mod_symbs
[
q
]);
#ifdef DEBUG_DLSCH
#ifdef DEBUG_DLSCH
printf
(
"PDSCH Modulation: Qm %d()
\n
"
,
Qm
,
n_symbs
);
printf
(
"PDSCH Modulation: Qm %d(
%d
)
\n
"
,
Qm
,
n_symbs
);
for
(
int
i
=
0
;
i
<
n_symbs
;
i
++
)
{
for
(
int
i
=
0
;
i
<
n_symbs
;
i
++
)
{
for
(
int
j
=
0
;
j
<
Qm
;
j
++
)
{
for
(
int
j
=
0
;
j
<
Qm
;
j
++
)
{
printf
(
"%d %d
\t
"
,
mod_symbs
[
0
][(
i
*
Qm
+
j
)
<<
1
],
mod_symbs
[
0
][((
i
*
Qm
+
j
)
<<
1
)
+
1
]);
printf
(
"%d %d
\t
"
,
mod_symbs
[
0
][(
i
*
Qm
+
j
)
<<
1
],
mod_symbs
[
0
][((
i
*
Qm
+
j
)
<<
1
)
+
1
]);
...
@@ -243,10 +243,10 @@ for (int i=0; i<n_symbs; i++) {
...
@@ -243,10 +243,10 @@ for (int i=0; i<n_symbs; i++) {
/// Layer mapping
/// Layer mapping
nr_pdsch_layer_mapping
(
mod_symbs
,
nr_pdsch_layer_mapping
(
(
int16_t
**
)
mod_symbs
,
rel15
->
nb_layers
,
rel15
->
nb_layers
,
n_symbs
,
n_symbs
,
tx_layers
);
(
int16_t
**
)
tx_layers
);
/// Antenna port mapping
/// Antenna port mapping
//to be moved to init phase potentially, for now tx_layers 1-8 are mapped on antenna ports 1000-1007
//to be moved to init phase potentially, for now tx_layers 1-8 are mapped on antenna ports 1000-1007
...
...
openair1/PHY/NR_TRANSPORT/nr_pss.c
View file @
a30a1af7
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include "PHY/NR_TRANSPORT/nr_transport.h"
#include "PHY/NR_TRANSPORT/nr_transport.h"
#define NR_PSS_DEBUG
//
#define NR_PSS_DEBUG
int
nr_generate_pss
(
int16_t
*
d_pss
,
int
nr_generate_pss
(
int16_t
*
d_pss
,
int32_t
**
txdataF
,
int32_t
**
txdataF
,
...
...
openair1/PHY/TOOLS/tools_defs.h
View file @
a30a1af7
...
@@ -32,6 +32,8 @@
...
@@ -32,6 +32,8 @@
#include <stdint.h>
#include <stdint.h>
#include "PHY/sse_intrin.h"
#include "PHY/sse_intrin.h"
#define CEILIDIV(a,b) ((a+b-1)/b)
#define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
struct
complex
{
struct
complex
{
double
x
;
double
x
;
...
@@ -405,4 +407,6 @@ void idft8192(int16_t *x,int16_t *y,int scale);
...
@@ -405,4 +407,6 @@ void idft8192(int16_t *x,int16_t *y,int scale);
double
interp
(
double
x
,
double
*
xs
,
double
*
ys
,
int
count
);
double
interp
(
double
x
,
double
*
xs
,
double
*
ys
,
int
count
);
int
write_output
(
const
char
*
fname
,
const
char
*
vname
,
void
*
data
,
int
length
,
int
dec
,
char
format
);
#endif //__PHY_TOOLS_DEFS__H__
#endif //__PHY_TOOLS_DEFS__H__
openair1/PHY/defs_common.h
View file @
a30a1af7
...
@@ -65,6 +65,8 @@
...
@@ -65,6 +65,8 @@
#include <pthread.h>
#include <pthread.h>
#include "TOOLS/tools_defs.h"
#include "targets/COMMON/openairinterface5g_limits.h"
#include "targets/COMMON/openairinterface5g_limits.h"
#include "types.h"
#include "types.h"
...
@@ -101,9 +103,6 @@
...
@@ -101,9 +103,6 @@
#include "enums.h"
#include "enums.h"
#else
#else
#define CEILIDIV(a,b) ((a+b-1)/b)
#define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
typedef
enum
{
TDD
=
1
,
FDD
=
0
}
lte_frame_type_t
;
typedef
enum
{
TDD
=
1
,
FDD
=
0
}
lte_frame_type_t
;
typedef
enum
{
EXTENDED
=
1
,
NORMAL
=
0
}
lte_prefix_type_t
;
typedef
enum
{
EXTENDED
=
1
,
NORMAL
=
0
}
lte_prefix_type_t
;
...
...
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