Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr

nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface_nr_extension.h

-/*
- * Copyright 2017 Cisco Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef _NFAPI_INTERFACE_NR_EXTENSION_H_
-#define _NFAPI_INTERFACE_NR_EXTENSION_H_
-
-#include "stddef.h"
-#include "nfapi_interface.h"
-
-
-
-#endif /* _NFAPI_INTERFACE_NR_EXTENSION_H_ */

openair1/PHY/NR_TRANSPORT/nr_dci.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/NR_TRANSPORT/nr_dci.c
+* \brief Implements DCI encoding/decoding (38.212/38.213/38.214). Current NR compliance V15.1 2018-06.
+* \author Guy De Souza
+* \date 2018
+* \version 0.1
+* \company Eurecom
+* \email: desouza@eurecom.fr
+* \note
+* \warning
+*/
+
+#include "nr_dci.h"
+
+uint8_t nr_get_dci_size(nr_dci_format_e format,
+                     nr_rnti_type_e rnti,
+                     NR_BWP_PARMS* bwp,
+                     nfapi_nr_config_request_t* config)
+{
+  uint8_t size = 0;
+  uint16_t N_RB = bwp->N_RB;
+
+  switch(format) {
+
+    case nr_dci_format_0_0:
+      /// fixed: Format identifier 1, Hop flag 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2 --16
+      size += 16;
+      size += ceil( log2( (N_RB*(N_RB+1))>>2 ) ); // Freq domain assignment -- hopping scenario to be updated
+      // Time domain assignment
+      // UL/SUL indicator
+      break;
+
+    case nr_dci_format_0_1:
+      /// fixed: Format identifier 1, MCS 5, NDI 1, RV 2, HARQ PID 4, PUSCH TPC 2, SRS request 2 --17
+      size += 17;
+      // Carrier indicator
+      // UL/SUL indicator
+      // BWP Indicator
+      // Freq domain assignment
+      // Time domain assignment
+      // VRB to PRB mapping
+      // Frequency Hopping flag
+      // 1st DAI
+      // 2nd DAI
+      // SRS resource indicator
+      // Precoding info and number of layers
+      // Antenna ports
+      // CSI request
+      // CBGTI
+      // PTRS - DMRS association
+      // beta offset indicator
+      // DMRS sequence init
+      break;
+
+    case nr_dci_format_1_0:
+      /// fixed: Format identifier 1, VRB2PRB 1, MCS 5, NDI 1, RV 2, HARQ PID 4, DAI 2, PUCCH TPC 2, PUCCH RInd 3, PDSCH to HARQ TInd 3 --24
+      size += 24;
+      size += ceil( log2( (N_RB*(N_RB+1))>>2 ) ); // Freq domain assignment
+      // Time domain assignment
+      break;
+
+    case nr_dci_format_1_1:
+      // Carrier indicator
+      size += 1; // Format identifier
+      // BWP Indicator
+      // Freq domain assignment
+      // Time domain assignment
+      // VRB to PRB mapping
+      // PRB bundling size indicator
+      // Rate matching indicator
+      // ZP CSI-RS trigger
+        /// TB1- MCS 5, NDI 1, RV 2
+      size += 8;
+      // TB2
+      size += 4 ;  // HARQ PID
+      // DAI
+      size += 2; // TPC PUCCH
+      size += 3; // PUCCH resource indicator
+      size += 3; // PDSCH to HARQ timing indicator
+      // Antenna ports
+      // Tx Config Indication
+      size += 2; // SRS request
+      // CBGTI
+      // CBGFI
+      size += 1; // DMRS sequence init
+      
+      break;
+
+    case nr_dci_format_2_0:
+      break;
+
+    case nr_dci_format_2_1:
+      break;
+
+    case nr_dci_format_2_2:
+      break;
+
+    case nr_dci_format_2_3:
+      break;
+
+  default:
+    AssertFatal(1==0, "Invalid NR DCI format %d\n", format);
+  }
+
+  return size;
+}
+
+
+uint8_t nr_generate_dci_top()
+{
+  return 0;
+}

openair1/PHY/NR_TRANSPORT/nr_dci.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+#ifndef __PHY_NR_TRANSPORT_DCI__H
+#define __PHY_NR_TRANSPORT_DCI__H
+
+#include "defs_gNB.h"
+
+
+typedef enum {
+  nr_dci_format_0_0=0,
+  nr_dci_format_0_1,
+  nr_dci_format_1_0,
+  nr_dci_format_1_1,
+  nr_dci_format_2_0,
+  nr_dci_format_2_1,
+  nr_dci_format_2_2,
+  nr_dci_format_2_3
+} nr_dci_format_e;
+
+typedef enum {
+  nr_rnti_type_SI_RNTI=0,
+  nr_rnti_type_RA_RNTI,
+  nr_rnti_type_C_RNTI,
+  nr_rnti_type_TC_RNTI,
+  nr_rnti_type_CS_RNTI,
+  nr_rnti_type_P_RNTI
+} nr_rnti_type_e;
+
+
+
+typedef struct {
+  /// Length of DCI in bits
+  uint8_t size;
+  /// Aggregation level
+  uint8_t L;
+  /// Position of first CCE of the dci
+  int firstCCE;
+  /// flag to indicate that this is a RA response
+  boolean_t ra_flag;
+  /// rnti
+  nr_rnti_type_e rnti;
+  /// Format
+  DCI_format_t format;
+  /// DCI pdu
+  uint8_t dci_pdu[8];
+} NR_DCI_ALLOC_t;
+
+
+uint8_t nr_get_dci_size(nr_dci_format_e format,
+                     nr_rnti_type_e rnti,
+                     NR_BWP_PARMS bwp,
+                     nfapi_nr_config_request_t* config);
+
+uint8_t nr_generate_dci_top();
+
+#endif //__PHY_NR_TRANSPORT_DCI__H

openair1/PHY/NR_TRANSPORT/nr_pdcch.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/NR_TRANSPORT/nr_pdcch.c
+* \brief Implements PDCCH physical channel TX/RX procedures (38.211). Current NR compliance V15.1 2018-06.
+* \author Guy De Souza
+* \date 2018
+* \version 0.1
+* \company Eurecom
+* \email: desouza@eurecom.fr
+* \note
+* \warning
+*/
+
+#include "nr_dci.h"
+
+

openair1/PHY/defs_gNB.h

@@ -320,7 +320,7 @@ typedef struct PHY_VARS_gNB_s {
   /// counter to average prach energh over first 100 prach opportunities
   int prach_energy_counter;
 
-  // PDSCH Varaibles
+  // PDSCH Variables
   PDSCH_CONFIG_DEDICATED pdsch_config_dedicated[NUMBER_OF_UE_MAX];
 
   // PUSCH Varaibles

openair1/PHY/defs_nr_common.h

@@ -34,7 +34,7 @@
 #define __PHY_DEFS_NR_COMMON__H__
 
 #include "defs_common.h"
-#include "nfapi_interface_nr_extension.h"
+#include "nfapi_nr_interface.h"
 #include "impl_defs_nr.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
@@ -57,6 +57,8 @@
 #define NR_PBCH_DMRS_LENGTH 144
 #define NR_PBCH_DMRS_LENGTH_DWORD 5 // roundup(NR_PBCH_DMRS_LENGTH/32)
 
+#define NR_MAX_NUM_BWP 4
+
 typedef enum {
   NR_MU_0=0,
   NR_MU_1,
@@ -74,6 +76,17 @@ typedef enum{
   nr_ssb_type_E
 } nr_ssb_type_e;
 
+typedef struct NR_BWP_PARMS {
+  /// Associated numerology index
+  uint8_t numerology_index;
+  /// Freq domain location
+  uint8_t location;
+  /// Bandwidth in PRB
+  uint16_t N_RB;
+  /// Size of FFT/IFFT
+  uint16_t ofdm_symbol_size;
+} NR_BWP_PARMS;
+
 typedef struct NR_DL_FRAME_PARMS {
   /// Number of resource blocks (RB) in DL
   uint8_t N_RB_DL;
@@ -166,6 +179,11 @@ typedef struct NR_DL_FRAME_PARMS {
   /// PBCH polar encoder params
   t_nrPolar_params pbch_polar_params;
 
+   //BWP params
+  NR_BWP_PARMS initial_bwp_params_dl;
+  NR_BWP_PARMS initial_bwp_params_ul;
+
 } NR_DL_FRAME_PARMS;
 
+
 #endif