Skip to content

O
OpenXG-RAN
Commit eb7fe108 authored by Guy De Souza's avatar Guy De Souza
Browse files
Options

Corrections to fill_dci/Compiling

parent 5d366c96
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 31 deletions
cmake_targets/CMakeLists.txt
View file @ eb7fe108
...@@ -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 @ eb7fe108
...@@ -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 @ eb7fe108
...@@ -30,29 +30,25 @@ ...@@ -30,29 +30,25 @@
* \warning * \warning
*/ */
#include "nfapi_nr_interface.h" #include "nr_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;
uint8_t *dci_pdu = &dci_alloc->dci_pdu[0]; uint32_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 = format1_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 = format0_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 = format1_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 = format0_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 = format2_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 = format2_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 = format2_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 = format2_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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment