common BWP structure and further improvements

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -936,6 +936,9 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
           dci_ind->dci_list[dci_ind->number_of_dcis].N_CCE = L;
           dci_ind->dci_list[dci_ind->number_of_dcis].dci_format = rel15->dci_format_options[k];
           dci_ind->dci_list[dci_ind->number_of_dcis].ss_type = rel15->dci_type_options[k];
+          int n_rb, rb_offset;
+          get_coreset_rballoc(rel15->coreset.frequency_domain_resource, &n_rb, &rb_offset);
+          dci_ind->dci_list[dci_ind->number_of_dcis].cset_start = rel15->BWPStart + rb_offset;
           dci_ind->dci_list[dci_ind->number_of_dcis].payloadSize = dci_length;
           memcpy((void*)dci_ind->dci_list[dci_ind->number_of_dcis].payloadBits,(void*)dci_estimation,8);
           dci_ind->number_of_dcis++;

openair1/PHY/defs_nr_common.h

@@ -80,8 +80,6 @@
 #define NR_MAX_DCI_SIZE 1728 //16(L)*2(QPSK)*9(12 RE per REG - 3(DMRS))*6(REG per CCE)
 #define NR_MAX_DCI_SIZE_DWORD 54 // ceil(NR_MAX_DCI_SIZE/32)
 
-#define NR_MAX_NUM_BWP 4
-
 #define NR_MAX_PDCCH_AGG_LEVEL 16 // 3GPP TS 38.211 V15.8 Section 7.3.2 Table 7.3.2.1-1: Supported PDCCH aggregation levels
 #define NR_MAX_CSET_DURATION 3
 
@@ -158,11 +156,6 @@ typedef enum {
   MOD_QAM256
 }nr_mod_t;
 
-typedef enum {
-  RA_2STEP = 0,
-  RA_4STEP
-} nr_ra_type_e;
-
 typedef struct {
   /// Size of first RBG
   uint8_t start_size;

openair1/PHY/impl_defs_nr.h

@@ -364,11 +364,6 @@ typedef enum {
   pusch_dmrs_type2 = 1
 } pusch_dmrs_type_t;
 
-typedef enum {
-  pusch_len1 = 1,
-  pusch_len2 = 2
-} pusch_maxLength_t;
-
 typedef enum {
   txConfig_codebook = 1,
   txConfig_nonCodebook = 2

openair1/PHY/impl_defs_top.h

@@ -107,6 +107,7 @@
  * @}
  */
 
+#include <common/utils/nr/nr_common.h>
 #include <common/utils/utils.h>
 #include "defs_eNB.h"
 #include "types.h"
@@ -277,8 +278,6 @@
   #define DURATION_RX_TO_TX           (6)   /* For LTE, this duration is fixed to 4 and it is linked to LTE standard for both modes FDD/TDD */
 #endif
 
-
-#define NR_MAX_HARQ_PROCESSES                    (16)
 #define NR_MAX_ULSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* cf 38.214 6.1 UE procedure for receiving the physical uplink shared channel */
 #define NR_MAX_DLSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* cf 38.214 5.1 UE procedure for receiving the physical downlink shared channel */
 #endif

openair1/SCHED_NR_UE/harq_nr.h

@@ -35,15 +35,6 @@
 
 /************** DEFINE ********************************************/
 
-#if 0
-
-/* these define are in file PHY/impl_defs_top.h" because of compilation problems due to multiple header files inclusions */
-#define NR_MAX_HARQ_PROCESSES                    (16)
-#define NR_MAX_ULSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* TS 38.214 6.1 UE procedure for receiving the physical uplink shared channel */
-#define NR_MAX_DLSCH_HARQ_PROCESSES              (NR_MAX_HARQ_PROCESSES)  /* TS 38.214 5.1 UE procedure for receiving the physical downlink shared channel */
-
-#endif
-
 #define NR_DEFAULT_DLSCH_HARQ_PROCESSES          (8)                      /* TS 38.214 5.1 */
 
 #define DL_ACKNACK_NO_SET                        (2)