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
19cf6b57
Commit
19cf6b57
authored
Jul 30, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrections to fill_dci/Compiling
parent
7b9ff783
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
31 deletions
+24
-31
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-0
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+2
-5
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+21
-26
No files found.
cmake_targets/CMakeLists.txt
View file @
19cf6b57
...
@@ -1268,6 +1268,7 @@ set(PHY_SRC_UE
...
@@ -1268,6 +1268,7 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_sss.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_sss.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_pbch.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_pbch.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci_tools.c
${
OPENAIR1_DIR
}
/PHY/NR_REFSIG/nr_gold.c
${
OPENAIR1_DIR
}
/PHY/NR_REFSIG/nr_gold.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/file_output.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/file_output.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
...
...
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
View file @
19cf6b57
...
@@ -17,7 +17,7 @@ typedef struct {
...
@@ -17,7 +17,7 @@ typedef struct {
uint32_t
value
;
uint32_t
value
;
}
nfapi_uint32_tlv_t
;
}
nfapi_uint32_tlv_t
;
typedef
struct
{
/*
typedef struct {
nfapi_tl_t tl;
nfapi_tl_t tl;
int64_t value;
int64_t value;
} nfapi_int64_tlv_t;
} nfapi_int64_tlv_t;
...
@@ -25,7 +25,7 @@ typedef struct {
...
@@ -25,7 +25,7 @@ typedef struct {
typedef struct {
typedef struct {
nfapi_tl_t tl;
nfapi_tl_t tl;
uint64_t value;
uint64_t value;
}
nfapi_uint64_tlv_t
;
} nfapi_uint64_tlv_t;
*/
// nFAPI enums
// nFAPI enums
typedef
enum
{
typedef
enum
{
...
@@ -397,9 +397,6 @@ uint8_t *block_numbers;
...
@@ -397,9 +397,6 @@ uint8_t *block_numbers;
}
nfapi_nr_dl_config_dci_dl_pdu_rel15_t
;
}
nfapi_nr_dl_config_dci_dl_pdu_rel15_t
;
//#define NFAPI_NR_DL_CONFIG_REQUEST_DCI_DL_PDU_REL15_TAG 0x????
//#define NFAPI_NR_DL_CONFIG_REQUEST_DCI_DL_PDU_REL15_TAG 0x????
typedef
struct
{
nfapi_nr_dl_config_dci_pdu_rel15_t
dci_dl_pdu_rel15
;
}
nfapi_dl_config_dci_dl_pdu
;
typedef
struct
{
typedef
struct
{
uint8_t
coreset_id
;
uint8_t
coreset_id
;
...
...
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
View file @
19cf6b57
...
@@ -30,29 +30,25 @@
...
@@ -30,29 +30,25 @@
* \warning
* \warning
*/
*/
#include "n
fapi_nr_interface
.h"
#include "n
r_dci
.h"
void
nr_fill_dci_and_dlsch
(
PHY_VARS_gNB
*
gNB
,
void
nr_fill_dci_and_dlsch
(
PHY_VARS_gNB
*
gNB
,
int
frame
,
int
frame
,
int
subframe
,
int
subframe
,
gNB_rxtx_proc_t
*
proc
,
gNB_rxtx_proc_t
*
proc
,
NR_DCI_ALLOC_t
*
dci_alloc
,
NR_
gNB_
DCI_ALLOC_t
*
dci_alloc
,
nfapi_nr_dl_config_
dci_pdu_rel15
_t
*
pdu
)
nfapi_nr_dl_config_
request_pdu
_t
*
pdu
)
{
{
NR_DL_FRAME_PARMS
*
fp
=
&
gNB
->
frame_parms
;
NR_DL_FRAME_PARMS
*
fp
=
&
gNB
->
frame_parms
;
uint
8
_t
*
dci_pdu
=
&
dci_alloc
->
dci_pdu
[
0
];
uint
32
_t
*
dci_pdu
=
&
dci_alloc
->
dci_pdu
[
0
];
nfapi_nr_dl_config_dci_
pdu_rel15_t
*
rel15
=
&
pdu
->
dci_dl_pdu_rel15
;
nfapi_nr_dl_config_dci_
dl_pdu_rel15_t
*
rel15
=
&
pdu
->
dci_dl_pdu
.
dci_dl_pdu_rel15
;
nfapi_nr_config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
nfapi_nr_config_request_t
*
cfg
=
&
gNB
->
gNB_config
;
dci_alloc
->
L
=
rel15
->
aggregation_level
;
dci_alloc
->
L
=
rel15
->
aggregation_level
;
dci_alloc
->
firstCCE
=
rel15
->
cce_idx
;
dci_alloc
->
rnti
=
rel15
->
rnti
;
dci_alloc
->
ra_flag
=
0
;
//dci_alloc->search_space = ???
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_1_0
)
{
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_1_0
)
{
dci_alloc
->
format
=
format
1_0
;
dci_alloc
->
format
=
NFAPI_NR_DL_DCI_FORMAT_
1_0
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
cfg
);
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_C
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_C
||
rel15
->
rnti_type
==
NFAPI_NR_RNTI_CS
||
rel15
->
rnti_type
==
NFAPI_NR_RNTI_CS
||
rel15
->
rnti_type
==
NFAPI_NR_RNTI_new
)
{
||
rel15
->
rnti_type
==
NFAPI_NR_RNTI_new
)
{
...
@@ -62,7 +58,6 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
...
@@ -62,7 +58,6 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_SI
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_SI
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_RA
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_RA
)
{
dci_alloc
->
ra_flag
=
1
;
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_TC
)
{
}
else
if
(
rel15
->
rnti_type
==
NFAPI_NR_RNTI_TC
)
{
...
@@ -70,26 +65,26 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
...
@@ -70,26 +65,26 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
AssertFatal
(
1
==
0
,
"[nr_fill_dci_and_dlsch] Incorrect DCI Format(%d) and RNTI Type(%d) combination"
,
rel15
->
dci_format
,
rel15
->
rnti_type
);
AssertFatal
(
1
==
0
,
"[nr_fill_dci_and_dlsch] Incorrect DCI Format(%d) and RNTI Type(%d) combination"
,
rel15
->
dci_format
,
rel15
->
rnti_type
);
}
}
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_UL_DCI_FORMAT_0_0
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_UL_DCI_FORMAT_0_0
)
{
dci_alloc
->
format
=
format
0_0
;
dci_alloc
->
format
=
NFAPI_NR_UL_DCI_FORMAT_
0_0
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_ul
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_ul
,
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_1_1
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_1_1
)
{
dci_alloc
->
format
=
format
1_1
;
dci_alloc
->
format
=
NFAPI_NR_DL_DCI_FORMAT_
1_1
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_UL_DCI_FORMAT_0_1
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_UL_DCI_FORMAT_0_1
)
{
dci_alloc
->
format
=
format
0_1
;
dci_alloc
->
format
=
NFAPI_NR_UL_DCI_FORMAT_
0_1
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_ul
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_ul
,
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_0
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_0
)
{
dci_alloc
->
format
=
format
2_0
;
dci_alloc
->
format
=
NFAPI_NR_DL_DCI_FORMAT_
2_0
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_1
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_1
)
{
dci_alloc
->
format
=
format
2_1
;
dci_alloc
->
format
=
NFAPI_NR_DL_DCI_FORMAT_
2_1
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_2
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_2
)
{
dci_alloc
->
format
=
format
2_2
;
dci_alloc
->
format
=
NFAPI_NR_DL_DCI_FORMAT_
2_2
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
cfg
);
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_3
)
{
}
else
if
(
rel15
->
dci_format
==
NFAPI_NR_DL_DCI_FORMAT_2_3
)
{
dci_alloc
->
format
=
format
2_3
;
dci_alloc
->
format
=
NFAPI_NR_DL_DCI_FORMAT_
2_3
;
dci_alloc
->
dci_length
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
&
cfg
);
dci_alloc
->
size
=
nr_get_dci_size
(
rel15
->
dci_format
,
rel15
->
rnti_type
,
&
fp
->
initial_bwp_params_dl
,
cfg
);
}
else
{
}
else
{
AssertFatal
(
1
==
0
,
"[nr_fill_dci_and_dlsch] Incorrect DCI Format(%d)"
,
rel15
->
dci_format
);
AssertFatal
(
1
==
0
,
"[nr_fill_dci_and_dlsch] Incorrect DCI Format(%d)"
,
rel15
->
dci_format
);
}
}
...
...
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