• Cedric Roux's avatar
    Fix NFAPI integration · 922b5b59
    Cedric Roux authored
    This commit fixes issues introduced by the previous commit.
    
    Summary of work:
    - cleanup:
      - fix LOG_XX to be less verbose
      - fix cmake_targets/CMakeLists.txt
      - fix oaienv
      - remove dead code
    - bug fixes:
      - in openair1/SCHED/fapi_l1.c we had:
          eNB->pdcch_vars[subframe&1].num_dci           = number_dci;
        should be:
          eNB->pdcch_vars[subframe&1].num_dci           = 0;
        This bug let the PHY send more DCIs than what should have been
        sent because num_dci is incremented later on in the code.
        This fix may be a problem for fapi mode, to be checked.
      - add new T VCD traces
      - revert openair1/PHY/TOOLS/file_output.c to 'develop' version
      - remove thread_id in logRecord/logRecord_mt
      - revert (and adapt) configuration files
      - be careful when doing frame++, we need to % 1024
      - revert target_rx_power in openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
    - NFAPI:
      - the open-nFAPI code has been included in the repository. See nfapi/README.
        Maybe we should "git clone" the Cisco repository instead. We have to be
        careful of availability though.
    
    What has been tested:
    - monolithic eNB FDD 5/10MHz with one UE, iperf UDP/TCP uplink/downlink
    
    Anything else may fail to work, especially the FAPI mode, which has not
    been tested at all.
    922b5b59
Makefile.am 1.37 KB
#
# 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.
# 

AUTOMAKE_OPTIONS=subdir-objects
AM_CPPFLAGS = -I$(top_srcdir)/vnf_sim/inc -I$(top_srcdir)/sim_common/inc -I$(top_srcdir)/common/public_inc -I$(top_srcdir)/nfapi/inc -I$(top_srcdir)/nfapi/public_inc -I$(top_srcdir)/vnf/inc -I$(top_srcdir)/vnf/public_inc $(XML_CFLAGS) -Wall -Werror -g
AM_CXXFLAGS = -I$(top_srcidr)/vnf_sim/inc -I$(top_srcdir)/sim_common/inc -I$(top_srcdir)/common/public_inc -I$(top_srcdir)/nfapi/inc -I$(top_srcdir)/nfapi/public_inc -I$(top_srcdir)/vnf/inc -I$(top_srcdir)/vnf/public_inc $(XML_CFLAGS) -std=c++11 $(BOOST_CPPFLAGS) -g
bin_PROGRAMS = vnfsim
vnfsim_SOURCES = src/main.cpp src/mac.cpp
LDADD= $(top_builddir)/vnf/libnfapi_vnf.a $(top_builddir)/common/libnfapi_common.a $(top_builddir)/nfapi/libnfapi.a $(top_builddir)/sim_common/libnfapi_sim_common.a -L$(libdir) -lpthread -lrt -lsctp -lz