create new header file sched_extern_NB_IoT.h

openair1/PHY/CODING/lte_segmentation_NB_IoT.c

@@ -25,7 +25,7 @@
    date: 21.10.2009
 */
 #include "PHY/defs_L1_NB_IoT.h"
-#include "SCHED_NBIOT/extern_NB_IoT.h"
+#include "SCHED_NBIOT/sched_common_extern_NB_IoT.h"
 
 //#define DEBUG_SEGMENTATION
 

openair1/SCHED/extern.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.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
- */
-
-/*!\brief SCHED external variables */
-
-#ifndef __SCHED_EXTERN_H__
-#define __SCHED_EXTERN_H__
-
-#ifndef USER_MODE
-#define __NO_VERSION__
-
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/types.h>
-
-#include <asm/io.h>
-#include <asm/bitops.h>
-
-#include <asm/uaccess.h>
-#include <asm/segment.h>
-#include <asm/page.h>
-
-
-#ifdef RTAI_ENABLED
-#include <rtai.h>
-//#include <rtai_posix.h>
-#include <rtai_fifos.h>
-#include <rtai_sched.h>
-#include <rtai_sem.h>
-//#include "rt_compat.h"
-
-#else
-#include <unistd.h>
-#endif
-
-#endif  /* USER_MODE */
-
-#include "defs.h"
-//#include "dlc_engine.h"
-
-extern int openair_sched_status;
-
-//extern int exit_PHY;
-//extern int exit_PHY_ack;
-
-extern int synch_wait_cnt;
-
-
-extern int16_t hundred_times_delta_TF[100];
-extern uint16_t hundred_times_log10_NPRB[100];
-/*
-#ifdef EMOS
-extern fifo_dump_emos_UE emos_dump_UE;
-extern fifo_dump_emos_eNB emos_dump_eNB;
-#endif
-*/
-
-
-#endif /*__SCHED_EXTERN_H__ */

openair1/SCHED_NBIOT/extern_NB_IoT.h → openair1/SCHED_NBIOT/sched_common_extern_NB_IoT.h

@@ -24,41 +24,6 @@
 #ifndef __SCHED_EXTERN_NB_IOT_H__
 #define __SCHED_EXTERN_NB_IOT_H__
 
-#ifndef USER_MODE
-#define __NO_VERSION__
-
-
-#include <linux/kernel.h>
-//#include <linux/init.h>
-//#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/types.h>
-
-#include <asm/io.h>
-#include <asm/bitops.h>
-
-#include <asm/uaccess.h>
-#include <asm/segment.h>
-#include <asm/page.h>
-
-
-#ifdef RTAI_ENABLED
-#include <rtai.h>
-//#include <rtai_posix.h>
-#include <rtai_fifos.h>
-#include <rtai_sched.h>
-#include <rtai_sem.h>
-//#include "rt_compat.h"
-
-#else
-#include <unistd.h>
-#endif
-
-#endif  /* USER_MODE */
-
-
-
-
 #include "defs_NB_IoT.h"
 
 

openair2/COMMON/rrc_messages_types.h

@@ -424,10 +424,10 @@ typedef struct NbIoTRrcConfigurationReq_s {
   lte_prefix_type_t       prefix_type;
   lte_prefix_type_t   prefix_type_UL;
   int16_t                 eutra_band;
-  uint32_t                downlink_frequency;
-  int32_t                 uplink_frequency_offset;
-  int16_t                 Nid_cell;// for testing, change later
-  int16_t                 N_RB_DL;// for testing, change later
+  uint32_t                downlink_frequency[MAX_NUM_CCs];
+  int32_t                 uplink_frequency_offset[MAX_NUM_CCs];
+  int16_t                 Nid_cell[MAX_NUM_CCs];// for testing, change later
+  int16_t                 N_RB_DL[MAX_NUM_CCs];// for testing, change later
   //RACH
   long            rach_raResponseWindowSize_NB;
   long            rach_macContentionResolutionTimer_NB;

openair2/RRC/NBIOT/rrc_eNB_NB_IoT.c

@@ -297,8 +297,8 @@ void init_testing_NB_IoT(uint8_t Mod_id, int CC_id, rrc_eNB_carrier_data_NB_IoT_
  //copy basic parameters
   carrier[CC_id].physCellId      = configuration->Nid_cell[CC_id];
   carrier[CC_id].p_rx_eNB   = 1;
-  carrier[CC_id].Ncp             = configuration->prefix_type[CC_id]; //DL Cyclic prefix
-  carrier[CC_id].Ncp_UL           = configuration->prefix_type_UL[CC_id];//UL cyclic prefix
+  carrier[CC_id].Ncp             = configuration->prefix_type; //DL Cyclic prefix
+  carrier[CC_id].Ncp_UL           = configuration->prefix_type_UL;//UL cyclic prefix
   carrier[CC_id].dl_CarrierFreq  = configuration->downlink_frequency[CC_id];
   carrier[CC_id].ul_CarrierFreq  = configuration->downlink_frequency[CC_id]+ configuration->uplink_frequency_offset[CC_id];
 
@@ -1293,7 +1293,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT(
   *DRB_configList2 = CALLOC(1, sizeof(**DRB_configList2));
 
   /* Initialize NAS list */
-  dedicatedInfoNASList_NB_IoT = CALLOC(1, sizeof(struct RRCConnectionReconfiguration_NB_r13_IEs__dedicatedInfoNASList_r13));
+  dedicatedInfoNASList_NB_IoT = CALLOC(1, sizeof(struct LTE_RRCConnectionReconfiguration_NB_r13_IEs__dedicatedInfoNASList_r13));
 
   //MP:add a check on number of setup e_rabs
   if(ue_context_pP->ue_context.setup_e_rabs > 2){
@@ -1675,7 +1675,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB_IoT(const protocol_
   LTE_DRB_ToAddModList_NB_r13_t**                DRB_configList                   = &ue_context_pP->ue_context.DRB_configList;
   LTE_DRB_ToAddModList_NB_r13_t**                DRB_configList2                  = NULL;
 
-  LTE_MAC_MainConfig_NB_r13_t                   *mac_MainConfig_NB_IoT           = NULL;
+  MAC_MainConfig_NB_r13_t                   *mac_MainConfig_NB_IoT           = NULL;
 
   long                *periodicBSR_Timer;
   long								*enableStatusReportSN_Gap  = NULL; //should be disabled