Skip to content
Snippets Groups Projects

Nr rrc configuration merge develop

Closed Florian Kaltenberger requested to merge NR_RRCConfiguration_merge_develop into develop

Merge request reports

Checking pipeline status.

Closed by Florian KaltenbergerFlorian Kaltenberger 5 years ago (Feb 17, 2020 8:09pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • Developer

      This is a proposal to fix the nr_dlsim and nr_ulsim compilation problem. I included softmodem-common.c in these target sources and added also a PHYSICAL_SIMULATOR compilation macro in CMakefile.txt. Testing the PHYSICAL_SIMULATOR macro in softmodem-common.c allows to prevent inclusion of unwanted code when compiling PHY simulators.

    • ok, I wasn't aware of the macro PHYSICAL_SIMULATOR. But I think there is still a piece missing. phy_test is still a local variable to nr_[dl|ul]dlsim and setting it won't have an impact. We need to replace it with get_softmodem_params()->phy_test, don't we?

    • The macro PHYSICAL_SIMULATOR has been added, it was not there previously; Yes there shouldn't be any reference to a local phy_test variable, i may have missed it.

    • Please register or sign in to reply
  • OAI RAN-CI-develop build (332): Some Changed files in Merge Request DO NOT follow OAI Formatting Rules

  • OAI RAN-CI-develop build (332): Some modified files in Merge Request MAY have INTRODUCED up to 19 CPPCHECK errors/warnings

  • OAI RAN-CI-develop build (332): Some modified files in Merge Request MAY have INTRODUCED WARNINGS (executables/nr-ru.c executables/nr-softmodem.c openair1/PHY/INIT/nr_init_ue.c openair1/PHY/NR_TRANSPORT/nr_dci.c openair1/PHY/NR_TRANSPORT/nr_dci_tools.c openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c openair1/PHY/NR_UE_TRANSPORT/nr_prach.c openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c openair1/PHY/TOOLS/nr_phy_scope.c openair1/SCHED_NR_UE/phy_procedures_nr_ue.c openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c openair1/SIMULATION/NR_PHY/prachsim.c openair1/SIMULATION/NR_PHY/ulsim.c openair2/GNB_APP/gnb_app.c openair2/GNB_APP/gnb_config.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c openair2/RRC/NR/MESSAGES/asn1_msg.c openair2/RRC/NR/rrc_gNB.c openair2/RRC/NR/rrc_gNB_nsa.c openair2/RRC/NR/rrc_gNB_reconfig.c openair2/X2AP/x2ap_eNB_generate_messages.c openair2/X2AP/x2ap_eNB_handler.c)

Please register or sign in to reply
Loading