Commit 7e6d8aa1 authored by wujing's avatar wujing

openair3 -> L3

parent eceb1a30
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "f1ap_itti_messaging.h" #include "f1ap_itti_messaging.h"
#include "f1ap_cu_rrc_message_transfer.h" #include "f1ap_cu_rrc_message_transfer.h"
#include "common/ran_context.h" #include "common/ran_context.h"
#include "openair3/UTILS/conversions.h" #include "L3_UTILS/conversions.h"
/* /*
Initial UL RRC Message Transfer Initial UL RRC Message Transfer
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "f1ap_cu_rrc_message_transfer.h" #include "f1ap_cu_rrc_message_transfer.h"
#include "f1ap_cu_ue_context_management.h" #include "f1ap_cu_ue_context_management.h"
#include "f1ap_cu_task.h" #include "f1ap_cu_task.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <ocp-gtpu/gtp_itf.h>
//Fixme: Uniq dirty DU instance, by global var, datamodel need better management //Fixme: Uniq dirty DU instance, by global var, datamodel need better management
instance_t CUuniqInstance=0; instance_t CUuniqInstance=0;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "rrc_eNB_S1AP.h" #include "rrc_eNB_S1AP.h"
#include "rrc_eNB_GTPV1U.h" #include "rrc_eNB_GTPV1U.h"
#include "RRC/NR/rrc_gNB_NGAP.h" #include "RRC/NR/rrc_gNB_NGAP.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <ocp-gtpu/gtp_itf.h>
static void setQos(F1AP_NonDynamic5QIDescriptor_t *toFill) { static void setQos(F1AP_NonDynamic5QIDescriptor_t *toFill) {
asn1cCalloc(toFill, tmp); asn1cCalloc(toFill, tmp);
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "f1ap_du_ue_context_management.h" #include "f1ap_du_ue_context_management.h"
#include "f1ap_du_rrc_message_transfer.h" #include "f1ap_du_rrc_message_transfer.h"
#include "f1ap_du_task.h" #include "f1ap_du_task.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <ocp-gtpu/gtp_itf.h>
//Fixme: Uniq dirty DU instance, by global var, datamodel need better management //Fixme: Uniq dirty DU instance, by global var, datamodel need better management
instance_t DUuniqInstance=0; instance_t DUuniqInstance=0;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "rrc_eNB_UE_context.h" #include "rrc_eNB_UE_context.h"
#include "RRC/NR/rrc_gNB_UE_context.h" #include "RRC/NR/rrc_gNB_UE_context.h"
#include "MAC/NR_SCD_gNB/nr_mac_gNB.h" #include "MAC/NR_SCD_gNB/nr_mac_gNB.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <ocp-gtpu/gtp_itf.h>
boolean_t lteDURecvCb( protocol_ctxt_t *ctxt_pP, boolean_t lteDURecvCb( protocol_ctxt_t *ctxt_pP,
const srb_flag_t srb_flagP, const srb_flag_t srb_flagP,
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include "RRC_config_tools.h" #include "RRC_config_tools.h"
#include "enb_paramdef.h" #include "enb_paramdef.h"
#include "executables/thread-common.h" #include "executables/thread-common.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <ocp-gtpu/gtp_itf.h>
extern uint32_t to_earfcn_DL(int eutra_bandP, uint32_t dl_CarrierFreq, uint32_t bw); extern uint32_t to_earfcn_DL(int eutra_bandP, uint32_t dl_CarrierFreq, uint32_t bw);
extern uint32_t to_earfcn_UL(int eutra_bandP, uint32_t ul_CarrierFreq, uint32_t bw); extern uint32_t to_earfcn_UL(int eutra_bandP, uint32_t ul_CarrierFreq, uint32_t bw);
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
//#include "RRC_config_tools.h" //#include "RRC_config_tools.h"
#include "gnb_paramdef.h" #include "gnb_paramdef.h"
#include "NR_SCD_gNB/mac_proto.h" #include "NR_SCD_gNB/mac_proto.h"
#include <openair3/ocp-gtpu/gtp_itf.h> #include <ocp-gtpu/gtp_itf.h>
#include "NR_asn_constant.h" #include "NR_asn_constant.h"
#include "executables/thread-common.h" #include "executables/thread-common.h"
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
#include "MAC/NR_SCD_COMMON/nr_mac_common.h" #include "MAC/NR_SCD_COMMON/nr_mac_common.h"
#include "NR_TAG.h" #include "NR_TAG.h"
#include <openair3/UICC/usim_interface.h> #include <UICC/usim_interface.h>
/* Defs */ /* Defs */
......
...@@ -74,7 +74,7 @@ unsigned short config_frames[4] = {2,9,11,13}; ...@@ -74,7 +74,7 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "ngap_gNB.h" #include "ngap_gNB.h"
#include "RRC/NR_UE/rrc_proto.h" #include "RRC/NR_UE/rrc_proto.h"
#include "RRC/NR_UE/rrc_vars.h" #include "RRC/NR_UE/rrc_vars.h"
#include "openair3/NAS/UE/nas_ue_task.h" #include "NAS/UE/nas_ue_task.h"
#include <executables/split_headers.h> #include <executables/split_headers.h>
#include <executables/nr-uesoftmodem.h> #include <executables/nr-uesoftmodem.h>
#if ITTI_SIM #if ITTI_SIM
......
...@@ -2,10 +2,6 @@ include $(OPENAIR_DIR)/common/utils/Makefile.inc ...@@ -2,10 +2,6 @@ include $(OPENAIR_DIR)/common/utils/Makefile.inc
LIB = -lxml2 LIB = -lxml2
TOP_DIR = ../.. TOP_DIR = ../..
OPENAIR1_TOP = ../..
OPENAIR2_TOP = ../../../MAC
OPENAIR3_TOP = ../../../openair3
OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
......
...@@ -55,10 +55,6 @@ clean: ...@@ -55,10 +55,6 @@ clean:
else else
TOP_DIR = ../.. TOP_DIR = ../..
OPENAIR1_TOP = ../..
OPENAIR2_TOP = ../../../MAC
OPENAIR3_TOP = ../../../openair3
OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
......
...@@ -8,7 +8,6 @@ $OPENAIR_HOME = "/home/$USER/openair4G"; ...@@ -8,7 +8,6 @@ $OPENAIR_HOME = "/home/$USER/openair4G";
// //
$PHY_DIR = "$OPENAIR_HOME/PHY"; $PHY_DIR = "$OPENAIR_HOME/PHY";
$MAC_DIR = "$OPENAIR_HOME/MAC"; $MAC_DIR = "$OPENAIR_HOME/MAC";
$OPENAIR3_DIR = "$OPENAIR_HOME/openair3";
$OPENAIR_TARGETS = "$OPENAIR_HOME/targets"; $OPENAIR_TARGETS = "$OPENAIR_HOME/targets";
$WEBXML_PATH = "$OPENAIR_TARGETS/SIMU/EXAMPLES/OSD/WEBXML"; $WEBXML_PATH = "$OPENAIR_TARGETS/SIMU/EXAMPLES/OSD/WEBXML";
$RESULTS_PATH = "$OPENAIR_TARGETS/SIMU/EXAMPLES/OSD/RESULTS"; $RESULTS_PATH = "$OPENAIR_TARGETS/SIMU/EXAMPLES/OSD/RESULTS";
......
...@@ -47,7 +47,7 @@ include('/opt/lampp/htdocs/OSD/OpenAirEmu.conf'); ...@@ -47,7 +47,7 @@ include('/opt/lampp/htdocs/OSD/OpenAirEmu.conf');
//echo $GET_OPENAIR_TARGETS; //echo $GET_OPENAIR_TARGETS;
// TO BE SURE ABOUT THE PATHs // TO BE SURE ABOUT THE PATHs
//echo $OPENAIR_TARGETS.'<br />'.$WEBXML_PATH.'<br />'.$RESULTS_PATH.'<br />'.$PHY_DIR.'<br />'.$MAC_DIR.'<br />'.$OPENAIR3_DIR.'<br />'; //echo $OPENAIR_TARGETS.'<br />'.$WEBXML_PATH.'<br />'.$RESULTS_PATH.'<br />'.$PHY_DIR.'<br />'.$MAC_DIR.'<br />';
// TO HIDE ALL THE PHP ERRORS AND WARNINGS // TO HIDE ALL THE PHP ERRORS AND WARNINGS
ini_set('display_errors','Off'); ini_set('display_errors','Off');
...@@ -319,9 +319,9 @@ else { ...@@ -319,9 +319,9 @@ else {
// -1 : portable, 0: web portal, # for templates // -1 : portable, 0: web portal, # for templates
// 2 - STARTING OAISIM // 2 - STARTING OAISIM
// $OAISIM=shell_exec("set -x ; mkdir /tmp/$ID ; cd /tmp/$ID ; export PHY_DIR=$PHY_DIR ; export MAC_DIR=$MAC_DIR ; export OPENAIR3_DIR=$OPENAIR3_DIR ; export OPENAIR_TARGETS=$OPENAIR_TARGETS ; $OPENAIR_TARGETS/SIMU/USER/oaisim -a -c $XML_FILENAME >oaisim.log ; mv * $RESULTS_PATH_EMULATION_LOGS ; rmdir /tmp/$ID "); // $OAISIM=shell_exec("set -x ; mkdir /tmp/$ID ; cd /tmp/$ID ; export PHY_DIR=$PHY_DIR ; export MAC_DIR=$MAC_DIR ; export OPENAIR_TARGETS=$OPENAIR_TARGETS ; $OPENAIR_TARGETS/SIMU/USER/oaisim -a -c $XML_FILENAME >oaisim.log ; mv * $RESULTS_PATH_EMULATION_LOGS ; rmdir /tmp/$ID ");
$OAISIM="set -x ; mkdir /tmp/$ID ; cd /tmp/$ID ; export PHY_DIR=$PHY_DIR ; export MAC_DIR=$MAC_DIR ; export OPENAIR3_DIR=$OPENAIR3_DIR ; export OPENAIR_TARGETS=$OPENAIR_TARGETS ; $OPENAIR_TARGETS/SIMU/USER/oaisim $PHY_ABSTRACTION $SNR $DL_MCS $UL_MCS -c -1 >oaisim.log ".$PROFILING_PARSE." ; cp oaisim.log $RESULTS_PATH_EMULATION".$PROFILING_COPY.$PCAP_COPY; $OAISIM="set -x ; mkdir /tmp/$ID ; cd /tmp/$ID ; export PHY_DIR=$PHY_DIR ; export MAC_DIR=$MAC_DIR ; export OPENAIR_TARGETS=$OPENAIR_TARGETS ; $OPENAIR_TARGETS/SIMU/USER/oaisim $PHY_ABSTRACTION $SNR $DL_MCS $UL_MCS -c -1 >oaisim.log ".$PROFILING_PARSE." ; cp oaisim.log $RESULTS_PATH_EMULATION".$PROFILING_COPY.$PCAP_COPY;
//echo $OAISIM; //echo $OAISIM;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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