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
720e6f41
Commit
720e6f41
authored
Dec 20, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Plain Diff
Merge with develop-nr
parents
380ac78b
33c2c9c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+1
-1
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+3
-4
openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c
+5
-1
No files found.
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
View file @
720e6f41
...
@@ -162,7 +162,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
...
@@ -162,7 +162,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
for
(
int
i
=
0
;
i
<
fsize
;
i
++
)
for
(
int
i
=
0
;
i
<
fsize
;
i
++
)
*
dci_pdu
|=
((
pdu_rel15
->
frequency_domain_assignment
>>
(
fsize
-
i
-
1
))
&
1
)
<<
pos
++
;
*
dci_pdu
|=
((
pdu_rel15
->
frequency_domain_assignment
>>
(
fsize
-
i
-
1
))
&
1
)
<<
pos
++
;
if
((
pdu_rel15
->
frequency_domain_assignment
+
1
)
&
1
==
0
)
//fsize are all 1 38.212 p86
if
((
(
pdu_rel15
->
frequency_domain_assignment
+
1
)
&
1
)
==
0
)
//fsize are all 1 38.212 p86
{
{
printf
(
"***************************
\n
"
);
printf
(
"***************************
\n
"
);
...
...
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
View file @
720e6f41
...
@@ -207,7 +207,6 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
...
@@ -207,7 +207,6 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
int16_t
**
mod_symbs
=
(
int16_t
**
)
dlsch
.
mod_symbs
;
int16_t
**
mod_symbs
=
(
int16_t
**
)
dlsch
.
mod_symbs
;
int16_t
**
tx_layers
=
(
int16_t
**
)
dlsch
.
txdataF
;
int16_t
**
tx_layers
=
(
int16_t
**
)
dlsch
.
txdataF
;
int8_t
Wf
[
2
],
Wt
[
2
],
l0
,
l_prime
[
2
],
delta
;
int8_t
Wf
[
2
],
Wt
[
2
],
l0
,
l_prime
[
2
],
delta
;
uint16_t
TBS
=
rel15
->
transport_block_size
;
uint16_t
nb_symbols
=
rel15
->
nb_mod_symbols
;
uint16_t
nb_symbols
=
rel15
->
nb_mod_symbols
;
uint8_t
Qm
=
rel15
->
modulation_order
;
uint8_t
Qm
=
rel15
->
modulation_order
;
uint16_t
encoded_length
=
nb_symbols
*
Qm
;
uint16_t
encoded_length
=
nb_symbols
*
Qm
;
...
@@ -313,9 +312,9 @@ for (int i=0; i<n_dmrs>>4; i++) {
...
@@ -313,9 +312,9 @@ for (int i=0; i<n_dmrs>>4; i++) {
uint16_t
start_sc
=
frame_parms
.
first_carrier_offset
+
frame_parms
.
ssb_start_subcarrier
;
uint16_t
start_sc
=
frame_parms
.
first_carrier_offset
+
frame_parms
.
ssb_start_subcarrier
;
if
(
start_sc
>=
frame_parms
.
ofdm_symbol_size
)
if
(
start_sc
>=
frame_parms
.
ofdm_symbol_size
)
start_sc
-=
frame_parms
.
ofdm_symbol_size
;
start_sc
-=
frame_parms
.
ofdm_symbol_size
;
/*rel15->start_prb*NR_NB_SC_PER_RB +
*/
/*rel15->start_prb*NR_NB_SC_PER_RB +
//
((pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_COMMON) && (pdcch_params.dci_format == NFAPI_NR_DL_DCI_FORMAT_1_0))?\
((pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_COMMON) && (pdcch_params.dci_format == NFAPI_NR_DL_DCI_FORMAT_1_0))?\
// ((frame_parms.ssb_start_subcarrier/NR_NB_SC_PER_RB + pdcch_params.rb_offset)*NR_NB_SC_PER_RB) : 0;
((frame_parms.ssb_start_subcarrier/NR_NB_SC_PER_RB + pdcch_params.rb_offset)*NR_NB_SC_PER_RB) : 0;*/
#ifdef DEBUG_DLSCH_MAPPING
#ifdef DEBUG_DLSCH_MAPPING
printf
(
"PDSCH resource mapping started (start SC %d
\t
start symbol %d
\t
N_PRB %d
\t
nb_symbols %d)
\n
"
,
printf
(
"PDSCH resource mapping started (start SC %d
\t
start symbol %d
\t
N_PRB %d
\t
nb_symbols %d)
\n
"
,
...
...
openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c
View file @
720e6f41
...
@@ -32,6 +32,8 @@
...
@@ -32,6 +32,8 @@
#include "nr_dlsch.h"
#include "nr_dlsch.h"
extern
void
set_taus_seed
(
unsigned
int
seed_type
);
uint8_t
nr_pdsch_default_time_alloc_A_S_nCP
[
23
]
=
{
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
9
,
10
,
4
,
6
,
5
,
5
,
9
,
12
,
1
,
1
,
2
,
4
,
8
};
uint8_t
nr_pdsch_default_time_alloc_A_S_nCP
[
23
]
=
{
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
9
,
10
,
4
,
6
,
5
,
5
,
9
,
12
,
1
,
1
,
2
,
4
,
8
};
uint8_t
nr_pdsch_default_time_alloc_A_L_nCP
[
23
]
=
{
12
,
11
,
10
,
9
,
9
,
8
,
7
,
6
,
5
,
4
,
4
,
4
,
4
,
4
,
7
,
2
,
2
,
2
,
13
,
6
,
4
,
7
,
4
};
uint8_t
nr_pdsch_default_time_alloc_A_L_nCP
[
23
]
=
{
12
,
11
,
10
,
9
,
9
,
8
,
7
,
6
,
5
,
4
,
4
,
4
,
4
,
4
,
7
,
2
,
2
,
2
,
13
,
6
,
4
,
7
,
4
};
uint8_t
nr_pdsch_default_time_alloc_A_S_eCP
[
23
]
=
{
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
6
,
8
,
4
,
6
,
5
,
5
,
9
,
10
,
1
,
1
,
2
,
4
,
8
};
uint8_t
nr_pdsch_default_time_alloc_A_S_eCP
[
23
]
=
{
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
2
,
3
,
6
,
8
,
4
,
6
,
5
,
5
,
9
,
10
,
1
,
1
,
2
,
4
,
8
};
...
@@ -105,7 +107,8 @@ static inline uint8_t get_K0(uint8_t row_idx, uint8_t time_alloc_type) {
...
@@ -105,7 +107,8 @@ static inline uint8_t get_K0(uint8_t row_idx, uint8_t time_alloc_type) {
/*ideally combine the calculation of L in the same function once the right struct is defined*/
/*ideally combine the calculation of L in the same function once the right struct is defined*/
uint8_t
nr_get_S
(
uint8_t
row_idx
,
uint8_t
CP
,
uint8_t
time_alloc_type
,
uint8_t
dmrs_typeA_position
)
{
uint8_t
nr_get_S
(
uint8_t
row_idx
,
uint8_t
CP
,
uint8_t
time_alloc_type
,
uint8_t
dmrs_typeA_position
)
{
uint8_t
idx
,
S
;
uint8_t
idx
;
//uint8_t S;
switch
(
time_alloc_type
)
{
switch
(
time_alloc_type
)
{
case
NFAPI_NR_PDSCH_TIME_DOMAIN_ALLOC_TYPE_DEFAULT_A
:
case
NFAPI_NR_PDSCH_TIME_DOMAIN_ALLOC_TYPE_DEFAULT_A
:
...
@@ -126,6 +129,7 @@ uint8_t nr_get_S(uint8_t row_idx, uint8_t CP, uint8_t time_alloc_type, uint8_t d
...
@@ -126,6 +129,7 @@ uint8_t nr_get_S(uint8_t row_idx, uint8_t CP, uint8_t time_alloc_type, uint8_t d
default:
default:
AssertFatal
(
0
,
"Invalid Time domain allocation type %d in %s %s
\n
"
,
time_alloc_type
,
__FUNCTION__
,
__FILE__
);
AssertFatal
(
0
,
"Invalid Time domain allocation type %d in %s %s
\n
"
,
time_alloc_type
,
__FUNCTION__
,
__FILE__
);
}
}
return
0
;
// temp warning fix
}
}
void
nr_check_time_alloc
(
uint8_t
S
,
uint8_t
L
,
nfapi_nr_config_request_t
config
)
{
void
nr_check_time_alloc
(
uint8_t
S
,
uint8_t
L
,
nfapi_nr_config_request_t
config
)
{
...
...
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