Commit b7636927 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w31' into 'develop' 

Integration: `2025.w31`

* !3324 Use complex data type for channel magnitude
* !3462 Synchronized Real-Time Data Recording Application Addition
* !3536 Remove --usim-test command line option
* !3537 Another fix for CSI PDSCH overlap
* !3546 Fix for tun_if.c warning "specified bound 16 equals destination size"
* !3523 Fix UE PDSCH LLR
* !3544 Fix sib1 reception flag
* !3534 CI: Adjust frequency configuration
* !3530 remove specific directory for LTE SIM management tools
* !3545 Fix overflow when negating minimum int16_t value in precoding
* !3461 Fix Dedicated BWPs
* !3558 feat(LDPCImplementation.md): Fix documentation

Closes #948 and #955

See merge request !3551
parents 61c769f8 75524654

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
cmake_targets/log/

cmake_targets/*/build/

cmake_targets/ran_build/

cmake_targets/nas_sim_tools/build/

log/

lte_build_oai/

CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ else () 
endif()



# add autotools definitions that were maybe used!

add_definitions("-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP")

add_definitions(-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP)



# we need -rdynamic to incorporate all symbols in shared objects, see man page

set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing -rdynamic")
@@ -848,6 +848,7 @@ set(PHY_SRC_COMMON 
  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c

  ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c

  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c

  ${OPENAIR1_DIR}/PHY/log_tools.c

  )



set(PHY_SRC

ci-scripts/as_ue/aw2s-multi-00102-20.cfg

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
{

#define N_ANTENNA_DL 1

#define N_ANTENNA_UL 1

#define DL_ARFCN 631296

#define DL_ARFCN 627360

#define TDD 1



log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",

ci-scripts/ci_infra.yaml

+2 −2
Original line number Diff line number Diff line
@@ -147,12 +147,12 @@ ltebox-nepes: 


amarisoft_ue:

  Host: amariue

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz/aw2s-multi-00102-20.cfg &

  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  NetworkScript: ip netns exec ue1 ip a show dev pdn0

amarisoft_ue_2x2:

  Host: amariue

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_2x2/aw2s-multi-00102-2x2-v2.cfg &

  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  NetworkScript: ip netns exec ue1 ip a show dev pdn0

amarisoft_ue_fhi72:

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

+17 −8
Original line number Diff line number Diff line
@@ -34,11 +34,9 @@ gNBs = 


#  downlinkConfigCommon

    #frequencyInfoDL

      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)

      absoluteFrequencySSB                                          = 641280;

      absoluteFrequencySSB                                             = 641280; # GSCN: 7929, Freq: 3619.200 MHz

      dl_frequencyBand                                                 = 78;

      # this is 3600 MHz

      dl_absoluteFrequencyPointA                                       = 640008;

      dl_absoluteFrequencyPointA                                       = 640752; # 3611.280 MHz

      #scs-SpecificCarrierList

        dl_offstToCarrier                                              = 0;

# subcarrierSpacing
@@ -47,13 +45,12 @@ gNBs = 
        dl_carrierBandwidth                                            = 106;

     #initialDownlinkBWP

      #genericParameters

        # this is RBstart=27,L=48 (275*(L-1))+RBstart

        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952

        initialDLBWPlocationAndBandwidth                               = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  

        initialDLBWPsubcarrierSpacing                                           = 1;

      #pdcch-ConfigCommon

        initialDLBWPcontrolResourceSetZero                              = 12;

        initialDLBWPcontrolResourceSetZero                              = 10;

        initialDLBWPsearchSpaceZero                                             = 0;



  #uplinkConfigCommon
@@ -68,7 +65,7 @@ gNBs = 
      pMax                                                          = 20;

     #initialUplinkBWP

      #genericParameters

        initialULBWPlocationAndBandwidth                            = 28875;

        initialULBWPlocationAndBandwidth                            = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  

        initialULBWPsubcarrierSpacing                                           = 1;
@@ -152,6 +149,18 @@ gNBs = 


  );



    servingCellConfigDedicated = ({

      dl_bwp-Id_1 = 1;

      dl_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart

      dl_bwp1_subcarrierSpacing = 1;

      firstActiveDownlinkBWP-Id = 1;

      defaultDownlinkBWP-Id = 1;

      ul_bwp-Id_1 = 1;

      ul_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart

      ul_bwp1_subcarrierSpacing = 1;

      firstActiveUplinkBWP-Id = 1;

    });





    # ------- SCTP definitions

    SCTP :