Merge branch 'integration_2023_w42' into 'develop'

Integration Branch 2023.w42

See merge request oai/openairinterface5g!2403

* !2368 NR UE SRB0
* !2399 build_oai: Auto-detect if terminal supports colors
* !2398 Correctly load channel models
* !2365 Change PDU_Length and tlv length calculation to be inline with SCF 222.10.02
* !2402 chore(ci): enabling the ARM cross-compilation pipeline
* !2397 fix(ci): improve for parallelism issue in Groovy
* !2405 Clean IDE files and remove old documentation

.gitignore

@@ -9,8 +9,11 @@ cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
 
-# vscode
+# IDE files
 .vscode
+.cproject
+.project
+.settings
 
 # Tags for vim/global
 GPATH

.vscode/launch.json

-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "(gdb) Launch",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/cmake_targets/ran_build/build/lte-softmodem",
-            "args": [
-                "-O", "../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf",
-                "--noS1"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/cmake_targets",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "miDebuggerPath": "${workspaceFolder}/cmake_targets/sudo-gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        }
-    ]
-}

cmake_targets/tools/build_helper

@@ -54,16 +54,17 @@ fi
 ###############################
 ## echo and  family
 ###############################
-black='\E[30m'
-red='\E[31m'
-green='\E[32m'
-yellow='\E[33m'
-blue='\E[1;34m'
-magenta='\E[35m'
-cyan='\E[36m'
-white='\E[37m'
-reset_color='\E[00m'
-COLORIZE=1
+# only emit color if connected to a terminal, and if it supports colors
+if [ -t 1 ]; then
+  num_colors=$(tput colors)
+  if [ -n "$num_colors" ] && [ "$num_colors" -ge 8 ]; then
+    red='\E[31m'
+    green='\E[32m'
+    yellow='\E[33m'
+    blue='\E[1;34m'
+    reset_color='\E[00m'
+  fi
+fi
 
 cecho()  {
     # Color-echo
@@ -72,8 +73,7 @@ cecho()  {
     local default_msg="No Message."
     message=${1:-$default_msg}
     color=${2:-$green}
-    [ "$COLORIZE" = "1" ] && message="$color$message$reset_color"
-    echo -e "$message"
+    echo -e "$color$message$reset_color"
     return
 }
 
@@ -685,6 +685,15 @@ install_simde_from_source(){
     $SUDO rm -rf /tmp/simde
     git clone https://github.com/simd-everywhere/simde-no-tests.git /tmp/simde
     cd /tmp/simde
+    # we can specify a given version of SIMDE (sha-one or tag)
+    if [[ -v SIMDE_VERSION ]]; then
+      git checkout -f $SIMDE_VERSION
+    else
+      # At time of writing, last working commit for OAI
+      git checkout 389f360a66d4a3bec62b7d71ad8be877487809ba
+    fi
+    # Showing which version is used
+    git log -n1
     # brute force copy into /usr/include
     $SUDO \cp -rv ../simde /usr/include
 }

docker/Dockerfile.base.ubuntu20.cross-arm64

@@ -29,6 +29,8 @@
 FROM ubuntu:focal AS ran-base
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
+# Specifying a working version of SIMDE for ARM:
+ENV SIMDE_VERSION=389f360a66d4a3bec62b7d71ad8be877487809ba
 
 #install developers pkg/repo
 RUN apt-get update && \

docker/Dockerfile.build.ubuntu20.cross-arm64

@@ -43,5 +43,10 @@ RUN /bin/sh oaienv && \
     cd ../build-cross/ && \
     cmake ../../.. -GNinja -DCMAKE_TOOLCHAIN_FILE=../../../cmake_targets/cross-arm.cmake -DNATIVE_DIR=../build && \
     echo "====== Start of log for cross-build executables ======" && \
-    ninja dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim lte-softmodem nr-softmodem nr-cuup oairu lte-uesoftmodem nr-uesoftmodem params_libconfig coding rfsimulator > ../../log/all.txt 2>&1 && \
+    # making always passing so we can analyze the all.txt file
+    ninja dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim lte-softmodem nr-softmodem nr-cuup oairu lte-uesoftmodem nr-uesoftmodem params_libconfig coding rfsimulator > ../../log/all.txt 2>&1; \
+    # displaying errors and warnings
+    egrep -A3 "warning:|error:" ../../log/all.txt || true && \
+    # will fail only for errors
+    egrep -L "error:" ../../log/all.txt && \
     echo "====== End of log for cross-build executables ======"

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h

@@ -1466,9 +1466,11 @@ typedef enum {
 
 //table 3-58
 #define NFAPI_NR_MAX_TX_REQUEST_TLV 2
-typedef struct
-{
-  uint16_t PDU_length;
+typedef struct {
+  uint16_t PDU_length; // SCF 222.10.02 The total length (in bytes) of the PDU description and  PDU data, without the padding bytes.
+                       // (2 bytes PDU_Length + 2 bytes PDU_Index + 4 bytes num_TLV + TLV size ( 2 bytes tag + 2 bytes length +
+                       // value size without padding))
+                       // TBS + 12
   uint16_t PDU_index;
   uint32_t num_TLV;
   nfapi_nr_tx_data_request_tlv_t TLVs[NFAPI_NR_MAX_TX_REQUEST_TLV];

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c

@@ -13,7 +13,7 @@
  */
 
 #include <stdint.h>
-#include <immintrin.h>
+#include "PHY/sse_intrin.h"
 #include "nrLDPCdecoder_defs.h"
 #include "nrLDPC_types.h"
 #include "nrLDPC_init.h"

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -108,16 +108,6 @@ void nr_rrc_ue_generate_RRCSetupRequest(module_id_t module_id, const uint8_t gNB
   return;
 }
 
-int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
-                              const int CC_id,
-                              const uint8_t gNB_id,
-                              const frame_t frameP,
-                              const rb_id_t Srb_id,
-                              uint8_t *buffer_pP)
-{
-  return 0;
-}
-
 int8_t nr_rrc_RA_succeeded(const module_id_t mod_id, const uint8_t gNB_index) {
   return 0;
 }

openair1/SIMULATION/NR_PHY/nr_dummy_functions.c

@@ -32,6 +32,8 @@ void nr_mac_rrc_sync_ind(const module_id_t module_id,
                          const frame_t frame,
                          const bool in_sync) {}
 
+void nr_mac_rrc_msg3_ind(const module_id_t mod_id, int rnti) {}
+
 void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success) {}
 
 void rrc_data_ind(const protocol_ctxt_t *const ctxt_pP,

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -108,16 +108,6 @@ void nr_rrc_ue_generate_RRCSetupRequest(module_id_t module_id, const uint8_t gNB
   return;
 }
 
-int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
-                              const int         CC_id,
-                              const uint8_t     gNB_id,
-                              const frame_t     frameP,
-                              const rb_id_t     Srb_id,
-                              uint8_t           *buffer_pP)
-{
-  return 0;
-}
-
 int8_t nr_rrc_RA_succeeded(const module_id_t mod_id, const uint8_t gNB_index) {
   return 0;
 }

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -104,16 +104,6 @@ void nr_rrc_ue_generate_RRCSetupRequest(module_id_t module_id, const uint8_t gNB
   return;
 }
 
-int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
-                              const int         CC_id,
-                              const uint8_t     gNB_id,
-                              const frame_t     frameP,
-                              const rb_id_t     Srb_id,
-                              uint8_t           *buffer_pP)
-{
-  return 0;
-}
-
 int8_t nr_rrc_RA_succeeded(const module_id_t mod_id, const uint8_t gNB_index) {
   return 0;
 }

openair2/COMMON/mac_messages_def.h

@@ -49,6 +49,7 @@ MESSAGE_DEF(RRC_MAC_MCCH_DATA_IND,      MESSAGE_PRIORITY_MED_PLUS, RrcMacMcchDat
 MESSAGE_DEF(RRC_MAC_PCCH_DATA_REQ,      MESSAGE_PRIORITY_MED_PLUS, RrcMacPcchDataReq,           rrc_mac_pcch_data_req)
 
 MESSAGE_DEF(NR_RRC_MAC_RA_IND,          MESSAGE_PRIORITY_MED_PLUS, NRRrcMacRaInd,               nr_rrc_mac_ra_ind)
+MESSAGE_DEF(NR_RRC_MAC_MSG3_IND,        MESSAGE_PRIORITY_MED_PLUS, NRRrcMacMsg3Ind,             nr_rrc_mac_msg3_ind)
 
 /* RRC configures DRX context (MAC timers) of a UE */
 MESSAGE_DEF(RRC_MAC_DRX_CONFIG_REQ, MESSAGE_PRIORITY_MED, rrc_mac_drx_config_req_t, rrc_mac_drx_config_req)

openair2/COMMON/mac_messages_types.h

@@ -55,6 +55,7 @@
 #define RRC_MAC_PCCH_DATA_REQ(mSGpTR)           (mSGpTR)->ittiMsg.rrc_mac_pcch_data_req
 
 #define NR_RRC_MAC_RA_IND(mSGpTR)               (mSGpTR)->ittiMsg.nr_rrc_mac_ra_ind
+#define NR_RRC_MAC_MSG3_IND(mSGpTR)             (mSGpTR)->ittiMsg.nr_rrc_mac_msg3_ind
 
 #define RRC_MAC_DRX_CONFIG_REQ(mSGpTR)          (mSGpTR)->ittiMsg.rrc_mac_drx_config_req
 
@@ -73,6 +74,10 @@ typedef struct NRRrcMacRaInd_s {
   bool RA_succeeded;
 } NRRrcMacRaInd;
 
+typedef struct NRRrcMacMsg3Ind_s {
+  uint16_t  rnti;
+} NRRrcMacMsg3Ind;
+
 typedef struct RrcMacInSyncInd_s {
   uint32_t  frame;
   uint8_t   sub_frame;
@@ -154,15 +159,9 @@ typedef struct RrcMacCcchDataInd_s {
 } RrcMacCcchDataInd;
 
 typedef struct NRRrcMacCcchDataInd_s {
-  uint32_t  frame;
-  uint8_t   slot;
   uint16_t  rnti;
   uint32_t  sdu_size;
   uint8_t   sdu[CCCH_SDU_SIZE];
-  OCTET_STRING_t *du_to_cu_rrc_container;
-  uint8_t   gnb_index;
-  int       CC_id;
-  uint64_t  nr_cellid;
 } NRRrcMacCcchDataInd;
 
 typedef struct RrcMacMcchDataReq_s {

openair2/DOCS/DOXYGEN/Doxyfile

-# Doxyfile 1.3.8
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = OPENAIR2
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = 
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = YES
-DETAILS_AT_TOP         = YES
-INHERIT_DOCS           = NO
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = YES
-HIDE_UNDOC_MEMBERS     = YES
-HIDE_UNDOC_CLASSES     = YES
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = NO
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = NO
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= NO
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = NO
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = $(OPENAIR2_DIR)/LAYER2/MAC/defs.h \
-                         $(OPENAIR2_DIR)/COMMON/mac_rrc_primitives.h \
-			 $(OPENAIR2_DIR)/COMMON/mac_rlc_primitives.h \
-			 $(OPENAIR2_DIR)/LAYER2/MAC/lchan_interface.h \
-			 $(OPENAIR2_DIR)/PHY_INTERFACE/defs.h \
-			 $(OPENAIR2_DIR)/NAS/DRIVER/MESH/proto_extern.h \
-			 
-
-FILE_PATTERNS          = *.h
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = images
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = YES
-CHM_FILE               = irs_openair.chm
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = amsmath amssymb
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = YES
-USE_PDFLATEX           = YES
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = YES
-RTF_HYPERLINKS         = YES
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = __attribute__(x)=
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-HIDE_UNDOC_RELATIONS   = NO
-HAVE_DOT               = NO
-CLASS_GRAPH            = NO
-COLLABORATION_GRAPH    = NO
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = NO
-INCLUDED_BY_GRAPH      = NO
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = NO 
-DOT_IMAGE_FORMAT       = jpg
-DOT_PATH               = 
-DOTFILE_DIRS           = ../docs/dotfiles

openair2/DOCS/Documentation/flow.txt

-Entry point openair2/SIMULATION/USER_TOOLS/LAYER2_SIM/mac_sim.c 
-
-1. endless loop calling each frame/TTI
-
- a)  macphy_scheduler (invokes MAC/RRC/PDCP/RLC protocols and generates TX/RX commands for PHY/Emul) : 
-      [ see openair2/LAYER2/MAC/layer2_scheduler.c for how these are all scheduled]
- 
- b)  emul_rx_tx() (emulates PHY and stimulates PDU transport mechanisms (ethernet or memory transfer)
-     contains abstraction layer, channel simulation, etc.
-     [ openair2/LAYER2/SIMULATION/PHY_EMULATION/CONTROL/phy_emulation.c ]
-       b1) rx local chbch processing (i.e. from CH on the same physical machine)
-       b2) rx local sach ul/dl processing 
-       b3) rx ethernet data (both chbch and sach ul/dl)
-       b4) measurement-related stuff
-     ]
\ No newline at end of file

openair2/DOCS/TEMPLATES/CODE/Doxyfile

-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = OpenAirInterface 
-PROJECT_NUMBER         = V1.0
-OUTPUT_DIRECTORY       = 
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-QT_AUTOBRIEF           = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-BUILTIN_STL_SUPPORT    = NO
-CPP_CLI_SUPPORT        = NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-EXTRACT_ANON_NSPACES   = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = example_doxy.h 
-INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = 
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = images/
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-HTML_DYNAMIC_SECTIONS  = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            = 
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-CALLER_GRAPH           = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = /usr/bin/dot
-DOTFILE_DIRS           = 
-DOT_GRAPH_MAX_NODES    = 50
-MAX_DOT_GRAPH_DEPTH    = 0
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

openair2/DOCS/TEMPLATES/CODE/example_doxy.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (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.openairinterface.org/?page_id=698
- *
- * 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.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file doxy_template.h
-* \brief explain how this block is organized, and how it works
-* \author Navid Nikaein
-* \date 2006-2010
-* \version 4.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-* \note this a note
-* \bug  this is a bug
-* \warning  this is a warning
-*/
-
-#ifndef __DOCS_TEMPLATES_CODE_EXAMPLE_DOXY__H__
-#define __DOCS_TEMPLATES_CODE_EXAMPLE_DOXY__H__
-
-//-----------------------------------begin group-----------------------------
-
-
-/** @defgroup _oai System definitions
-
-
-
-There is different modules:
-- OAI Address
-- OAI Components
-- \ref _frame
-
-The following diagram is based on graphviz (http://www.graphviz.org/), you need to install the package to view the diagram.
-
- * \dot
- * digraph group_frame  {
- *     node [shape=rect, fontname=Helvetica, fontsize=8,style=filled,fillcolor=lightgrey];
- *     a [ label = " address"];
- *     b [ label = " component"];
- *     c [ label = " frame",URL="\ref _frame"];
- *    a->b;
- *    a->c;
- *    b->d;
- *  label="Architecture"
- *
- * }
- * \enddot
-
-\section _doxy Doxygen Help
-You can use the provided Doxyfile as the configuration file or alternatively run "doxygen -g Doxyfile" to generat the file.
-You need at least to set the some variables in the Doxyfile including "PROJECT_NAME","PROJECT_NUMBER","INPUT","IMAGE_PATH".
-Doxygen help and commands can be found at http://www.stack.nl/~dimitri/doxygen/commands.html#cmdprotocol
-
-\section _arch Architecture
-
-You need to set the IMAGE_PATH in your Doxyfile
-
-\image html arch.png "Architecture"
-\image latex arch.eps "Architecture"
-
-\subsection _mac MAC
-thisis the mac
-\subsection _rlc RLC
-this is the rlc
-\subsection _impl Implementation
-what about the implementation
-
-
-*@{*/
-
-/*!\brief OAI protocol verion */
-#define OAI_PROTOCOL_Version  0x00
-/*!\brief Length in bytes of the OAI address */
-#define OAI_ADDR_LEN        6
-
-/*!\brief OAI snode type */
-enum NodeType {
-  /*!\brief mesh routers are */
-  meshrouter = 1,
-  /*!\brief relay nodes are */
-  relaynode = 2,
-  /*!\brief clusterheads are */
-  clusterhead = 3
-};
-
-
-/*@}*/
-
-// --------------------------end group ------------------------------
-
-
-//---------------------------begin group------------------------------
-/** @defgroup _frame Frame Structure
- * @ingroup _oai
-The Frame is composed of ....
-
-
-*@{*/
-/*! \brief the frame structure is ... */
-struct frame {
-  u_short   duration; /*!< \brief Duration in us (2 bytes) */
-  u_char    da[OAI_ADDR_LEN];/*!< \brief Destination MAC@ (OAI_ADDR_LEN bytes) */
-  u_char    sa[OAI_ADDR_LEN];/*!< \brief Source MAC@ (OAI_ADDR_LEN bytes)*/
-  u_char    body[0]; /*!< \brief Body of the frame */
-};
-/*! \brief Broadcast ID is ... */
-#define BROADCAST_ID 15
-
-
-/*@}*/
-
-//--------------------------end group-----------------------
-
-
-//-----------------------begin func proto-------------------
-
-/*! \fn int init(int,int)
-* \brief this function initializes and allocates memories and etc.
-* \param[in] src the memory area to copy frrm
-* \param[out] dst the memory area to copy to
-* \return 0 on success, otherwise -1
-* \note
-* @ingroup  _oai
-*/
-int init(int src, int dst);
-
-//-----------------------end func proto-------------------
-#endif

openair2/DOCS/TEMPLATES/README/Readme.doxy

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (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.openairinterface.org/?page_id=698
- *
- * 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.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file Readme.doxy
-* \brief explain how this block is organized, and how it works 
-* \author Navid Nikaein
-* \date 2009
-* \version 0.1 
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-* \warning 
-*/ 
-
-/*! \mainpage Table of contents
-
-The content of this readme is the following: 
-
-  -# What is this block about in OpenAirInterface
-  -# Folders and files description
-  -# Organization of the folders and their dependancies
-  -# Makefile targets and how to build
-  -# How to use through a tutorial: run a simple experimentation
-
-
-\section _block What is this block about in OpenAirInterface ?
-     
-
-     It essentially means "the hardware part" located at openair0.
-
-     Explain through the figures: 
-     \image html image.png "caption" width=3cm
-     \image latex image.pdf "caption" 
-
-     More information about ???  can be found on the Twiki:
-     https://twiki.eurecom.fr/twiki/bin/view/OpenAirInterface/WebHome
-
-
-\section _folders Folders and files description
-
-The structure is the following: 
-<table>
-<tr><td>File/Folder</td> <td> Description </td> </tr>      
-</table>
-
-- Folder1:     Contains this and that      
-- Folder2:     Contains this and that 
-- init.bash:   A simple script file, that any user SHOULD source from its environment personal set-up script (this is typically ~/.bashrc) by adding the following lines to it:
-	          This is my ~/.bashrc file or equivalent export OPENAIRX=path/to/my/openairX/folder source $OPENAIRX/init.bash.  The file includes variable definitions & path settings to access softwares, sources & Makefiles, software distribution in openair, and so on.
-
-
-YOU DEFINETELY NEED TO SOURCE THIS FILE. Description
-
-\section  _organization Organization of the folders and their dependancies
-    
-
-     The 3 folders have the following structures
-
-     - Folder1/subfolder1/:  contains any ressource related to the design
-
-     - Folder2/subfolder2/: contains 
-
-     - Folder2/src/ 
-
-     - Folder2/lib/ 
-
-     - Folder2/bin/ 
-
-      Explain where are the source files.  
-      Explain the relationship with other Blocks.
-
-    
-\section  _makefile Makefile targets and how to build
-     	  
-     Explain whether you are using symbolic links or not,
-     how to backup/archive
-     how to generate the tags
-     how to print the vars
-     how to create the documentation 
-
-\section _howto How to use through a tutorial: run a simple experimentation
-          ...
-
-
-*/
-

openair2/DOCS/TEMPLATES/README/readme.txt

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (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.openairinterface.org/?page_id=698
- *
- * 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.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*________________________OEPNAIR/OPENAIR0/________________________
-
- File    : Readme.txt 
- Authors : navid nikaein
- Company : EURECOM
- Emails  : navid.nikaein@eurecom.fr
-________________________________________________________________*/
-
-
--------------------------
-Table of contents
--------------------------
-
-The content of this readme is the following: 
-
-  1) What is this block about in OpenAirInterface
-  2) Folders and files description
-  3) Organization of the folders and their dependancies
-  4) Makefile targets and how to build
-  5) How to use through a tutorial: run a simple experimentation
-
-------------------------------------------------
-1) What is this block about in OpenAirInterface ?
------------------------------------------------
-     
-
-     It essentially means "the hardware part" located at openair0.
-
-     More information about ???  can be found on the Twiki:
-     https://twiki.eurecom.fr/twiki/bin/view/OpenAirInterface/WebHome
-
------------------------------------------
-2) Folders and files description
------------------------------------------
-
-   File/Folder        Description
-    -----------        -----------
-    
-    - Folder1/       contains 
-    
-    - Folder2/       contains 
-    
-    - init.bash          A simple script file, that any user SHOULD source from 
-    		       its environment personal set-up script (this is typically ~/.bashrc) 
-		       by adding the following lines to it:
-
-                        # This is my ~/.bashrc file or equivalent
-                         export OPENAIRX=path/to/my/openairX/folder
-                         source $OPENAIRX/init.bash
-    
-                       The file includes variable definitions & path settings to
-                       access softwares, sources & Makefiles, software
-                       distribution in openair, and so on.
-
-                       YOU DEFINETELY NEED TO SOURCE THIS FILE.
-
-----------------------------------------------------
-3) Organization of the folders and their dependancies
-----------------------------------------------------
-
-     The 3 folders have the following structures
-
-     - Folder1/subfolder1/  contains any ressource related to the design
-
-     - Folder2/subfolder2/ contains 
-
-     - Folder2/src/ 
-
-     - Folder2/lib/ 
-
-     - Folder2/bin/ 
-
-      Explain where are the source files.  
-      Explain the relationship with other Blocks.
-
-    
------------------------------------------
-4)  Makefile targets and how to build
------------------------------------------
-
-     Explain whether you are using symbolic links or not,
-     how to backup/archive
-     how to generate the tags
-     how to print the vars
-     how to create the documentation 
-
-----------------------------------------------------------------
-6)  How to use through a tutorial: run a simple experimentation
-----------------------------------------------------------------
-
-      ...
-

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

@@ -5364,3 +5364,11 @@ uint16_t nr_get_csi_bitlen(nr_csi_report_t *csi_report_template, uint8_t csi_rep
 
   return csi_bitlen;
 }
+
+uint16_t compute_PDU_length(uint32_t num_TLV, uint16_t total_length)
+{
+  uint8_t pdu_length = 8; // 2 bytes PDU_Length + 2 bytes PDU_Index + 4 bytes num_TLV
+  // For each TLV, add 2 bytes tag + 2 bytes length + value size without padding
+  pdu_length += (num_TLV * 4) + total_length;
+  return pdu_length;
+}

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h

@@ -307,4 +307,6 @@ void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, nr_csi_report_t *cs
 
 uint16_t nr_get_csi_bitlen(nr_csi_report_t *csi_report_template, uint8_t csi_report_id);
 
+uint16_t compute_PDU_length(uint32_t num_TLV, uint16_t total_length);
+
 #endif

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -469,7 +469,6 @@ typedef struct {
   /* PDUs */
   /// Outgoing CCCH pdu for PHY
   CCCH_PDU CCCH_pdu;
-  ULSCH_PDU ulsch_pdu;
 
   /* Random Access */
   /// CRNTI

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -376,6 +376,8 @@ void set_ra_rnti(NR_UE_MAC_INST_t *mac, fapi_nr_ul_config_prach_pdu *prach_pdu);
 void nr_Msg1_transmitted(module_id_t mod_id);
 
 void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot_t slotP, uint8_t gNB_id);
+void nr_get_msg3_payload(module_id_t mod_id);
+void send_msg3_rrc_request(module_id_t mod_id, int rnti);
 
 void nr_ue_msg2_scheduler(module_id_t mod_id, uint16_t rach_frame, uint16_t rach_slot, uint16_t *msg2_frame, uint16_t *msg2_slot);
 

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -40,10 +40,29 @@
 #include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
 #include "nr_rlc/nr_rlc_oai_api.h"
 #include "RRC/NR/MESSAGES/asn1_msg.h"
+#include "RRC/NR_UE/rrc_proto.h"
 #include <pthread.h>
 
 static NR_UE_MAC_INST_t *nr_ue_mac_inst; 
 
+static void send_srb0_rrc(int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *data)
+{
+  AssertFatal(sdu_len > 0 && sdu_len < CCCH_SDU_SIZE, "invalid CCCH SDU size %d\n", sdu_len);
+
+  MessageDef *message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_CCCH_DATA_IND);
+  memset(NR_RRC_MAC_CCCH_DATA_IND(message_p).sdu, 0, sdu_len);
+  memcpy(NR_RRC_MAC_CCCH_DATA_IND(message_p).sdu, sdu, sdu_len);
+  NR_RRC_MAC_CCCH_DATA_IND(message_p).sdu_size = sdu_len;
+  NR_RRC_MAC_CCCH_DATA_IND(message_p).rnti = rnti;
+  itti_send_msg_to_task(TASK_RRC_NRUE, 0, message_p);
+}
+
+void send_msg3_rrc_request(module_id_t mod_id, int rnti)
+{
+  nr_rlc_activate_srb0(rnti, NULL, send_srb0_rrc);
+  nr_mac_rrc_msg3_ind(mod_id, rnti);
+}
+
 NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst) {
 
     //LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
@@ -67,7 +86,9 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst) {
     if (rrc_inst && rrc_inst->scell_group_config) {
 
       nr_rrc_mac_config_req_scg(0, 0, rrc_inst->scell_group_config);
-      AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
+      int rc = rlc_module_init(0);
+      AssertFatal(rc == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
+      nr_rlc_activate_srb0(nr_ue_mac_inst->crnti, NULL, send_srb0_rrc);
       if (IS_SOFTMODEM_NOS1){
         // get default noS1 configuration
         NR_RadioBearerConfig_t *rbconfig = NULL;
@@ -91,7 +112,8 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst) {
     else {
       LOG_I(MAC,"Running without CellGroupConfig\n");
       if(get_softmodem_params()->sa == 1) {
-        AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
+        int rc = rlc_module_init(0);
+        AssertFatal(rc == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
       }
     }
 

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -605,7 +605,52 @@ void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot
 
   ra->RA_contention_resolution_timer_active = 1;
   ra->ra_state = WAIT_CONTENTION_RESOLUTION;
+}
 
+void nr_get_msg3_payload(module_id_t mod_id)
+{
+  NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
+  RA_config_t *ra = &mac->ra;
+  uint8_t *pdu = mac->CCCH_pdu.payload;
+  const uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_FIXED);
+  NR_MAC_SUBHEADER_FIXED *header = (NR_MAC_SUBHEADER_FIXED *) pdu;
+  pdu += sh_size;
+  int lcid = 0; // SRB0 for messages sent in MSG3
+  tbs_size_t len = mac_rlc_data_req(mod_id,
+                                    ra->t_crnti,
+                                    0,
+                                    0,
+                                    ENB_FLAG_NO,
+                                    MBMS_FLAG_NO,
+                                    lcid,
+                                    16, /* size of mac_ce above */
+                                    (char *)pdu,
+                                    0,
+                                    0);
+  AssertFatal(len > 0, "no data for Msg.3\n");
+  // UE Contention Resolution Identity
+  // Store the first 48 bits belonging to the uplink CCCH SDU within Msg3 to determine whether or not the
+  // Random Access Procedure has been successful after reception of Msg4
+  memcpy(ra->cont_res_id, pdu, sizeof(uint8_t) * 6);
+  pdu += len;
+  int Msg3_size = len + sh_size;
+  // Build header
+  header->R = 0;
+  header->LCID = UL_SCH_LCID_CCCH;
+  const uint8_t TBS_max = 8 + sizeof(NR_MAC_SUBHEADER_SHORT) + sizeof(NR_MAC_SUBHEADER_SHORT); // Note: unclear the reason behind the selection of such TBS_max
+  // Padding: fill remainder with 0
+  if (TBS_max - Msg3_size > 0) {
+    AssertFatal(TBS_max > Msg3_size, "Allocated resources are not enough for Msg3!\n");
+    LOG_D(NR_MAC, "Remaining %d bytes, filling with padding\n",TBS_max - Msg3_size);
+    ((NR_MAC_SUBHEADER_FIXED *) pdu)->R = 0;
+    ((NR_MAC_SUBHEADER_FIXED *) pdu)->LCID = UL_SCH_LCID_PADDING;
+    pdu += sizeof(NR_MAC_SUBHEADER_FIXED);
+    memset(pdu, 0, TBS_max - Msg3_size - sizeof(NR_MAC_SUBHEADER_FIXED));
+  }
+  // Dumping ULSCH payload
+  LOG_D(NR_MAC, "Dumping UL Msg3 MAC PDU with length %d: \n", TBS_max);
+  for(int k = 0; k < TBS_max; k++)
+    LOG_D(NR_MAC,"(%i): %i\n", k, pdu[k]);
 }
 
 /**
@@ -660,47 +705,15 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
 
       LOG_D(NR_MAC, "In %s: RA not active. Checking for data to transmit from upper layers...\n", __FUNCTION__);
 
-      const uint8_t lcid = UL_SCH_LCID_CCCH;
-      const uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_FIXED);
       const uint8_t TBS_max = 8 + sizeof(NR_MAC_SUBHEADER_SHORT) + sizeof(NR_MAC_SUBHEADER_SHORT); // Note: unclear the reason behind the selection of such TBS_max
-      int8_t size_sdu = 0;
+      int size_sdu = 0;
       uint8_t mac_ce[16] = {0};
       uint8_t *pdu = get_softmodem_params()->sa ? mac->CCCH_pdu.payload : mac_ce;
       uint8_t *payload = pdu;
 
       // Concerning the C-RNTI MAC CE, it has to be included if the UL transmission (Msg3) is not being made for the CCCH logical channel.
       // Therefore it has been assumed that this event only occurs only when RA is done and it is not SA mode.
-      if (get_softmodem_params()->sa) {
-
-        NR_MAC_SUBHEADER_FIXED *header = (NR_MAC_SUBHEADER_FIXED *) pdu;
-        pdu += sh_size;
-
-        // initialisation by RRC
-        nr_rrc_ue_generate_RRCSetupRequest(mod_id,gNB_id);
-
-        // CCCH PDU
-        size_sdu = nr_mac_rrc_data_req_ue(mod_id, CC_id, gNB_id, frame, CCCH, pdu);
-        LOG_D(NR_MAC, "In %s: [UE %d][%d.%d]: Requested RRCConnectionRequest, got %d bytes for LCID 0x%02x \n", __FUNCTION__, mod_id, frame, nr_slot_tx, size_sdu, lcid);
-
-        if (size_sdu > 0) {
-
-          // UE Contention Resolution Identity
-          // Store the first 48 bits belonging to the uplink CCCH SDU within Msg3 to determine whether or not the
-          // Random Access Procedure has been successful after reception of Msg4
-          memcpy(ra->cont_res_id, pdu, sizeof(uint8_t) * 6);
-
-          pdu += size_sdu;
-          ra->Msg3_size = size_sdu + sh_size;
-
-          // Build header
-          header->R = 0;
-          header->LCID = lcid;
-
-        } else {
-          pdu -= sh_size;
-        }
-
-      } else if (get_softmodem_params()->nsa) {
+      if (get_softmodem_params()->nsa) {
 
         uint8_t mac_sdus[34*1056];
         uint16_t sdu_lengths[NB_RB_MAX] = {0};
@@ -722,7 +735,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
           ra->Msg3_size = size_sdu + sizeof(NR_MAC_SUBHEADER_SHORT) + sizeof(NR_MAC_SUBHEADER_SHORT);
         }
 
-      } else {
+      } else if (!get_softmodem_params()->sa) {
 
         size_sdu = nr_write_ce_ulsch_pdu(pdu, mac, 0,  &(mac->crnti), NULL, NULL, NULL);
         pdu += size_sdu;
@@ -732,12 +745,12 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
 
       if (size_sdu > 0 && (ra->ra_state == GENERATE_PREAMBLE || get_softmodem_params()->nsa)) {
 
-        LOG_D(NR_MAC, "In %s: [UE %d][%d.%d]: starting initialisation Random Access Procedure...\n", __FUNCTION__, mod_id, frame, nr_slot_tx);
+        LOG_D(NR_MAC, "[UE %d][%d.%d]: starting initialisation Random Access Procedure...\n", mod_id, frame, nr_slot_tx);
 
         // Padding: fill remainder with 0
         if (TBS_max - ra->Msg3_size > 0) {
           AssertFatal(TBS_max > ra->Msg3_size, "In %s: allocated resources are not enough for Msg3!\n", __FUNCTION__);
-          LOG_D(NR_MAC, "In %s: remaining %d bytes, filling with padding\n", __FUNCTION__, TBS_max - ra->Msg3_size);
+          LOG_D(NR_MAC, "Remaining %d bytes, filling with padding\n",TBS_max - ra->Msg3_size);
           ((NR_MAC_SUBHEADER_FIXED *) pdu)->R = 0;
           ((NR_MAC_SUBHEADER_FIXED *) pdu)->LCID = UL_SCH_LCID_PADDING;
           pdu += sizeof(NR_MAC_SUBHEADER_FIXED);
@@ -745,25 +758,17 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
         }
 
         // Dumping ULSCH payload
-        LOG_D(NR_MAC, "In %s: dumping UL Msg3 MAC PDU with length %d: \n", __FUNCTION__, TBS_max);
+        LOG_D(NR_MAC, "Dumping UL Msg3 MAC PDU with length %d: \n", TBS_max);
         for(int k = 0; k < TBS_max; k++) {
           LOG_D(NR_MAC,"(%i): %i\n", k, payload[k]);
         }
 
-        // Msg3 was initialized with TBS_max bytes because the RA_Msg3_size will only be known after
-        // receiving Msg2 (which contains the Msg3 resource reserve).
-        // Msg3 will be transmitted with RA_Msg3_size bytes, removing unnecessary 0s.
-        if (!get_softmodem_params()->nsa) {
-          mac->ulsch_pdu.Pdu_size = TBS_max;
-          memcpy(mac->ulsch_pdu.payload, payload, TBS_max);
-        }
-
       } else {
         return 0;
       }
     } else if (ra->RA_window_cnt != -1) { // RACH is active
 
-      LOG_D(MAC, "In %s [%d.%d] RA is active: RA window count %d, RA backoff count %d\n", __FUNCTION__, frame, nr_slot_tx, ra->RA_window_cnt, ra->RA_backoff_cnt);
+      LOG_D(MAC, "[%d.%d] RA is active: RA window count %d, RA backoff count %d\n", frame, nr_slot_tx, ra->RA_window_cnt, ra->RA_backoff_cnt);
 
       if (ra->RA_BI_found){
         prach_resources->RA_PREAMBLE_BACKOFF = prach_resources->RA_SCALING_FACTOR_BI * ra->RA_backoff_indicator;
@@ -806,7 +811,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
     }
   }
 
-  if (ra->RA_contention_resolution_timer_active){
+  if (ra->RA_contention_resolution_timer_active) {
     nr_ue_contention_resolution(mod_id, CC_id, frame, nr_slot_tx, prach_resources);
   }
 

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -3598,7 +3598,7 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
           break;
         }
 
-        if ( mac_len > 0 ) {
+        if (mac_len > 0) {
           LOG_D(NR_MAC,"DL_SCH_LCID_CCCH (e.g. RRCSetup) with payload len %d\n", mac_len);
           for (int i = 0; i < mac_subheader_len; i++) {
             LOG_D(NR_MAC, "MAC header %d: 0x%x\n", i, pduP[i]);
@@ -3606,7 +3606,18 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
           for (int i = 0; i < mac_len; i++) {
             LOG_D(NR_MAC, "%d: 0x%x\n", i, pduP[mac_subheader_len + i]);
           }
-          nr_mac_rrc_data_ind_ue(module_idP, CC_id, gNB_index, frameP, 0, mac->crnti, CCCH, pduP+mac_subheader_len, mac_len);
+
+          mac_rlc_data_ind(module_idP,
+                           mac->crnti,
+                           module_idP,
+                           frameP,
+                           ENB_FLAG_NO,
+                           MBMS_FLAG_NO,
+                           0,
+                           (char *)(pduP + mac_subheader_len),
+                           mac_len,
+                           1,
+                           NULL);
         }
         break;
       case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH:
@@ -4112,7 +4123,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, int pdu_id)
     LOG_I(NR_MAC, "rar->TCRNTI_1 = 0x%x\n", rar->TCRNTI_1);
     LOG_I(NR_MAC, "rar->TCRNTI_2 = 0x%x\n", rar->TCRNTI_2);
 
-    LOG_I(NR_MAC, "In %s:[%d.%d]: [UE %d] Received RAR with t_alloc %d f_alloc %d ta_command %d mcs %d freq_hopping %d tpc_command %d t_crnti %x \n",
+    LOG_I(NR_MAC, "In %s:[%d.%d]: [UE %d] Received RAR with t_alloc %d f_alloc %d ta_command %d mcs %d freq_hopping %d tpc_command %d\n",
       __FUNCTION__,
       frame,
       slot,
@@ -4122,8 +4133,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, int pdu_id)
       ta_command,
       rar_grant.mcs,
       rar_grant.freq_hopping,
-      tpc_command,
-      ra->t_crnti);
+      tpc_command);
 #endif
 
     // Schedule Msg3
@@ -4135,7 +4145,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, int pdu_id)
     }
     ret = nr_ue_pusch_scheduler(mac, is_Msg3, frame, slot, &frame_tx, &slot_tx, tda_info.k2);
 
-    if (ret != -1){
+    if (ret != -1) {
 
       fapi_nr_ul_config_request_t *ul_config = get_ul_config_request(mac, slot_tx, tda_info.k2);
       uint16_t rnti = mac->crnti;
@@ -4151,6 +4161,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, int pdu_id)
       if (!ra->cfra) {
         ra->t_crnti = rar->TCRNTI_2 + (rar->TCRNTI_1 << 8);
         rnti = ra->t_crnti;
+        send_msg3_rrc_request(mod_id, rnti);
       }
 
       pthread_mutex_lock(&ul_config->mutex_ul_config);

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1037,13 +1037,13 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
                 mac->UL_ndi[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id],
                 ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator,
                 TBS_bytes,ra->ra_state);
-          if (ra->ra_state == WAIT_RAR && !ra->cfra){
-            memcpy(ulsch_input_buffer, mac->ulsch_pdu.payload, TBS_bytes);
-            LOG_D(NR_MAC,"[RAPROC] Msg3 to be transmitted:\n");
+          if (ra->ra_state == WAIT_RAR && !ra->cfra) {
+            nr_get_msg3_payload(mod_id);
+            memcpy(ulsch_input_buffer, mac->CCCH_pdu.payload, TBS_bytes);
             for (int k = 0; k < TBS_bytes; k++) {
-              LOG_D(NR_MAC,"(%i): 0x%x\n",k,mac->ulsch_pdu.payload[k]);
+              LOG_D(NR_MAC,"(%i): 0x%x\n", k, ulsch_input_buffer[k]);
             }
-            LOG_D(NR_MAC,"Flipping NDI for harq_id %d (Msg3)\n",ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator);
+            LOG_D(NR_MAC,"Flipping NDI for harq_id %d (Msg3)\n", ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator);
             mac->UL_ndi[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] = ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator;
             mac->first_ul_tx[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] = 0;
             mac_pdu_exist = 1;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -1399,10 +1399,10 @@ static void nr_generate_Msg2(module_id_t module_idP,
     T(T_GNB_MAC_DL_RAR_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(ra->RA_rnti), T_INT(frameP),
       T_INT(slotP), T_INT(0), T_BUFFER(&tx_req->TLVs[0].value.direct[0], tx_req->TLVs[0].length));
 
-    tx_req->PDU_length = pdsch_pdu_rel15->TBSize[0];
     tx_req->PDU_index = pduindex;
     tx_req->num_TLV = 1;
-    tx_req->TLVs[0].length = tx_req->PDU_length + 2;
+    tx_req->TLVs[0].length = pdsch_pdu_rel15->TBSize[0];
+    tx_req->PDU_length = compute_PDU_length(tx_req->num_TLV, pdsch_pdu_rel15->TBSize[0]);
     TX_req->SFN = frameP;
     TX_req->Number_of_PDUs++;
     TX_req->Slot = slotP;
@@ -1845,10 +1845,10 @@ static void nr_generate_Msg4(module_id_t module_idP,
     // DL TX request
     nfapi_nr_pdu_t *tx_req = &TX_req->pdu_list[TX_req->Number_of_PDUs];
     memcpy(tx_req->TLVs[0].value.direct, harq->transportBlock, sizeof(uint8_t) * harq->tb_size);
-    tx_req->PDU_length =  harq->tb_size;
     tx_req->PDU_index = pduindex;
     tx_req->num_TLV = 1;
-    tx_req->TLVs[0].length =  harq->tb_size + 2;
+    tx_req->TLVs[0].length =  harq->tb_size;
+    tx_req->PDU_length = compute_PDU_length(tx_req->num_TLV, tx_req->TLVs[0].length);
     TX_req->SFN = frameP;
     TX_req->Number_of_PDUs++;
     TX_req->Slot = slotP;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c

@@ -601,10 +601,10 @@ void schedule_nr_sib1(module_id_t module_idP,
       // Data to be transmitted
       memcpy(tx_req->TLVs[0].value.direct, cc->sib1_bcch_pdu, TBS);
 
-      tx_req->PDU_length = TBS;
       tx_req->PDU_index  = pdu_index;
       tx_req->num_TLV = 1;
-      tx_req->TLVs[0].length = TBS + 2;
+      tx_req->TLVs[0].length = TBS;
+      tx_req->PDU_length = compute_PDU_length(tx_req->num_TLV, tx_req->TLVs[0].length);
       TX_req->Number_of_PDUs++;
       TX_req->SFN = frameP;
       TX_req->Slot = slotP;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -1367,10 +1367,10 @@ void nr_schedule_ue_spec(module_id_t module_id,
 
     const int ntx_req = TX_req->Number_of_PDUs;
     nfapi_nr_pdu_t *tx_req = &TX_req->pdu_list[ntx_req];
-    tx_req->PDU_length = TBS;
     tx_req->PDU_index  = pduindex;
     tx_req->num_TLV = 1;
-    tx_req->TLVs[0].length = TBS + 2;
+    tx_req->TLVs[0].length = TBS;
+    tx_req->PDU_length = compute_PDU_length(tx_req->num_TLV, tx_req->TLVs[0].length);
     memcpy(tx_req->TLVs[0].value.direct, harq->transportBlock, TBS);
     TX_req->Number_of_PDUs++;
     TX_req->SFN = frame;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2908,10 +2908,10 @@ void UL_tti_req_ahead_initialization(gNB_MAC_INST * gNB, NR_ServingCellConfigCom
   }
 }
 
-void send_initial_ul_rrc_message(gNB_MAC_INST *mac, int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *rawUE)
+void send_initial_ul_rrc_message(int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *data)
 {
-
-  NR_UE_info_t *UE = (NR_UE_info_t *)rawUE;
+  gNB_MAC_INST *mac = RC.nrmac[0];
+  NR_UE_info_t *UE = (NR_UE_info_t *)data;
   NR_SCHED_ENSURE_LOCKED(&mac->sched_lock);
 
   uint8_t du2cu[1024];
@@ -2945,7 +2945,7 @@ void prepare_initial_ul_rrc_message(gNB_MAC_INST *mac, NR_UE_info_t *UE)
   process_CellGroup(cellGroupConfig, UE);
 
   /* activate SRB0 */
-  nr_rlc_activate_srb0(UE->rnti, mac, UE, send_initial_ul_rrc_message);
+  nr_rlc_activate_srb0(UE->rnti, UE, send_initial_ul_rrc_message);
 
   /* the cellGroup sent to CU specifies there is SRB1, so create it */
   DevAssert(cellGroupConfig->rlc_BearerToAddModList->list.count == 1);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c

@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <immintrin.h>
+#include "PHY/sse_intrin.h"
 
 //#define SRS_DEBUG
 

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -435,7 +435,7 @@ size_t dump_mac_stats(gNB_MAC_INST *gNB, char *output, size_t strlen, bool reset
 void process_CellGroup(NR_CellGroupConfig_t *CellGroup, NR_UE_info_t *UE);
 
 void prepare_initial_ul_rrc_message(gNB_MAC_INST *mac, NR_UE_info_t *UE);
-void send_initial_ul_rrc_message(gNB_MAC_INST *mac, int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *rawUE);
+void send_initial_ul_rrc_message(int rnti, const uint8_t *sdu, sdu_size_t sdu_len, void *data);
 
 void abort_nr_dl_harq(NR_UE_info_t* UE, int8_t harq_pid);
 

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -151,8 +151,8 @@ void mac_rlc_data_ind(const module_id_t  module_idP,
     rb->set_time(rb, nr_rlc_current_time);
     rb->recv_pdu(rb, buffer_pP, tb_sizeP);
   } else {
-    LOG_E(RLC, "%s:%d:%s: fatal: no RB found (channel ID %d)\n",
-          __FILE__, __LINE__, __FUNCTION__, channel_idP);
+    LOG_E(RLC, "Fatal: no RB found (channel ID %d RNTI %d)\n",
+          channel_idP, rntiP);
     // exit(1);
   }
 
@@ -729,7 +729,7 @@ void nr_rlc_add_srb(int rnti, int srb_id, const NR_RLC_BearerConfig_t *rlc_Beare
   int t_reassembly;
   int sn_field_length;
 
-  LOG_D(RLC,"Trying to add SRB %d\n",srb_id);
+  LOG_D(RLC, "Trying to add SRB %d\n", srb_id);
   AssertFatal(srb_id > 0 && srb_id < 4,
               "Invalid srb id %d\n", srb_id);
 
@@ -792,7 +792,7 @@ void nr_rlc_add_srb(int rnti, int srb_id, const NR_RLC_BearerConfig_t *rlc_Beare
                                                       sn_field_length);
     nr_rlc_ue_add_srb_rlc_entity(ue, srb_id, nr_rlc_am);
 
-    LOG_I(RLC, "%s:%d:%s: added srb %d to UE with RNTI 0x%x\n", __FILE__, __LINE__, __FUNCTION__, srb_id, rnti);
+    LOG_I(RLC, "Added srb %d to UE with RNTI 0x%x\n", srb_id, rnti);
   }
   nr_rlc_manager_unlock(nr_rlc_ue_manager);
 }
@@ -963,31 +963,27 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt_pP
 }
 
 struct srb0_data {
-  struct gNB_MAC_INST_s *mac;
   int rnti;
-  void *rawUE;
-  void (*send_initial_ul_rrc_message)(struct gNB_MAC_INST_s *mac,
-                                      int                    rnti,
+  void *data;
+  void (*send_initial_ul_rrc_message)(int                    rnti,
                                       const uint8_t         *sdu,
                                       sdu_size_t             sdu_len,
-                                      void                  *rawUE);
+                                      void                  *data);
 };
 
 void deliver_sdu_srb0(void *deliver_sdu_data, struct nr_rlc_entity_t *entity,
                       char *buf, int size)
 {
   struct srb0_data *s0 = (struct srb0_data *)deliver_sdu_data;
-  s0->send_initial_ul_rrc_message(s0->mac, s0->rnti, (unsigned char *)buf,
-                                  size, s0->rawUE);
+  s0->send_initial_ul_rrc_message(s0->rnti, (unsigned char *)buf, size, s0->data);
 }
 
-void nr_rlc_activate_srb0(int rnti, struct gNB_MAC_INST_s *mac, void *rawUE,
+void nr_rlc_activate_srb0(int rnti, void *data,
                           void (*send_initial_ul_rrc_message)(
-                                     struct gNB_MAC_INST_s *mac,
                                      int                    rnti,
                                      const uint8_t         *sdu,
                                      sdu_size_t             sdu_len,
-                                     void                  *rawUE))
+                                     void                  *data))
 {
   nr_rlc_entity_t            *nr_rlc_tm;
   nr_rlc_ue_t                *ue;
@@ -996,9 +992,8 @@ void nr_rlc_activate_srb0(int rnti, struct gNB_MAC_INST_s *mac, void *rawUE,
   srb0_data = calloc(1, sizeof(struct srb0_data));
   AssertFatal(srb0_data != NULL, "out of memory\n");
 
-  srb0_data->mac       = mac;
   srb0_data->rnti      = rnti;
-  srb0_data->rawUE     = rawUE;
+  srb0_data->data      = data;
   srb0_data->send_initial_ul_rrc_message = send_initial_ul_rrc_message;
 
   nr_rlc_manager_lock(nr_rlc_ue_manager);

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h

@@ -66,13 +66,11 @@ void nr_rlc_activate_avg_time_to_tx(
 
 void nr_rlc_srb_recv_sdu(const int rnti, const logical_chan_id_t channel_id, unsigned char *buf, int size);
 
-struct gNB_MAC_INST_s;
-void nr_rlc_activate_srb0(int rnti, struct gNB_MAC_INST_s *mac, void *rawUE,
+void nr_rlc_activate_srb0(int rnti, void *data,
                           void (*send_initial_ul_rrc_message)(
-                                     struct gNB_MAC_INST_s *mac,
                                      int                    rnti,
                                      const uint8_t         *sdu,
                                      sdu_size_t             sdu_len,
-                                     void                  *rawUE));
+                                     void                  *data));
 
 bool nr_rlc_get_statistics(int rnti, int srb_flag, int rb_id, nr_rlc_statistics_t *out);

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -772,7 +772,8 @@ int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
 }
 
 
-uint8_t do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t *rv) {
+int do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t *rv)
+{
   asn_enc_rval_t enc_rval;
   uint8_t buf[5],buf2=0;
   NR_UL_CCCH_Message_t ul_ccch_msg;

openair2/RRC/NR/MESSAGES/asn1_msg.h

@@ -117,7 +117,7 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id,
                             const int dedicatedInfoNASLength,
                             const char *dedicatedInfoNAS);
 
-uint8_t do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t *rv);
+int do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t *rv);
 
 uint8_t do_NR_RRCReconfigurationComplete_for_nsa(uint8_t *buffer, size_t buffer_size, NR_RRC_TransactionIdentifier_t Transaction_id);
 

openair2/RRC/NR/nr_rrc_common.h

@@ -61,13 +61,7 @@ typedef struct RB_INFO_NR_s {
   //MAC_MEAS_REQ_ENTRY *Meas_entry; //may not needed for NB-IoT
 } NR_RB_INFO;
 
-typedef struct NR_SRB_INFO_s {
-  NR_RRC_BUFFER Rx_buffer;
-  NR_RRC_BUFFER Tx_buffer;
-} NR_SRB_INFO;
-
 typedef struct SRB_INFO_TABLE_ENTRY_NR_s {
-  NR_SRB_INFO Srb_info;
   uint8_t Active;
   uint8_t status;
 } NR_SRB_INFO_TABLE_ENTRY;

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -91,29 +91,7 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
       break;
 
     case CCCH:
-      if (pdu_len>0) {
-        LOG_T(NR_RRC,"[UE %d] Received SDU for CCCH on SRB %u from gNB %d\n",module_id,channel & RAB_OFFSET,gNB_index);
-
-        MessageDef *message_p;
-        int msg_sdu_size = CCCH_SDU_SIZE;
-
-        if (pdu_len > msg_sdu_size) {
-          LOG_E(NR_RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
-          sdu_size = msg_sdu_size;
-        } else {
-          sdu_size =  pdu_len;
-        }
-
-        message_p = itti_alloc_new_message (TASK_MAC_UE, 0, NR_RRC_MAC_CCCH_DATA_IND);
-        memset (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
-        memcpy (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
-        NR_RRC_MAC_CCCH_DATA_IND (message_p).frame     = frame; //frameP
-        NR_RRC_MAC_CCCH_DATA_IND (message_p).slot = slot;
-        NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu_size  = sdu_size;
-        NR_RRC_MAC_CCCH_DATA_IND (message_p).gnb_index = gNB_index;
-        NR_RRC_MAC_CCCH_DATA_IND (message_p).rnti      = rnti;  //rntiP
-        itti_send_msg_to_task (TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE( module_id ), message_p);
-      }
+      AssertFatal(false, "use RLC instead\n");
       break;
 
     default:
@@ -123,36 +101,11 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
   return(0);
 }
 
-int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
-                              const int CC_id,
-                              const uint8_t gNB_id,
-                              const frame_t frameP,
-                              const rb_id_t Srb_id,
-                              uint8_t *buffer_pP)
+void nr_mac_rrc_msg3_ind(const module_id_t mod_id, int rnti)
 {
-  switch(Srb_id) {
-
-    case CCCH:
-      LOG_D(NR_RRC,
-            "nr_mac_rrc_data_req_ue: Payload size = %i\n",
-            NR_UE_rrc_inst[Mod_idP].Srb[gNB_id][0].srb_buffers.Tx_buffer.payload_size);
-      NR_UE_RRC_SRB_INFO_t *Srb0 = &NR_UE_rrc_inst[Mod_idP].Srb[gNB_id][0];
-      memcpy(buffer_pP, (uint8_t *)Srb0->srb_buffers.Tx_buffer.Payload, Srb0->srb_buffers.Tx_buffer.payload_size);
-      for (int i = 0; i < Srb0->srb_buffers.Tx_buffer.payload_size; i++) {
-        LOG_D(NR_RRC,"(%i): %i\n", i, buffer_pP[i]);
-      }
-
-      return Srb0->srb_buffers.Tx_buffer.payload_size;
-
-    case DCCH:
-      AssertFatal(1==0, "SRB1 not implemented yet!\n");
-    case DCCH1:
-      AssertFatal(1==0, "SRB2 not implemented yet!\n");
-    default:
-      AssertFatal(1==0, "Invalid SRB id!\n");
-  }
-
-  return 0;
+  MessageDef *message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_MSG3_IND);
+  NR_RRC_MAC_MSG3_IND (message_p).rnti = rnti;
+  itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(mod_id), message_p);
 }
 
 void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success)

openair2/RRC/NR_UE/rrc_defs.h

@@ -182,7 +182,6 @@ typedef enum { RB_NOT_PRESENT, RB_ESTABLISHED, RB_SUSPENDED } NR_RB_status_t;
 
 typedef struct NR_UE_RRC_SRB_INFO_s {
   NR_RB_status_t status;
-  NR_SRB_INFO srb_buffers;
 } NR_UE_RRC_SRB_INFO_t;
 
 typedef struct NR_UE_RRC_INST_s {

openair2/RRC/NR_UE/rrc_proto.h

@@ -107,20 +107,7 @@ void nr_mac_rrc_sync_ind(const module_id_t module_id,
                          const frame_t frame,
                          const bool in_sync);
 void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success);
-
-/**\brief
-   \param module_id  module id
-   \param CC_id      component carrier id
-   \param gNB_index  gNB index
-   \param frame_t    frameP
-   \param rb_id_t    SRB id
-   \param buffer_pP  pointer to buffer*/
-int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
-                              const int         CC_id,
-                              const uint8_t     gNB_id,
-                              const frame_t     frameP,
-                              const rb_id_t     Srb_id,
-                              uint8_t           *buffer_pP);
+void nr_mac_rrc_msg3_ind(const module_id_t mod_id, int rnti);
 
 int8_t nr_rrc_RA_succeeded(const module_id_t mod_id, const uint8_t gNB_index);
 
@@ -140,10 +127,8 @@ void nsa_sendmsg_to_lte_ue(const void *message, size_t msg_len, Rrc_Msg_Type_t m
 
 void start_oai_nrue_threads(void);
 
-/**\brief RRC UE generate RRCSetupRequest message.
-   \param module_id  module id
-   \param gNB_index  gNB index  */
-void nr_rrc_ue_generate_RRCSetupRequest(module_id_t module_id, const uint8_t gNB_index);
+/**\brief RRC UE generate RRCSetupRequest message. */
+void nr_rrc_ue_generate_RRCSetupRequest(module_id_t module_id, int rnti);
 
 void process_lte_nsa_msg(nsa_msg_t *msg, int msg_len);
 

radio/rfsimulator/simulator.c

@@ -233,7 +233,7 @@ static int allocCirBuf(rfsimulator_state_t *bridge, int sock)
     }
     char *modelname = (bridge->role == SIMU_ROLE_SERVER) ? "rfsimu_channel_ue0" : "rfsimu_channel_enB0";
     ptr->channel_model = find_channel_desc_fromname(modelname); // path_loss in dB
-    if (ptr->channel_model != NULL) {
+    if (!ptr->channel_model) {
       LOG_E(HW, "Channel model %s not found, check config file\n", modelname);
       return -1;
     }