Add part of the MAC primitives & FAPI Style Interfaces figure

cmake_targets/CMakeLists.txt

@@ -1134,10 +1134,13 @@ set (MAC_SRC
   ${MAC_DIR}/rar_tools.c
   ${MAC_DIR}/eNB_scheduler.c
   ${MAC_DIR}/eNB_scheduler_dlsch.c
+  ${MAC_DIR}/eNB_scheduler_dlsch-nb.c
   ${MAC_DIR}/eNB_scheduler_ulsch.c
+  ${MAC_DIR}/eNB_scheduler_ulsch-nb.c
   ${MAC_DIR}/eNB_scheduler_mch.c
   ${MAC_DIR}/eNB_scheduler_bch.c
   ${MAC_DIR}/eNB_scheduler_primitives.c
+  ${MAC_DIR}/eNB_scheduler_primitives-nb.c
   ${MAC_DIR}/eNB_scheduler_RA.c
   ${MAC_DIR}/pre_processor.c
   ${MAC_DIR}/config.c

openair2/LAYER2/MAC/eNB_scheduler_dlsch-nb.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.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.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 eNB_scheduler_dlsch.c
+ * \brief procedures related to eNB for the DLSCH transport channel
+ * \author  Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \email: navid.nikaein@eurecom.fr
+ * \version 1.0
+ * @ingroup _mac
+
+ */
+
+#include "assertions.h"
+#include "PHY/defs.h"
+#include "PHY/extern.h"
+
+#include "SCHED/defs.h"
+#include "SCHED/extern.h"
+
+#include "LAYER2/MAC/defs.h"
+#include "LAYER2/MAC/proto.h"
+#include "LAYER2/MAC/extern.h"
+#include "UTIL/LOG/log.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "UTIL/OPT/opt.h"
+#include "OCG.h"
+#include "OCG_extern.h"
+
+#include "defs-nb.h"
+#include "proto-nb.h"
+
+#include "RRC/LITE/extern.h"
+#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
+
+//#include "LAYER2/MAC/pre_processor.c"
+#include "pdcp.h"
+
+#include "SIMULATION/TOOLS/defs.h" // for taus
+
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+#endif
+
+#include "T.h"
+
+#define ENABLE_MAC_PAYLOAD_DEBUG
+//#define DEBUG_eNB_SCHEDULER 1
+
+
+NB_get_dlsch_sdu(
+  module_id_t module_idP,
+  int CC_id,
+  frame_t frameP,
+  rnti_t rntiP,
+  uint8_t TBindex
+)
+//------------------------------------------------------------------------------
+{
+
+  int UE_id;
+  eNB_MAC_INST_NB *eNB=&eNB_mac_inst_NB[module_idP];
+
+  /*for SIBs*/
+  if (rntiP==SI_RNTI) {
+    LOG_D(MAC,"[eNB %d] CC_id %d Frame %d Get DLSCH sdu for BCCH \n", module_idP, CC_id, frameP);
+
+    return((unsigned char *)&eNB->common_channels[CC_id].BCCH_pdu.payload[0]);
+  }
+
+  UE_id = find_UE_id(module_idP,rntiP);
+
+  if (UE_id != -1) {
+    LOG_D(MAC,"[eNB %d] Frame %d:  CC_id %d Get DLSCH sdu for rnti %x => UE_id %d\n",module_idP,frameP,CC_id,rntiP,UE_id);
+    return((unsigned char *)&eNB->UE_list.DLSCH_pdu[CC_id][TBindex][UE_id].payload[0]);
+  } else {
+    LOG_E(MAC,"[eNB %d] Frame %d: CC_id %d UE with RNTI %x does not exist\n", module_idP,frameP,CC_id,rntiP);
+    return NULL;
+  }
+
+}
+
+

openair2/LAYER2/MAC/eNB_scheduler_primitives-nb.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.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.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 eNB_scheduler_primitives.c
+ * \brief primitives used by eNB for BCH, RACH, ULSCH, DLSCH scheduling
+ * \author  Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \email: navid.nikaein@eurecom.fr
+ * \version 1.0
+ * @ingroup _mac
+
+ */
+
+#include "assertions.h"
+#include "PHY/defs.h"
+#include "PHY/extern.h"
+
+#include "SCHED/defs.h"
+#include "SCHED/extern.h"
+
+#include "LAYER2/MAC/defs.h"
+#include "LAYER2/MAC/extern.h"
+
+#include "LAYER2/MAC/proto.h"
+#include "UTIL/LOG/log.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "UTIL/OPT/opt.h"
+#include "OCG.h"
+#include "OCG_extern.h"
+
+#include "RRC/LITE/extern.h"
+#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
+
+#include "defs-nb.h"
+#include "proto-nb.h"
+//#include "LAYER2/MAC/pre_processor.c"
+#include "pdcp.h"
+
+#if defined(ENABLE_ITTI)
+# include "intertask_interface.h"
+#endif
+
+#define ENABLE_MAC_PAYLOAD_DEBUG
+#define DEBUG_eNB_SCHEDULER 1
+
+
+
+
+int NB_rrc_mac_remove_ue(
+		module_id_t mod_idP,
+		rnti_t rntiP)
+{
+  int i;
+  UE_list_NB_t *UE_list = &eNB_mac_inst_NB[mod_idP].UE_list;
+  int UE_id = find_UE_id(mod_idP,rntiP); //may should be changed
+  int pCC_id;
+
+  if (UE_id == -1) {
+printf("MAC: cannot remove UE rnti %x\n", rntiP);
+    LOG_W(MAC,"NB_rrc_mac_remove_ue: UE %x not found\n", rntiP);
+    mac_phy_remove_ue(mod_idP, rntiP);
+    return 0;
+  }
+
+  pCC_id = UE_PCCID(mod_idP,UE_id);
+
+printf("MAC: remove UE %d rnti %x\n", UE_id, rntiP);
+  LOG_I(MAC,"Removing UE %d from Primary CC_id %d (rnti %x)\n",UE_id,pCC_id, rntiP);
+  dump_ue_list(UE_list,0); //may should be changed
+
+  UE_list->active[UE_id] = FALSE;
+  UE_list->num_UEs--;
+
+  // clear all remaining pending transmissions no lcgid in NB-IoT
+  /*UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID0]  = 0;
+  UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID1]  = 0;
+  UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID2]  = 0;
+  UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID3]  = 0;*/
+
+  //UE_list->UE_template[pCC_id][UE_id].ul_SR             = 0;
+  UE_list->UE_template[pCC_id][UE_id].rnti              = NOT_A_RNTI;
+  UE_list->UE_template[pCC_id][UE_id].ul_active         = FALSE;
+  eNB_ulsch_info[mod_idP][pCC_id][UE_id].rnti                        = NOT_A_RNTI;
+  eNB_ulsch_info[mod_idP][pCC_id][UE_id].status                      = S_UL_NONE;
+  eNB_dlsch_info[mod_idP][pCC_id][UE_id].rnti                        = NOT_A_RNTI;
+  eNB_dlsch_info[mod_idP][pCC_id][UE_id].status                      = S_DL_NONE;
+
+  NB_mac_phy_remove_ue(mod_idP,rntiP);
+
+  // check if this has an RA process active
+  RA_TEMPLATE_NB *RA_template;
+  for (i=0;i<NB_RA_PROC_MAX;i++) {
+    RA_template = (RA_TEMPLATE_NB *)&eNB_mac_inst_NB[mod_idP].common_channels[pCC_id].RA_template[i];
+    if (RA_template->rnti == rntiP){
+      RA_template->RA_active=FALSE;
+      RA_template->generate_rar=0;
+      RA_template->generate_Msg4=0;
+      RA_template->wait_ack_Msg4=0;
+      RA_template->timing_offset=0;
+      RA_template->RRC_timer=20;
+      RA_template->rnti = 0;
+      //break;
+    }
+  }
+
+  return 0;
+}
+
+//------------------------------------------------------------------------------
+DCI_PDU *NB_get_dci_sdu(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframeP)
+//------------------------------------------------------------------------------
+{
+
+  return(&eNB_mac_inst_NB[module_idP].common_channels[CC_id].DCI_pdu);
+
+}
+
+//NB_UL_failure_indication... some of the used primitive haven't defined
+

openair2/LAYER2/MAC/extern.h

@@ -45,6 +45,7 @@
 #endif //PHY_EMUL
 #include "PHY_INTERFACE/defs.h"
 #include "RRC/LITE/defs.h"
+#include "defs-nb.h"
 
 extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE];
 //extern uint32_t EBSR_Level[63];

openair2/LAYER2/MAC/vars.h

@@ -41,6 +41,9 @@
 #include "PHY_INTERFACE/defs.h"
 #include "COMMON/mac_rrc_primitives.h"
 
+//NB-IoT
+eNB_MAC_INST_NB *eNB_mac_inst_NB;
+
 const uint32_t BSR_TABLE[BSR_TABLE_SIZE]= {0,10,12,14,17,19,22,26,31,36,42,49,57,67,78,91,
                                            105,125,146,171,200,234,274,321,376,440,515,603,706,826,967,1132,
                                            1326,1552,1817,2127,2490,2915,3413,3995,4677,5467,6411,7505,8787,10287,12043,14099,

record.txt

+Develop record:
+
+Nick (nick133371@gmail.com)
+
+
+5/13 
+openair1/PHY/impl_defs_lte-nb.h
+openair1/PHY/INIT/defs-nb.h
+openair1/PHY/INIT/Lte_init-nb.c
+
+Comment: 
+Functions: NB_phy_config_mib_eNB(), NB_phy_config_sib2_eNB(), NB_phy_config_dedicated_eNB().
+Parameters: NB_DL_FRAME_PARAMS(Original LTE_DL_FRAME_PARAMS)
+
+5/14
+openair2/Layer2/MAC/defs-nb.h
+openair2/Layer2/MAC/proto-nb.h
+openair2/Layer2/MAC/eNB_scheduler_ulsch-nb.c
+openair2/Layer2/MAC/eNB_scheduler_prmitives-nb.c
+openair2/Layer2/MAC/eNB_scheduler_dlsch-nb.c
+
+comment:
+Functions: NB_rx_sdu(), NB_get_dci_sdu(), NB_rrc_mac_remove_ue(), NB_get_dlsch_sdu();
+Parameters: All parameters/structures used in MAC Layer.
+