yigid/openairinterface5g
1
0
Fork 0
mirror of https://gitlab.eurecom.fr/oai/openairinterface5g.git synced 2026-07-20 08:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

--build-codeblocks switch added, command line parser fixed.

Browse Source
This commit is contained in:
Schultze
2019-02-27 12:55:28 +01:00
parent fb435f2d48
commit a89a9ae311
5 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake_targets/build_oai
View File

@@ -69,6 +69,7 @@ UE_TIMING_TRACE="False"
DISABLE_LOG_X="False"
USRP_REC_PLAY="False"
BUILD_ECLIPSE=0
BUILD_CODEBLOCKS=0
UE_NAS_USE_TUN="False"
BASIC_SIMULATOR=0
trap handle_ctrl_c INT
@@ -156,6 +157,8 @@ Options
Disable all LOG_* macros
--build-eclipse
Build eclipse project files. Paths are auto corrected by fixprj.sh
--build-codeblocks
Build CodeBlocks project files.
--build-telnet
Build telnet server, specify --telnetsrv on command line to start it (eNB only)
--build-msc
@@ -354,6 +357,11 @@ function main() {
CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -G"Eclipse CDT4 - Unix Makefiles"'
echo_info "Enabling build eclipse project support"
shift 1;;
--build-codeblocks)
BUILD_CODEBLOCKS=1
CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_CODEBLOCKS_GENERATE_SOURCE_PROJECT=TRUE -G"CodeBlocks - Unix Makefiles"'
echo_info "Enabling build CodeBlocks project support"
shift 1;;
--build-telnetsrv)
BUILD_TELNETSRV=1
echo_info "Build embedded telnet server"

5
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
View File

@@ -337,6 +337,11 @@ int lte_sync_time(int **rxdata, ///rx data in time domain
int *eNB_id)
{
// [IRTMS debug]
static int num_calles=0;
printf("[IRTMS]lte_sync_time called %d times\n", num_calles);
// perform a time domain correlation using the oversampled sync sequence

2
openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
View File

@@ -171,6 +171,8 @@ int netlink_init(void)
{
int ret;
printf("[IRTMS] Opening socket...\n");
nas_sock_fd = socket(PF_NETLINK, SOCK_RAW,GRAAL_NETLINK_ID);
if (nas_sock_fd == -1) {

3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
View File

@@ -105,6 +105,9 @@ eNBs =
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
# IRT MS addition:
# mbms_dedicated_serving_cell = "ENABLE"
}
);

24
targets/RT/USER/lte-uesoftmodem.c
View File

@@ -693,11 +693,27 @@ int main( int argc, char **argv ) {
#if defined (XFORMS)
int ret;
#endif
// [IRTMS] fix, see Merge branch 'issue-399-master-ue-hot-fix' into 'master'
configmodule_interface_t *config_mod;
// [IRTMS] end fix
start_background_system();
// [IRTMS] fix, see Merge branch 'issue-399-master-ue-hot-fix' into 'master'
/*
if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == NULL) {
exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
}
*/
config_mod = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
if (config_mod == NULL) {
exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
}
// [IRTMS] end fix
mode = normal_txrx;
memset(&openair0_cfg[0],0,sizeof(openair0_config_t)*MAX_CARDS);
@@ -715,6 +731,10 @@ int main( int argc, char **argv ) {
abort();
}
printf("\n[IRTMS] Hello from main\n");
printf("NFAPI_MODE value: %d \n", nfapi_mode);
// Checking option of nums_ue_thread.
@@ -811,8 +831,12 @@ int main( int argc, char **argv ) {
} else init_openair0(frame_parms[0],(int)rx_gain[0][0]);
if (simL1flag==1) {
// [IRTRMS] fix, see Merge branch 'issue-399-master-ue-hot-fix' into 'master'
/*
AssertFatal(NULL!=load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY),
"[SOFTMODEM] Error, configuration module init failed\n");
*/
// [IRTMS] end fix
RCConfig_sim();
}