Merge branch 'develop_integration_2020_w05' into 'develop'

Develop Integration Branch : 2020 week 05 The following Merge Requests have been included : * MR[702] : Add PUSCH-based TA updates (5G-NR) * MR[764] : fix segv in drs_modulation.c (4G-LTE-UE) * CI Python Framework improvement (X2 OpenAirCn Handover) * Some Compilation warnings fixed
2020-01-30 20:27:59 +01:00
parent 4eaadf8d82 5e9b64c0d3
commit aa8f04e3b1
55 changed files with 3381 additions and 755 deletions
@@ -59,6 +59,9 @@ def r2labEPC0IpAddr = r2labBaseIpAddr + r2labEPC0Idx
 def r2labUE0Idx = '6'
 def r2labUE0 = 'fit0' + r2labUE0Idx
 def r2labUE0IpAddr = r2labBaseIpAddr + r2labUE0Idx
+def r2labENB1Idx = '16'
+def r2labENB1 = 'fit' + r2labENB1Idx
+def r2labENB1IpAddr = r2labBaseIpAddr + r2labENB1Idx

 pipeline {
    agent {
@@ -131,7 +134,7 @@ pipeline {
                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_Credentials}", usernameVariable: 'r2labuser', passwordVariable: 'r2labpassword']
                        ]) {
                        sh "python3 /home/eurecom/inria-scripts/booking-lease.py --book-lease --from ${BOOK_TIMESTAMP}T${r2labStartTime} --duration ${r2labDuration} --slice inria_oaici ${r2labuser} ${r2labpassword}"
-                        sh "python3 /home/eurecom/inria-scripts/booking-lease.py --get-leases ${r2labuser} ${r2labpassword}"
+                        sh "python3 /home/eurecom/inria-scripts/booking-lease.py --get-leases ${r2labuser} ${r2labpassword} | grep -v nightly"
                    }
                }
            }
@@ -143,21 +146,25 @@ pipeline {
                    sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
                    sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"

-                    echo '\u2705 \u001B[32mLoad Image for one eNB\u001B[0m'
-                    sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx} > /dev/null 2>&1'"
-                    sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx}'"
-                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx}'"
+                    echo '\u2705 \u001B[32mLoad Image for two (2) eNBs\u001B[0m'
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx},${r2labENB1Idx} > /dev/null 2>&1'"
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx},${r2labENB1Idx}'"
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
+                    sh "sleep 5"
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"

                    echo '\u2705 \u001B[32mLoad Image for one OAI UE\u001B[0m'
                    sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labUE0Idx} > /dev/null 2>&1'"
                    sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labUE0Idx}'"
                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labUE0Idx}'"
+                    sh "sleep 5"
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labUE0Idx}'"

                    echo '\u2705 \u001B[32mLoad Image for one EPC\u001B[0m'
                    sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-epc ${r2labEPC0Idx} > /dev/null 2>&1'"
                    sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labEPC0Idx}'"

-                    sh "ssh -t inria_oaici@faraday.inria.fr 'nodes ${r2labUE0Idx},${r2labPythonExeIdx},${r2labEPC0Idx},${r2labENB0Idx} && st'"
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'nodes ${r2labUE0Idx},${r2labPythonExeIdx},${r2labEPC0Idx},${r2labENB0Idx},${r2labENB1Idx} && st'"
                }
            }
        }
@@ -183,7 +190,6 @@ pipeline {
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:m11 172.16.1.102 up\"'"
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:m10 192.168.10.110 up\"'"
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:sxu 172.55.55.102 up\"'"
-                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s1u 192.168.248.159 up\"'"
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:sxc 172.55.55.101 up\"'"
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s5c 172.58.58.102 up\"'"
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:p5c 172.58.58.101 up\"'"
@@ -195,9 +201,6 @@ pipeline {
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip rule add from 12.0.0.0/8 table lte\"'"
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip rule add from 12.1.1.0/8 table lte\"'"

-                        // Adding a route on the eNB for the S1U interface
-                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labENB0} \"echo ${fitpasswd} | sudo -S ip route add 192.168.248.0/24 via ${r2labEPC0IpAddr} dev control\"'"
-
                        // For the moment, simple way to route traffic from python executor to any UEs
                        sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"echo ${fitpasswd} | sudo -S ip route add 12.1.1.0/24 via ${r2labEPC0IpAddr} dev control\"'"
                    }
@@ -214,7 +217,7 @@ pipeline {
                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                        for (xmlFile in myXmlTestSuite) {
                            try {
-                                sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=TesteNB --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g --ranBranch=${ranRepoBranch} --ranCommitID=${GIT_COMMIT_TO_RUN} --ranAllowMerge=false --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g --EPCIPAddress=${r2labEPC0IpAddr} --EPCType=OAI-Rel14-CUPS --EPCUserName=${fituser}  --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --ADBIPAddress=${r2labEPC0IpAddr} --ADBUserName=${fituser} --ADBPassword=${fitpasswd} --ADBType=distributed --XMLTestFile=${xmlFile}\"'"
+                                sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=TesteNB --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g --ranBranch=${ranRepoBranch} --ranCommitID=${GIT_COMMIT_TO_RUN} --ranAllowMerge=false --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g --eNB1IPAddress=${r2labENB1IpAddr} --eNB1UserName=${fituser} --eNB1Password=${fitpasswd} --eNB1SourceCodePath=/home/${fituser}/openairinterface5g --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g --EPCIPAddress=${r2labEPC0IpAddr} --EPCType=OAI-Rel14-CUPS --EPCUserName=${fituser}  --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --ADBIPAddress=${r2labEPC0IpAddr} --ADBUserName=${fituser} --ADBPassword=${fitpasswd} --ADBType=distributed --XMLTestFile=${xmlFile}\"'"
                            } catch (Exception e) {
                                currentBuild.result = 'FAILURE'
                                buildStageStatus = false
@@ -0,0 +1,279 @@
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe10;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
+
+    tr_s_preference     = "local_mac"
+
+    // In seconds
+    rrc_inactivity_threshold = 30;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function             = "3GPP_eNODEB";
+      node_timing               = "synch_to_ext_device";
+      node_synch_ref            = 0;
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2680000000L;
+      uplink_frequency_offset 			      = -120000000;
+      Nid_cell					      = 10;
+      N_RB_DL                 			      = 25;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports                                = 1;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 125;
+      pbch_repetition                                 = "FALSE";
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 0;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 0;
+      pdsch_referenceSignalPower 			      = -25;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -96;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -104;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode                                    = 1;
+
+      //Parameters for SIB18
+      rxPool_sc_CP_Len                                       = "normal";
+      rxPool_sc_Period                                       = "sf40";
+      rxPool_data_CP_Len                                     = "normal";
+      rxPool_ResourceConfig_prb_Num                          = 20;
+      rxPool_ResourceConfig_prb_Start                        = 5;
+      rxPool_ResourceConfig_prb_End                          = 44;
+      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+      rxPool_dataHoppingConfig_rbOffset                               = 0;
+      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+*/
+      // Parameters for SIB19
+      discRxPool_cp_Len                                               = "normal"
+      discRxPool_discPeriod                                           = "rf32"
+      discRxPool_numRetx                                              = 1;
+      discRxPool_numRepetition                                        = 2;
+      discRxPool_ResourceConfig_prb_Num                               = 5;
+      discRxPool_ResourceConfig_prb_Start                             = 3;
+      discRxPool_ResourceConfig_prb_End                               = 21;
+      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "no";
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "CI_RCC_IP_ADDR";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	tr_s_preference = "local_L1";
+	tr_n_preference = "local_RRC";
+	phy_test_mode = 0;
+        puSch10xSnr     =  160;
+        puCch10xSnr     =  160;
+        }  
+);
+
+L1s = (
+    	{
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+        }  
+);
+
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 1
+         nb_rx          = 1
+         att_tx         = 0
+         att_rx         = 0;
+         bands          = [7];
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 125;
+         eNB_instances  = [0];
+
+    }
+);  
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+NETWORK_CONTROLLER :
+{
+    FLEXRAN_ENABLED        = "no";
+    FLEXRAN_INTERFACE_NAME = "eth0";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
+    FLEXRAN_PORT           = 2210;
+    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
+    FLEXRAN_AWAIT_RECONF   = "no";
+};
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       global_log_verbosity                  ="medium";
+       hw_log_level                          ="info";
+       hw_log_verbosity                      ="medium";
+       phy_log_level                         ="info";
+       phy_log_verbosity                     ="medium";
+       mac_log_level                         ="info";
+       mac_log_verbosity                     ="high";
+       rlc_log_level                         ="info";
+       rlc_log_verbosity                     ="medium";
+       pdcp_log_level                        ="info";
+       pdcp_log_verbosity                    ="medium";
+       rrc_log_level                         ="info";
+       rrc_log_verbosity                     ="medium";
+    };
+
@@ -137,6 +137,7 @@ class SSHConnection():
 		self.eNBLogFiles = ['', '', '']
 		self.eNBOptions = ['', '', '']
 		self.eNBmbmsEnables = [False, False, False]
+		self.eNBstatuses = [-1, -1, -1]
 		self.ping_args = ''
 		self.ping_packetloss_threshold = ''
 		self.iperf_args = ''
@@ -836,13 +837,13 @@ class SSHConnection():
 		# do not reset board twice in IF4.5 case
 		result = re.search('^rru|^enb|^du.band', str(config_file))
 		if result is not None:
-			self.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 30)
+			self.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
 			result = re.search('type: b200', str(self.ssh.before))
 			if result is not None:
 				logging.debug('Found a B2xx device --> resetting it')
 				self.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
 				# Reloading FGPA bin firmware
-				self.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 30)
+				self.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
 		# Make a copy and adapt to EPC / eNB IP addresses
 		self.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
 		self.command('sed -i -e \'s/CI_MME_IP_ADDR/' + self.EPCIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
@@ -940,6 +941,8 @@ class SSHConnection():
 					logging.debug('\u001B[1m oaitun_enm1 interface is mounted and configured\u001B[0m')
 				else:
 					logging.error('\u001B[1m oaitun_enm1 interface is either NOT mounted or NOT configured\u001B[0m')
+		if enbDidSync:
+			self.eNBstatuses[int(self.eNB_instance)] = int(self.eNB_serverId)

 		self.close()
 		self.CreateHtmlTestRow('-O ' + config_file + extra_options, 'OK', ALL_PROCESSES_OK)
@@ -950,20 +953,26 @@ class SSHConnection():
 			self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 			if not self.ADBCentralized:
 				# Reboot UE
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60)
 				# Wait
-				time.sleep(60)
+				#time.sleep(60)
 				# Put in LTE-Mode only
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60)
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60)
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60)
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60)
 				# enable data service
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
 				# we need to do radio on/off cycle to make sure of above changes
 				# airplane mode off // radio on
-				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
-				time.sleep(10)
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
+				#time.sleep(10)
+				# airplane mode on // radio off
+				#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
+
+				# normal procedure without reboot
+				# enable data service
+				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
 				# airplane mode on // radio off
 				self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
 				self.close()
@@ -1021,13 +1030,13 @@ class SSHConnection():
 			UE_prefix = 'NR '
 		self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
 		# b2xx_fx3_utils reset procedure
-		self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 30)
+		self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 60)
 		result = re.search('type: b200', str(self.ssh.before))
 		if result is not None:
 			logging.debug('Found a B2xx device --> resetting it')
 			self.command('echo ' + self.UEPassword + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
 			# Reloading FGPA bin firmware
-			self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 30)
+			self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 60)
 		result = re.search('type: n3xx', str(self.ssh.before))
 		if result is not None:
 			logging.debug('Found a N3xx device --> resetting it')
@@ -1957,11 +1966,27 @@ class SSHConnection():

 	def Ping_common(self, lock, UE_IPAddress, device_id, statusQueue):
 		try:
-			self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
-			self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
-			self.command('cd scripts', '\$', 5)
+			# Launch ping on the EPC side (true for ltebox and old open-air-cn)
+			# But for OAI-Rel14-CUPS, we launch from python executor
+			launchFromEpc = True
+			if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
+				launchFromEpc = False
 			ping_time = re.findall("-c (\d+)",str(self.ping_args))
-			ping_status = self.command('stdbuf -o0 ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
+
+			if launchFromEpc:
+				self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
+				self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
+				self.command('cd scripts', '\$', 5)
+				ping_status = self.command('stdbuf -o0 ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
+			else:
+				cmd = 'ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 > ping_' + self.testCase_id + '_' + device_id + '.log' 
+				message = cmd + '\n'
+				logging.debug(cmd)
+				ret = subprocess.run(cmd, shell=True)
+				ping_status = ret.returncode
+				self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'ping_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
+				self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
+				self.command('cat ' + self.EPCSourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
 			# TIMEOUT CASE
 			if ping_status < 0:
 				message = 'Ping with UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT!'
@@ -2270,7 +2295,7 @@ class SSHConnection():
 				req_bandwidth = '%.1f Gbits/sec' % req_bw
 				req_bw = req_bw * 1000000000

-		result = re.search('Server Report:\\\\r\\\\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) (\((?P<packetloss>[0-9\.]+)%\))', str(self.ssh.before))
+		result = re.search('Server Report:\\\\r\\\\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', str(self.ssh.before))
 		if result is not None:
 			bitrate = result.group('bitrate')
 			packetloss = result.group('packetloss')
@@ -2318,6 +2343,8 @@ class SSHConnection():
 			statusQueue.put(msg)
 			lock.release()
 			return 0
+		else:
+			return -2

 	def Iperf_analyzeV2Server(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options):
 		if (not os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
@@ -2487,11 +2514,17 @@ class SSHConnection():
 				self.command('echo $USER; nohup iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.EPCUserName, 5)
 			self.close()
 		else:
-			if udpIperf:
-				cmd = 'nohup iperf -u -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
+			if self.ueIperfVersion == self.dummyIperfVersion:
+				prefix = ''
 			else:
-				cmd = 'nohup iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
-			logging.debug(cmd + '\n')
+				prefix = ''
+				if self.ueIperfVersion == '2.0.5':
+					prefix = '/opt/iperf-2.0.5/bin/'
+			if udpIperf:
+				cmd = 'nohup ' + prefix + 'iperf -u -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
+			else:
+				cmd = 'nohup ' + prefix + 'iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
+			logging.debug(cmd)
 			subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, encoding='utf-8')
 		time.sleep(0.5)

@@ -2516,7 +2549,12 @@ class SSHConnection():
 		if (device_id == 'OAI-UE'):
 			iperf_status = self.command('iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + ' -B ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
 		else:
-			iperf_status = self.command('stdbuf -o0 adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '" 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+			if self.ADBCentralized:
+				iperf_status = self.command('stdbuf -o0 adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '" 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+			else:
+				iperf_status = self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '"\' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+				self.command('fromdos -o iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+				self.command('cat iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
 		# TIMEOUT Case
 		if iperf_status < 0:
 			self.close()
@@ -2535,12 +2573,12 @@ class SSHConnection():
 			self.close()
 		else:
 			cmd = 'killall --signal SIGKILL iperf'
-			logging.debug(cmd + '\n')
+			logging.debug(cmd)
 			subprocess.run(cmd, shell=True)
 			time.sleep(1)
 			self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
 		# in case of failure, retrieve server log
-		if (clientStatus == -1):
+		if (clientStatus == -1) or (clientStatus == -2):
 			if launchFromEpc:
 				time.sleep(1)
 				if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
@@ -2559,6 +2597,8 @@ class SSHConnection():
 				return
 			useIperf3 = False
 			udpIperf = True
+
+			self.ueIperfVersion = '2.0.5'
 			if (device_id != 'OAI-UE'):
 				self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 				# if by chance ADB server and EPC are on the same remote host, at least log collection will take care of it
@@ -2578,9 +2618,30 @@ class SSHConnection():
 						self.close()
 						self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
 						return
+					else:
+						if self.ADBCentralized:
+							self.command('adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"', '\$', 5)
+						else:
+							self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"\'', '\$', 60)
+						result = re.search('iperf version 2.0.5', str(self.ssh.before))
+						if result is not None:
+							self.ueIperfVersion = '2.0.5'
+						result = re.search('iperf version 2.0.10', str(self.ssh.before))
+						if result is not None:
+							self.ueIperfVersion = '2.0.10'
 				else:
 					useIperf3 = True
 				self.close()
+			else:
+				self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+				self.command('iperf --version', '\$', 5)
+				result = re.search('iperf version 2.0.5', str(self.ssh.before))
+				if result is not None:
+					self.ueIperfVersion = '2.0.5'
+				result = re.search('iperf version 2.0.10', str(self.ssh.before))
+				if result is not None:
+					self.ueIperfVersion = '2.0.10'
+				self.close()
 			# in case of iperf, UL has its own function
 			if (not useIperf3):
 				result = re.search('-R', str(self.iperf_args))
@@ -2615,7 +2676,7 @@ class SSHConnection():
 							self.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
 				else:
 					self.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-					self.command('echo $USER; nohup ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &\' > /dev/null 2>&1', self.ADBUserName, 60)
+					self.command('echo $USER; nohup ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" \' 2>&1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 60)

 			time.sleep(0.5)
 			self.close()
@@ -2651,7 +2712,13 @@ class SSHConnection():
 				if launchFromEpc:
 					iperf_status = self.command('stdbuf -o0 iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
 				else:
-					cmd = 'iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log'
+					if self.ueIperfVersion == self.dummyIperfVersion:
+						prefix = ''
+					else:
+						prefix = ''
+						if self.ueIperfVersion == '2.0.5':
+							prefix = '/opt/iperf-2.0.5/bin/'
+					cmd = prefix + 'iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log'
 					message = cmd + '\n'
 					logging.debug(cmd)
 					ret = subprocess.run(cmd, shell=True)
@@ -2696,6 +2763,7 @@ class SSHConnection():
 					self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
 				else:
 					self.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, self.EPCSourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+				self.command('fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
 				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options)

 			# in case of OAI UE: 
@@ -2840,6 +2908,18 @@ class SSHConnection():
 			self.CreateHtmlTestRow(self.iperf_args, 'KO', UE_IP_ADDRESS_ISSUE)
 			self.AutoTerminateUEandeNB()
 			return
+
+		self.dummyIperfVersion = '2.0.10'
+		#cmd = 'iperf --version'
+		#logging.debug(cmd + '\n')
+		#iperfStdout = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+		#result = re.search('iperf version 2.0.5', str(iperfStdout.strip()))
+		#if result is not None:
+		#	dummyIperfVersion = '2.0.5'
+		#result = re.search('iperf version 2.0.10', str(iperfStdout.strip()))
+		#if result is not None:
+		#	dummyIperfVersion = '2.0.10'
+
 		multi_jobs = []
 		i = 0
 		ue_num = len(self.UEIPAddresses)
@@ -2980,7 +3060,24 @@ class SSHConnection():

 	def CheckeNBProcess(self, status_queue):
 		try:
-			self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
+			# At least the instance 0 SHALL be on!
+			if self.eNBstatuses[0] == 0:
+				lIpAddr = self.eNBIPAddress
+				lUserName = self.eNBUserName
+				lPassWord = self.eNBPassword
+			elif self.eNBstatuses[0] == 1:
+				lIpAddr = self.eNB1IPAddress
+				lUserName = self.eNB1UserName
+				lPassWord = self.eNB1Password
+			elif self.eNBstatuses[0] == 2:
+				lIpAddr = self.eNB2IPAddress
+				lUserName = self.eNB2UserName
+				lPassWord = self.eNB2Password
+			else:
+				lIpAddr = self.eNBIPAddress
+				lUserName = self.eNBUserName
+				lPassWord = self.eNBPassword
+			self.open(lIpAddr, lUserName, lPassWord)
 			self.command('stdbuf -o0 ps -aux | grep --color=never ' + self.air_interface + '-softmodem | grep -v grep', '\$', 5)
 			result = re.search(self.air_interface + '-softmodem', str(self.ssh.before))
 			if result is None:
@@ -3669,6 +3766,7 @@ class SSHConnection():
 			else:
 				self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
 		self.eNBmbmsEnables[int(self.eNB_instance)] = False
+		self.eNBstatuses[int(self.eNB_instance)] = -1

 	def TerminateHSS(self):
 		self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
@@ -4154,7 +4252,7 @@ class SSHConnection():
 			if result is not None:
 				self.UhdVersion = result.group('uhd_version')
 				logging.debug('UHD Version is: ' + self.UhdVersion)
-		self.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 30)
+		self.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 60)
 		usrp_boards = re.findall('product: ([0-9A-Za-z]+)\\\\r\\\\n', str(self.ssh.before))
 		count = 0
 		for board in usrp_boards:
@@ -68,7 +68,7 @@
 	<testCase id="040503">
 		<class>Ping</class>
 		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-I 192.168.248.159 -c 20</ping_args>
+		<ping_args>-c 20</ping_args>
       		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>4</repeatCount>
 	<TestCaseRequestedList>
 030201 090109
 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
@@ -26,13 +26,24 @@
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
 010101
+ 010102
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

 	<testCase id="010101">
 		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
+		<desc>Build eNB #0 (USRP)</desc>
 		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+	<testCase id="010102">
+		<class>Build_eNB</class>
+		<desc>Build eNB #1 (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
 	</testCase>

 </testCaseList>
@@ -19,16 +19,52 @@
 For more information about the OpenAirInterface (OAI) Software Alliance:
      contact@openairinterface.org

- 030102 000002 040301 000002 040504 040605 040606 040645 040646 000001 040401 000002 030201
 -->
 <testCaseList>
 	<htmlTabRef>test-05-tm1</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
- 030201 040101
- 030102 000002 040301 000002 040504 000001 040401 000002 030201
+ 040101 030201
+ 030103 000002
+ 040301 000002 040504 040605 040606 040645 040646 040401
+ 040301 000002 040505 000001 040401
+ 040301 000002 040506 000001 040401
+ 040301 000002 040507 000001 040401
+ 040301 000002 040508 000001 040401
+ 040301 000002 040509 000001 040401
+ 040301 000002 040510 000001 040401
+ 040301 000002 040511 000001 040401
+ 040301 000002 040512 000001 040401
+ 040301 000002 040513 000001 040401
+ 040301 000002 040514 000001 040401
+ 040301 000002 040515 000001 040401
+ 040301 000002 040516 000001 040401
+ 040301 000002 040517 000001 040401
+ 040301 000002 040518 000001 040401
+ 040301 000002 040519 000001 040401
+ 040301 000002 040520 000001 040401
+ 040301 000002 040521 000001 040401
+ 040301 000002 040522 000001 040401
+ 040301 000002 040523 000001 040401
+ 040301 000002 040524 000001 040401
+ 040301 000002 040525 000001 040401
+ 040301 000002 040526 000001 040401
+ 040301 000002 040527 000001 040401
+ 040301 000002 040528 000001 040401
+ 040301 000002 040529 000001 040401
+ 040301 000002 040530 000001 040401
+ 040301 000002 040531 000001 040401
+ 040301 000002 040532 000001 040401
+ 040301 000002 040533 000001 040401
+ 040301 000002 040534 000001 040401
+ 040301 000002 040535 000001 040401
+ 040301 000002 040536 000001 040401
+ 040301 000002 040537 000001 040401
+ 040301 000002 040538 000001 040401
+ 040301 000002 040539 000001 040401
+ 040201 000002 030201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

@@ -37,6 +73,11 @@
 		<desc>Initialize UE</desc>
 	</testCase>

+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep for 10 sec</desc>
@@ -49,7 +90,7 @@
 		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
 	</testCase>

-	<testCase id="030102">
+	<testCase id="030103">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT</Initialize_eNB_args>
@@ -73,7 +114,252 @@
 	<testCase id="040504">
 		<class>Ping</class>
 		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-I 192.168.248.159 -c 20</ping_args>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040505">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040506">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040507">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040508">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040509">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040510">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040511">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040512">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040513">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040514">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040515">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040516">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040517">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040518">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040519">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040520">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040521">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040522">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040523">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040524">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040525">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040526">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040527">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040528">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040529">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040530">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040531">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040532">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040533">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040534">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040535">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040536">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040537">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040538">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040539">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>

@@ -86,8 +372,8 @@

 	<testCase id="040606">
 		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/12Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 12M -t 30 -i 1 -fm</iperf_args>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 	</testCase>

@@ -100,8 +386,8 @@

 	<testCase id="040646">
 		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -fm -R</iperf_args>
+		<desc>iperf (5MHz - UL/3.8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 3.8M -t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 	</testCase>

@@ -0,0 +1,203 @@
+<!--
+
+ 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
+
+-->
+<testCaseList>
+	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
+	<htmlTabName>Test-X2-Handover-05MHz-TM1</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>2</repeatCount>
+	<TestCaseRequestedList>
+ 040101 030201 030202
+ 050102
+ 030104 000002 030105 000002
+ 040301 000002
+ 040540 040615 040655
+ 050401 000001
+ 040541 040617 040657
+ 040401 000001
+ 040201 000002 030201 030202
+ 050202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep for 10 sec</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep for 3 sec</desc>
+		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030104">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB #0 (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT --eNBs.[0].enable_measurement_reports yes --eNBs.[0].enable_x2 yes --eNBs.[0].nr_cellid 123456</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+	<testCase id="030105">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB #1 (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT --eNBs.[0].enable_measurement_reports yes --eNBs.[0].enable_x2 yes --eNBs.[0].nr_cellid 98765</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB #0</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB #1</desc>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+	</testCase>
+
+	<testCase id="050102">
+		<class>Initialize_FlexranCtrl</class>
+		<desc>Starting Flexran Controller</desc>
+	</testCase>
+
+	<testCase id="050202">
+		<class>Terminate_FlexranCtrl</class>
+		<desc>Stopping Flexran Controller</desc>
+	</testCase>
+
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040540">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040541">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040542">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040615">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040616">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040617">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040618">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040655">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040656">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/3.8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 3.8M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040657">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040658">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/3.8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 3.8M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="050401">
+		<class>Perform_X2_Handover</class>
+		<desc>Doing a Flexran-Controlled X2 Handover</desc>
+		<x2_ho_options>network</x2_ho_options>
+	</testCase>
+
+	<testCase id="050402">
+		<class>Perform_X2_Handover</class>
+		<desc>Doing a Flexran-Controlled X2 Handover</desc>
+		<x2_ho_options>network</x2_ho_options>
+	</testCase>
+
+</testCaseList>
@@ -1746,6 +1746,8 @@ set (MAC_NR_SRC
  ${NR_MAC_DIR}/config.c
  ${NR_MAC_DIR}/gNB_scheduler.c
  ${NR_MAC_DIR}/gNB_scheduler_bch.c
+  ${NR_MAC_DIR}/gNB_scheduler_dlsch.c
+  ${NR_MAC_DIR}/gNB_scheduler_ulsch.c
  ${NR_MAC_DIR}/gNB_scheduler_primitives.c
  ${NR_MAC_DIR}/gNB_scheduler_phytest.c
 )
@@ -1828,7 +1830,7 @@ add_dependencies(L2_UE rrc_flag s1ap_flag x2_flag)

 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )

-add_library( MAC_NR_COMMON ${OPENAIR2_DIR}/LAYER2/NR_MAC_gNB/nr_mac_common.c )
+add_library( MAC_NR_COMMON ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c )

 include_directories("${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE")
 include_directories("${OPENAIR2_DIR}/LAYER2/NR_MAC_UE")
@@ -40,6 +40,7 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf

 MSC_GEN=0
 XFORMS="True"
+SKIP_SHARED_LIB_FLAG="False"
 UE_EXPANSION="False"
 UESIM_EXPANSION="False"
 PRINT_STATS="False"
@@ -155,6 +156,8 @@ Options
   Build optional shared library, <libraries> can be one or several of $OPTIONAL_LIBRARIES or \"all\"
 --usrp-recplay
   Build for I/Q record-playback modes
+-k | --skip-shared-libraries
+   Skip build for shared libraries to reduce compilation time when building frequently for debugging purposes
 -h | --help
   Print this help

@@ -193,7 +196,7 @@ function main() {
            INSTALL_SYSTEM_FILES=1
            echo_info "Will copy OpenAirInterface files in Linux directories"
            shift;;
-       -g | --run-with-gdb) 
+       -g | --run-with-gdb)
            case "$2" in
                "Release")
                    GDB=0
@@ -206,30 +209,30 @@ function main() {
                    GDB=0
                    CMAKE_BUILD_TYPE="RelWithDebInfo"
                    echo_info "Will Compile with gdb symbols"
-                    CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=RelWithDebInfo"                      
+                    CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=RelWithDebInfo"
                    shift
                    ;;
                "MinSizeRel")
                    GDB=0
                    CMAKE_BUILD_TYPE="MinSizeRel"
                    echo_info "Will Compile for minimal exec size"
-                    CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=MinSizeRel"                      
+                    CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=MinSizeRel"
                    shift
-                    ;;                    
+                    ;;
                "Debug" | *)
                    GDB=1
                    CMAKE_BUILD_TYPE="Debug"
                    echo_info "Will Compile with gdb symbols and disable compiler optimization"
                    CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=Debug"
                    if [ "$2" == "Debug" ] ; then
-                    	shift
+                        shift
                    fi
                    ;;
            esac
            shift;;
       -G | --cmaketrace)
-       	   CMAKE_CMD="$CMAKE_CMD --trace-expand"
-       	   shift;;
+            CMAKE_CMD="$CMAKE_CMD --trace-expand"
+            shift;;
       --eNB)
            eNB=1
            echo_info "Will compile eNB"
@@ -401,6 +404,10 @@ function main() {
            USRP_REC_PLAY="True"
            echo_info "Enabling USRP record playback mode"
            shift 1;;
+        -k | --skip-shared-libraries)
+            SKIP_SHARED_LIB_FLAG="True"
+            echo_info "Skipping build of shared libraries, rfsimulator, basicsimulator and transport protocol libraries"
+            shift;;
        -h | --help)
            print_help
            exit 1;;
@@ -551,9 +558,9 @@ function main() {
    build_dir=phy_simulators
  else
    if [ "$T_TRACER" =  "False" ] ; then
-        build_dir=ran_build_noLOG
+      build_dir=ran_build_noLOG
    else
-        build_dir=ran_build  
+      build_dir=ran_build  
    fi
  fi
  [ "$CLEAN" = "1" ] && rm -rf $DIR/$build_dir/build
@@ -586,52 +593,57 @@ function main() {
    echo "set ( UE_DEBUG_TRACE $UE_DEBUG_TRACE )"                         >> $cmake_file
    echo "set ( UE_TIMING_TRACE $UE_TIMING_TRACE )"                       >> $cmake_file
    echo "set ( USRP_REC_PLAY $USRP_REC_PLAY )"                           >> $cmake_file
+    echo "set ( SKIP_SHARED_LIB_FLAG $SKIP_SHARED_LIB_FLAG )"             >> $cmake_file
    echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'         >> $cmake_file
    cd  $DIR/$build_dir/build
    eval $CMAKE_CMD

-  execlist=""
-  if [ "$eNB" = "1" ] ; then
-     execlist="$execlist lte-softmodem"
-  fi
-  if [ "$gNB" = "1" ] ; then
-     execlist="$execlist nr-softmodem"
-  fi  
-  if [ "$UE" = 1 ] ; then
-     execlist="$execlist lte-uesoftmodem"
-  fi  
-  if [ "$nrUE" = 1 ] ; then
-     execlist="$execlist nr-uesoftmodem"
-  fi  
+    execlist=""
+    if [ "$eNB" = "1" ] ; then
+      execlist="$execlist lte-softmodem"
+    fi
+    if [ "$gNB" = "1" ] ; then
+      execlist="$execlist nr-softmodem"
+    fi
+    if [ "$UE" = 1 ] ; then
+      execlist="$execlist lte-uesoftmodem"
+    fi
+    if [ "$nrUE" = 1 ] ; then
+      execlist="$execlist nr-uesoftmodem"
+    fi

-  for f in $execlist ; do
-  	  echo_info "Compiling $f..."
+    for f in $execlist ; do
+      echo_info "Compiling $f..."
      compilations \
-	$build_dir $f \
-	$f $dbin/$f.$REL
-  done
-
-
+        $build_dir $f \
+        $f $dbin/$f.$REL
+    done


 # mandatory shared libraries common to UE and (e/g)NB

-    compilations \
-	  $build_dir $config_libconfig_shlib \
-	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
+    if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
+      echo_info "Building shared libraries common to UE and gNB"

-    compilations \
-      $build_dir coding \
-      libcoding.so $dbin/libcoding.so
+      compilations \
+        $build_dir $config_libconfig_shlib \
+        lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so

-	compilations \
-	  $build_dir nasmesh \
-	  CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
+      compilations \
+        $build_dir coding \
+        libcoding.so $dbin/libcoding.so

-	compilations \
-	  $build_dir rb_tool \
-	  rb_tool $dbin/rb_tool
+      compilations \
+        $build_dir nasmesh \
+        CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
+
+      compilations \
+        $build_dir rb_tool \
+        rb_tool $dbin/rb_tool
      cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin
+    fi
+
+  fi

  if [ "$UE" = 1 ] ; then

@@ -646,11 +658,11 @@ function main() {
 #    compilations \
 #      at_commands at_nas_ue \
 #      at_nas_ue $dbin/at_nas_ue
-    
+
    [ "$CLEAN" = "1" ] && rm -rf $DIR/nas_sim_tools/build
    mkdir -p $DIR/nas_sim_tools/build
    cd $DIR/nas_sim_tools/build
-    
+
    eval $CMAKE_CMD
    compilations \
      nas_sim_tools usim \
@@ -673,12 +685,11 @@ function main() {
      echo_warning "not generated UE NAS files: binaries not found"
    fi
  fi
-fi 
-

  if [ "$SIMUS_PHY" = "1" -o "$SIMUS_CORE" = "1" ] ; then
    cd  $DIR/$build_dir/build
    eval $CMAKE_CMD
+  fi

  ##################
  # PHY simulators #
@@ -699,7 +710,7 @@ fi
 #	   lte-simulators $config_libconfig_shlib \
 #	   lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
  fi
-  fi
+
  ###################
  # Core simulators #
  ###################
@@ -806,6 +817,7 @@ fi
  # Build RF device and transport protocol libraries #
  ####################################################
  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" -o "$HWLAT" = "1" ] ; then
+
      # build RF device libraries
      if [ "$HW" != "None" ] ; then
          rm -f liboai_device.so
@@ -813,18 +825,18 @@ fi

          # link liboai_device.so with the selected RF device library
          if [ "$HW" == "EXMIMO" ] ; then
-	          compilations \
+              compilations \
                  $build_dir oai_exmimodevif \
-		          liboai_exmimodevif.so $dbin/liboai_exmimodevif.so.$REL
+                  liboai_exmimodevif.so $dbin/liboai_exmimodevif.so.$REL

-	          ln -sf liboai_exmimodevif.so liboai_device.so
-	          ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
-	          echo_info "liboai_device.so is linked to EXMIMO device library"
-	      elif [ "$HW" == "OAI_USRP" ] ; then
+              ln -sf liboai_exmimodevif.so liboai_device.so
+              ln -sf $dbin/liboai_exmimodevif.so.$REL $dbin/liboai_device.so
+              echo_info "liboai_device.so is linked to EXMIMO device library"
+          elif [ "$HW" == "OAI_USRP" ] ; then
              compilations \
                  $build_dir oai_usrpdevif \
                  liboai_usrpdevif.so $dbin/liboai_usrpdevif.so.$REL
-                  
+
              ln -sf liboai_usrpdevif.so liboai_device.so
              ln -sf $dbin/liboai_usrpdevif.so.$REL $dbin/liboai_device.so
              echo_info "liboai_device.so is linked to USRP device library"        
@@ -868,31 +880,36 @@ fi
                  echo_error "== FAILED == Unexpected Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
              fi
              echo_info "liboai_device.so is linked to ADRV9371_ZC706 device library for Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
-	      else 
-	          echo_info "liboai_device.so is not linked to any device library"	    
-	      fi
+          else
+              echo_info "liboai_device.so is not linked to any device library"
+          fi
      fi
-      
+
      #build simulators devices
-      echo_info "Compiling rfsimulator"
-      compilations \
-          $build_dir rfsimulator \
-          librfsimulator.so $dbin/librfsimulator.so.$REL
-      
-      echo_info "Compiling basicsimulator"
-      compilations \
-          $build_dir tcp_bridge_oai \
-          libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
+      if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
+          echo_info "Compiling rfsimulator"
+          compilations \
+              $build_dir rfsimulator \
+              librfsimulator.so $dbin/librfsimulator.so.$REL
+
+          echo_info "Compiling basicsimulator"
+          compilations \
+              $build_dir tcp_bridge_oai \
+              libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
+      fi

      #build transport protocol libraries (currently only ETHERNET is available)
-      rm -f liboai_transpro.so
-	  rm -f $dbin/liboai_transpro.so
-	  compilations \
-          $build_dir oai_eth_transpro \
-		  liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
-	  ln -sf liboai_eth_transpro.so liboai_transpro.so
-	  ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
-	  echo_info "liboai_transpro.so is linked to ETHERNET transport"
+      if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
+          echo_info "Building transport protocol libraries"
+          rm -f liboai_transpro.so
+          rm -f $dbin/liboai_transpro.so
+          compilations \
+              $build_dir oai_eth_transpro \
+              liboai_eth_transpro.so $dbin/liboai_eth_transpro.so.$REL
+          ln -sf liboai_eth_transpro.so liboai_transpro.so
+          ln -sf $dbin/liboai_eth_transpro.so.$REL $dbin/liboai_transpro.so
+          echo_info "liboai_transpro.so is linked to ETHERNET transport"
+      fi
  fi

  ###################
@@ -63,7 +63,7 @@


 #include "LAYER2/MAC/mac.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/MAC/mac_proto.h"
 #include "RRC/LTE/rrc_extern.h"
 #include "PHY_INTERFACE/phy_interface.h"
@@ -412,21 +412,28 @@ int wakeup_txfh(PHY_VARS_gNB *gNB,gNB_L1_rxtx_proc_t *proc,int frame_tx,int slot
  RU_t *ru;
  RU_proc_t *ru_proc;

-  int waitret,ret;
- 
+  int waitret = 0, ret = 0, time_ns = 1000*1000;
+  struct timespec now, abstime;

-
-// note this  should depend on the numerology used by the TX L1 thread, set here for 500us slot time
+  // note this should depend on the numerology used by the TX L1 thread, set here for 500us slot time
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL,1);
+  time_ns = time_ns/gNB->frame_parms.slots_per_subframe;
  AssertFatal((ret = pthread_mutex_lock(&proc->mutex_RUs_tx))==0,"mutex_lock returns %d\n",ret);
  while (proc->instance_cnt_RUs < 0) {
-    pthread_cond_wait(&proc->cond_RUs,&proc->mutex_RUs_tx); // this unlocks mutex_rxtx while waiting and then locks it again
+    clock_gettime(CLOCK_REALTIME, &now);
+    abstime.tv_sec = now.tv_sec;
+    abstime.tv_nsec = now.tv_nsec + time_ns;
+
+    if (abstime.tv_nsec >= 1000*1000*1000) {
+      abstime.tv_nsec -= 1000*1000*1000;
+      abstime.tv_sec  += 1;
+    }
+    if((waitret = pthread_cond_timedwait(&proc->cond_RUs,&proc->mutex_RUs_tx,&abstime)) == 0) break; // this unlocks mutex_rxtx while waiting and then locks it again
  }
  proc->instance_cnt_RUs = -1;
  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE,proc->instance_cnt_RUs);
  AssertFatal((ret = pthread_mutex_unlock(&proc->mutex_RUs_tx))==0,"mutex_unlock returns %d\n",ret);
-
-
-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE,proc->instance_cnt_RUs);
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL,0);

  if (waitret == ETIMEDOUT) {
     LOG_W(PHY,"Dropping TX slot (%d.%d) because FH is blocked more than 1 slot times (500us)\n",frame_tx,slot_tx);
@@ -72,7 +72,7 @@
 #include "SCHED_NR/sched_nr.h"

 #include "LAYER2/MAC/mac.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/MAC/mac_proto.h"
 #include "RRC/LTE/rrc_extern.h"
 #include "PHY_INTERFACE/phy_interface.h"
@@ -464,6 +464,15 @@ void UE_processing(void *arg) {
  UE_nr_rxtx_proc_t *proc = &rxtxD->proc;
  PHY_VARS_NR_UE    *UE   = rxtxD->UE;
  processSlotRX(UE, proc);
+  uint8_t gNB_id = 0;
+
+  // params for UL time alignment procedure
+  NR_UL_TIME_ALIGNMENT_t *ul_time_alignment = &UE->ul_time_alignment[gNB_id];
+  uint8_t numerology = UE->frame_parms.numerology_index;
+  uint16_t bwp_ul_NB_RB = UE->frame_parms.N_RB_UL;
+  int slot_tx = proc->nr_tti_tx;
+  int frame_tx = proc->frame_tx;
+
  //printf(">>> mac ended\n");
  // Prepare the future Tx data
 /*
@@ -476,6 +485,21 @@ void UE_processing(void *arg) {
 #endif
 */

+  /* UL time alignment
+  // If the current tx frame and slot match the TA configuration in ul_time_alignment
+  // then timing advance is processed and set to be applied in the next UL transmission */
+  if (UE->mac_enabled == 1) {
+
+    if (frame_tx == ul_time_alignment->ta_frame && slot_tx == ul_time_alignment->ta_slot){
+      LOG_D(PHY,"Applying timing advance -- frame %d -- slot %d\n", frame_tx, slot_tx);
+
+      //if (nfapi_mode!=3){
+      nr_process_timing_advance(UE->Mod_id, UE->CC_id, ul_time_alignment->ta_command, numerology, bwp_ul_NB_RB);
+      ul_time_alignment->ta_frame = -1;
+      ul_time_alignment->ta_slot = -1;
+      //}
+    }
+  }

  if (proc->nr_tti_tx == NR_UPLINK_SLOT || UE->frame_parms.frame_type == FDD){

@@ -483,7 +507,7 @@ void UE_processing(void *arg) {


    if (UE->mode != loop_through_memory)
-      phy_procedures_nrUE_TX(UE,proc,0,thread_id);
+      phy_procedures_nrUE_TX(UE,proc,gNB_id,thread_id);

  }

@@ -705,11 +705,21 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
    ue->pusch_config.pusch_TimeDomainResourceAllocation[i]->mappingType = typeB;
  }

+  for (i=0;i<MAX_NR_OF_DL_ALLOCATIONS;i++){
+    ue->PDSCH_Config.pdsch_TimeDomainResourceAllocation[i] = (NR_PDSCH_TimeDomainResourceAllocation_t *)malloc16(sizeof(NR_PDSCH_TimeDomainResourceAllocation_t));
+    ue->PDSCH_Config.pdsch_TimeDomainResourceAllocation[i]->mappingType = typeA;
+  }
+
  //------------- config DMRS parameters--------------//
  ue->dmrs_UplinkConfig.pusch_dmrs_type = pusch_dmrs_type1;
  ue->dmrs_UplinkConfig.pusch_dmrs_AdditionalPosition = pusch_dmrs_pos0;
  ue->dmrs_UplinkConfig.pusch_maxLength = pusch_len1;
  //-------------------------------------------------//
+  ue->dmrs_DownlinkConfig.pdsch_dmrs_type = pdsch_dmrs_type1;
+  ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition = pdsch_dmrs_pos0;
+  ue->dmrs_DownlinkConfig.pdsch_maxLength = pdsch_len1;
+  //-------------------------------------------------//
+
  ue->nr_gold_pusch_dmrs = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t ***));
  pusch_dmrs             = ue->nr_gold_pusch_dmrs;
  n_scid = 0; // This quantity is indicated by higher layer parameter dmrs-SeqInitialization
@@ -62,11 +62,10 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
  LTE_DL_FRAME_PARMS *fp = (ue==NULL) ? frame_parms : &ue->frame_parms;
  int32_t *txF = (ue==NULL) ? txdataF[ant] : ue->common_vars.txdataF[ant];
  uint32_t u,v,alpha_ind;
-  uint32_t u0 = (ue==NULL) ? 0 : frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[subframe<<1];
-  uint32_t u1 = (ue==NULL) ? 0 : frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[1+(subframe<<1)];
-  uint32_t v0 = (ue==NULL) ? 0 : frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[subframe<<1];
-  uint32_t v1 = (ue==NULL) ? 0 : frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[1+(subframe<<1)];
-
+  uint32_t  u0=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[subframe<<1];
+  uint32_t  u1=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[1+(subframe<<1)];
+  uint32_t  v0=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[subframe<<1];
+  uint32_t  v1=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[1+(subframe<<1)];
  int32_t ref_re,ref_im;
  uint8_t harq_pid = (proc == NULL) ? 0: subframe2harq_pid(fp,proc->frame_tx,subframe);

@@ -82,10 +81,6 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
 		     fp->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[(subframe<<1)+1]+
 		     ((ue->ulsch[0]->cooperation_flag==2)?10:0)+
 		     ant*6) % 12;
-    u0=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[subframe<<1];
-    u1=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[1+(subframe<<1)];
-    v0=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[subframe<<1];
-    v1=fp->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[1+(subframe<<1)];
  }

  
@@ -615,7 +615,7 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
  rx_ind.number_pdus = 1; //rx_ind.number_pdus++;

  if (ue->if_inst && ue->if_inst->dl_indication)
-    ue->if_inst->dl_indication(&dl_indication);
+    ue->if_inst->dl_indication(&dl_indication, NULL);

  return 0;
 }
@@ -871,6 +871,16 @@ typedef struct UE_NR_SCAN_INFO_s {
  int32_t freq_offset_Hz[3][10];
 } UE_NR_SCAN_INFO_t;

+typedef struct NR_UL_TIME_ALIGNMENT {
+  /// flag used by MAC to inform PHY about a TA to be applied
+  unsigned char    apply_ta;
+  /// frame and slot when to apply the TA as stated in TS 38.213 setion 4.2
+  int16_t          ta_frame;
+  char             ta_slot;
+  /// TA command and TAGID received from the gNB
+  uint8_t          ta_command;
+  uint8_t          tag_id;
+} NR_UL_TIME_ALIGNMENT_t;

 #include "NR_IF_Module.h"

@@ -1066,9 +1076,14 @@ typedef struct {
  int              rx_offset; /// Timing offset
  int              rx_offset_diff; /// Timing adjustment for ofdm symbol0 on HW USRP
  int              time_sync_cell;
-  int              timing_advance; ///timing advance signalled from eNB
-  int              hw_timing_advance;
-  int              N_TA_offset; ///timing offset used in TDD
+
+  /// Timing Advance updates variables
+  /// Timing advance update computed from the TA command signalled from gNB
+  int                      timing_advance;
+  int                      hw_timing_advance;
+  int                      N_TA_offset; ///timing offset used in TDD
+  NR_UL_TIME_ALIGNMENT_t   ul_time_alignment[NUMBER_OF_CONNECTED_gNB_MAX];
+
  /// Flag to tell if UE is secondary user (cognitive mode)
  unsigned char    is_secondary_ue;
  /// Flag to tell if secondary eNB has channel estimates to create NULL-beams from.
@@ -36,6 +36,7 @@

 #include <stdbool.h>
 #include "types.h"
+#include "NR_PDSCH-TimeDomainResourceAllocation.h"

 #ifdef DEFINE_VARIABLES_PHY_IMPLEMENTATION_DEFS_NR_H
 #define EXTERN
@@ -377,8 +378,10 @@ typedef enum {


 ////////////////////////////////////////////////////////////////////////////////################################
-#define MAX_NR_RATE_MATCH_PATTERNS 4
-#define MAX_NR_ZP_CSI_RS_RESOURCES 32
+#define MAX_NR_RATE_MATCH_PATTERNS            4
+#define MAX_NR_ZP_CSI_RS_RESOURCES           32
+#define MAX_NR_OF_DL_ALLOCATIONS             16
+#define MAX_NR_OF_UL_ALLOCATIONS            (16)

 typedef enum{
  dl_resourceAllocationType0 = 1,
@@ -473,6 +476,8 @@ typedef struct {
 */
  maxNrofCodeWordsScheduledByDCI_t maxNrofCodeWordsScheduledByDCI;

+  NR_PDSCH_TimeDomainResourceAllocation_t *pdsch_TimeDomainResourceAllocation[MAX_NR_OF_DL_ALLOCATIONS];
+
 } PDSCH_Config_t;

 /***********************************************************************
@@ -483,7 +488,6 @@ typedef struct {
 *
 ************************************************************************/

-#define MAX_NR_OF_UL_ALLOCATIONS            (16)

 typedef enum {
  enable_tpc_accumulation = 0,  /* by default it is enable */
@@ -46,3 +46,5 @@ void handle_nr_nfapi_dlsch_pdu(PHY_VARS_gNB *gNB,int frame,int slot,
                            uint8_t *sdu);

 void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t harq_pid);
+
+void nr_fill_crc_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t crc_flag);
@@ -38,7 +38,7 @@
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
 #include "PHY/LTE_TRANSPORT/if5_tools.h"

-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/MAC/mac.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/system.h"
@@ -297,17 +297,17 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
  // [hna] TO BE CLEANED
  // --------------------

-  // nfapi_rx_indication_pdu_t *pdu;
-
+  nfapi_rx_indication_pdu_t *pdu;
  int timing_advance_update;
  int sync_pos;

+  uint16_t mu = gNB->gNB_config.subframe_config.numerology_index_mu.value;
  // pthread_mutex_lock(&gNB->UL_INFO_mutex);

  // gNB->UL_INFO.rx_ind.sfn_sf                    = frame<<4| slot_rx;
  // gNB->UL_INFO.rx_ind.rx_indication_body.tl.tag = NFAPI_RX_INDICATION_BODY_TAG;

-  // pdu                                    = &gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list[gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus];
+  pdu = &gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list[gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus];

  // pdu->rx_ue_information.handle          = gNB->ulsch[UE_id+1][0]->handle;
  // pdu->rx_ue_information.tl.tag          = NFAPI_RX_UE_INFORMATION_TAG;
@@ -315,20 +315,16 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
  // pdu->rx_indication_rel8.tl.tag         = NFAPI_RX_INDICATION_REL8_TAG;
  // pdu->rx_indication_rel8.length         = gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->TBS>>3;
  // pdu->rx_indication_rel8.offset         = 1;   // DJP - I dont understand - but broken unless 1 ????  0;  // filled in at the end of the UL_INFO formation
-  // pdu->data                              = gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->b;
-  // estimate timing advance for MAC
-  sync_pos                               = nr_est_timing_advance_pusch(gNB, UE_id);
-  timing_advance_update                  = sync_pos; // - gNB->frame_parms.nb_prefix_samples/4; //to check
-  // printf("\x1B[33m" "timing_advance_update = %d\n" "\x1B[0m", timing_advance_update);

+  pdu->data                              = gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->b;
+  sync_pos                               = nr_est_timing_advance_pusch(gNB, UE_id); // estimate timing advance for MAC
+  timing_advance_update                  = sync_pos * (1 << mu);                    // scale by the used scs numerology
+
+  // scale the 16 factor in N_TA calculation in 38.213 section 4.2 according to the used FFT size
  switch (gNB->frame_parms.N_RB_DL) {
-    // case 6:   /* nothing to do */          break;
-    // case 15:  timing_advance_update /= 2;  break;
-    // case 25:  timing_advance_update /= 4;  break;
-    // case 50:  timing_advance_update /= 8;  break;
-    // case 75:  timing_advance_update /= 12; break;
    case 106: timing_advance_update /= 16; break;
    case 217: timing_advance_update /= 32; break;
+    case 245: timing_advance_update /= 32; break;
    case 273: timing_advance_update /= 32; break;
    default: abort();
  }
@@ -339,7 +335,9 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
  if (timing_advance_update < 0)  timing_advance_update = 0;
  if (timing_advance_update > 63) timing_advance_update = 63;

-  // pdu->rx_indication_rel8.timing_advance = timing_advance_update;
+  LOG_D(PHY, "Estimated timing advance PUSCH is  = %d, timing_advance_update is %d \n", sync_pos,timing_advance_update);
+
+  pdu->rx_indication_rel8.timing_advance = timing_advance_update;

  // estimate UL_CQI for MAC (from antenna port 0 only)
  // int SNRtimes10 = dB_fixed_times10(gNB->pusch_vars[UE_id]->ulsch_power[0]) - 300;//(10*gNB->measurements.n0_power_dB[0]);
@@ -352,12 +350,28 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
  // harq_pid,frame,slot_rx,SNRtimes10,pdu->rx_indication_rel8.ul_cqi,pdu->rx_indication_rel8.timing_advance,
  // timing_advance_update);

-  // gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus++;
+  gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus++;
  // gNB->UL_INFO.rx_ind.sfn_sf = frame<<4 | slot_rx;

  // pthread_mutex_unlock(&gNB->UL_INFO_mutex);
 }

+void nr_fill_crc_indication (PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t crc_flag){
+  // pthread_mutex_lock(&gNB->UL_INFO_mutex);
+  // nfapi_crc_indication_pdu_t *pdu = &gNB->UL_INFO.crc_ind.crc_indication_body.crc_pdu_list[gNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs];
+  // gNB->UL_INFO.crc_ind.sfn_sf                         = frame<<4 | subframe;
+  // gNB->UL_INFO.crc_ind.header.message_id              = NFAPI_CRC_INDICATION;
+  // gNB->UL_INFO.crc_ind.crc_indication_body.tl.tag     = NFAPI_CRC_INDICATION_BODY_TAG;
+  // pdu->instance_length = 0;     // don't know what to do with this
+  // //  pdu->rx_ue_information.handle                       = handle;
+  // pdu->rx_ue_information.tl.tag                       = NFAPI_RX_UE_INFORMATION_TAG;
+  // pdu->rx_ue_information.rnti                         = gNB->ulsch[UE_id]->rnti;
+  // pdu->crc_indication_rel8.tl.tag                     = NFAPI_CRC_INDICATION_REL8_TAG;
+  // pdu->crc_indication_rel8.crc_flag                   = crc_flag;
+  gNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs++;
+  //LOG_D(PHY, "%s() rnti:%04x crcs:%d crc_flag:%d\n", __FUNCTION__, pdu->rx_ue_information.rnti, gNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs, crc_flag);
+  // pthread_mutex_unlock(&gNB->UL_INFO_mutex);
+}

 void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {

@@ -385,9 +399,10 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
  int num_pusch_pdu = UL_tti_req->n_pdus;

  LOG_D(PHY,"phy_procedures_gNB_uespec_RX frame %d, slot %d, num_pusch_pdu %d\n",frame_rx,slot_rx,num_pusch_pdu);
-  
-  for (int i = 0; i < num_pusch_pdu; i++) {

+  gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus  = 0;
+
+  for (int i = 0; i < num_pusch_pdu; i++) {
    switch (UL_tti_req->pdus_list[i].pdu_type) {
    case NFAPI_NR_UL_CONFIG_PUSCH_PDU_TYPE:
      {
@@ -408,6 +423,7 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
 	//LOG_M("rxdataF_ext.m","rxF_ext",gNB->pusch_vars[UE_id]->rxdataF_ext[0],6900,1,1);
 	nr_ulsch_procedures(gNB, frame_rx, slot_rx, UE_id, harq_pid);
 	nr_fill_rx_indication(gNB, frame_rx, slot_rx, UE_id, harq_pid);  // indicate SDU to MAC
+	nr_fill_crc_indication(gNB, frame_rx, slot_rx, UE_id, 0);
      }
    }
  }
@@ -289,7 +289,13 @@ uint16_t nr_get_Np(uint8_t N_RB_DL,uint8_t nCCE,uint8_t plus1);

 int8_t nr_find_ue(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB);

-void nr_process_timing_advance(module_id_t Mod_id,uint8_t CC_id,int16_t timing_advance);
+/*! \brief Compute the timing adjustment at UE side from the old TA offset and the new received TA command
+  @param Mod_id Local UE index on which to act
+  @param CC_id Component Carrier Index
+  @param ta_command TA command received from the network
+  @param mu numerology index (0,1,2..)
+*/
+void nr_process_timing_advance(module_id_t Mod_id,uint8_t CC_id,uint8_t ta_command, uint8_t mu, uint16_t bwp_ul_NB_RB);
 void nr_process_timing_advance_rar(PHY_VARS_NR_UE *phy_vars_ue,UE_nr_rxtx_proc_t *proc,uint16_t timing_advance);

 unsigned int nr_get_tx_amp(int power_dBm, int power_max_dBm, int N_RB_UL, int nb_rb);
@@ -21,11 +21,11 @@

 /*! \file phy_procedures_nr_ue.c
 * \brief Implementation of UE procedures from 36.213 LTE specifications
- * \author R. Knopp, F. Kaltenberger, N. Nikaein, A. Mico Pereperez
+ * \author R. Knopp, F. Kaltenberger, N. Nikaein, A. Mico Pereperez, G. Casati
 * \date 2018
 * \version 0.1
 * \company Eurecom
- * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr, navid.nikaein@eurecom.fr
+ * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr, navid.nikaein@eurecom.fr, guido.casati@iis.fraunhofer.de
 * \note
 * \warning
 */
@@ -45,6 +45,7 @@
 //#include "PHY/extern.h"
 #include "SCHED_NR_UE/defs.h"
 #include "SCHED_NR/extern.h"
+#include "SCHED_NR_UE/phy_sch_processing_time.h"
 //#include <sched.h>
 //#include "targets/RT/USER/nr-softmodem.h"
 #include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
@@ -421,22 +422,6 @@ void nr_process_timing_advance_rar(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,ui
  LOG_I(PHY,"[UE %d] AbsoluteSubFrame %d.%d, received (rar) timing_advance %d\n",ue->Mod_id,proc->frame_rx, proc->nr_tti_rx, ue->timing_advance);
 #endif

-}
-
-void nr_process_timing_advance(uint8_t Mod_id,uint8_t CC_id,int16_t timing_advance)
-{
-
-  //  uint32_t frame = PHY_vars_UE_g[Mod_id]->frame;
-
-  // timing advance has Q1.5 format
-  timing_advance = timing_advance - 31;
-
-  PHY_vars_UE_g[Mod_id][CC_id]->timing_advance = PHY_vars_UE_g[Mod_id][CC_id]->timing_advance+timing_advance*4; //this is for 25RB only!!!
-
-
-  LOG_D(PHY,"[UE %d] Got timing advance %d from MAC, new value %d\n",Mod_id, timing_advance, PHY_vars_UE_g[Mod_id][CC_id]->timing_advance);
-
-
 }

 uint8_t nr_is_SR_TXOp(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id)
@@ -1560,6 +1545,28 @@ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDUR

 #endif

+
+void nr_process_timing_advance(module_id_t Mod_id, uint8_t CC_id, uint8_t ta_command, uint8_t mu, uint16_t bwp_ul_NB_RB){
+
+  // 3GPP TS 38.213 p4.2
+  // scale by the scs numerology
+  int factor_mu = 1 << mu;
+  uint16_t bw_scaling;
+
+  // scale the 16 factor in N_TA calculation in 38.213 section 4.2 according to the used FFT size
+  switch (bwp_ul_NB_RB) {
+    case 106: bw_scaling = 16; break;
+    case 217: bw_scaling = 32; break;
+    case 245: bw_scaling = 32; break;
+    case 273: bw_scaling = 32; break;
+    default: abort();
+  }
+
+  PHY_vars_UE_g[Mod_id][CC_id]->timing_advance += (ta_command - 31) * bw_scaling / factor_mu;
+
+  LOG_D(PHY, "[UE %d] Got timing advance command %u from MAC, new value is %u\n", Mod_id, ta_command, PHY_vars_UE_g[Mod_id][CC_id]->timing_advance);
+}
+
 #if 0
 void ue_ulsch_uespec_procedures(PHY_VARS_NR_UE *ue,
 								UE_nr_rxtx_proc_t *proc,
@@ -3158,7 +3165,7 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,
    dl_indication.dci_ind = &dci_ind; 
    
    //  send to mac
-    ue->if_inst->dl_indication(&dl_indication);
+    ue->if_inst->dl_indication(&dl_indication, NULL);

 #if UE_TIMING_TRACE
  stop_meas(&ue->dlsch_rx_pdcch_stats);
@@ -3536,7 +3543,6 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
  int frame_rx = proc->frame_rx;
  int nr_tti_rx = proc->nr_tti_rx;
  int ret=0, ret1=0;
-  //int CC_id = ue->CC_id;
  NR_UE_PDSCH *pdsch_vars;
  uint8_t is_cw0_active = 0;
  uint8_t is_cw1_active = 0;
@@ -3547,6 +3553,20 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
  uint16_t nb_symb_sch = 9;
  nr_downlink_indication_t dl_indication;
  fapi_nr_rx_indication_t rx_ind;
+  // params for UL time alignment procedure
+  NR_UL_TIME_ALIGNMENT_t *ul_time_alignment = &ue->ul_time_alignment[eNB_id];
+  uint16_t slots_per_frame = ue->frame_parms.slots_per_frame;
+  uint16_t slots_per_subframe = ue->frame_parms.slots_per_subframe;
+  uint8_t numerology = ue->frame_parms.numerology_index, mapping_type_ul, mapping_type_dl;
+  int ul_tx_timing_adjustment, N_TA_max, factor_mu, N_t_1, N_t_2, N_1, N_2, d_1_1 = 0, d_2_1, d;
+  uint8_t d_2_2 = 0;// set to 0 because there is only 1 BWP
+                    // TODO this should corresponds to the switching time as defined in
+                    // TS 38.133
+  uint16_t ofdm_symbol_size = ue->frame_parms.ofdm_symbol_size;
+  uint16_t nb_prefix_samples = ue->frame_parms.nb_prefix_samples;
+  uint32_t t_subframe = 1; // subframe duration of 1 msec
+  uint16_t bw_scaling, start_symbol;
+  float tc_factor;

  if (dlsch0==NULL)
    AssertFatal(0,"dlsch0 should be defined at this level \n");
@@ -3555,6 +3575,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
  harq_pid = dlsch0->current_harq_pid;
  is_cw0_active = dlsch0->harq_processes[harq_pid]->status;
  nb_symb_sch = dlsch0->harq_processes[harq_pid]->nb_symbols;
+  start_symbol = dlsch0->harq_processes[harq_pid]->start_symbol;



@@ -3806,13 +3827,128 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
      dl_indication.dci_ind = NULL; //&ue->dci_ind;
      //  send to mac
      if (ue->if_inst && ue->if_inst->dl_indication)
-      ue->if_inst->dl_indication(&dl_indication);
+      ue->if_inst->dl_indication(&dl_indication, ul_time_alignment);
      }
-    }

+      // TODO CRC check for CW0

+      // Check CRC for CW 0
+      /*if (ret == (1+dlsch0->max_turbo_iterations)) {
+        *dlsch_errors=*dlsch_errors+1;
+        if(dlsch0->rnti != 0xffff){
+          LOG_D(PHY,"[UE  %d][PDSCH %x/%d] AbsSubframe %d.%d : DLSCH CW0 in error (rv %d,round %d, mcs %d,TBS %d)\n",
+          ue->Mod_id,dlsch0->rnti,
+          harq_pid,frame_rx,subframe_rx,
+          dlsch0->harq_processes[harq_pid]->rvidx,
+          dlsch0->harq_processes[harq_pid]->round,
+          dlsch0->harq_processes[harq_pid]->mcs,
+          dlsch0->harq_processes[harq_pid]->TBS);
+        }
+      } else {
+        if(dlsch0->rnti != 0xffff){
+          LOG_D(PHY,"[UE  %d][PDSCH %x/%d] AbsSubframe %d.%d : Received DLSCH CW0 (rv %d,round %d, mcs %d,TBS %d)\n",
+          ue->Mod_id,dlsch0->rnti,
+          harq_pid,frame_rx,subframe_rx,
+          dlsch0->harq_processes[harq_pid]->rvidx,
+          dlsch0->harq_processes[harq_pid]->round,
+          dlsch0->harq_processes[harq_pid]->mcs,
+          dlsch0->harq_processes[harq_pid]->TBS);
+        }
+        if ( LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)){
+          int j;
+          LOG_D(PHY,"dlsch harq_pid %d (rx): \n",dlsch0->current_harq_pid);

+          for (j=0; j<dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS>>3; j++)
+            LOG_T(PHY,"%x.",dlsch0->harq_processes[dlsch0->current_harq_pid]->b[j]);
+          LOG_T(PHY,"\n");
+      }*/

+      if (ue->mac_enabled == 1) {
+
+        // scale the 16 factor in N_TA calculation in 38.213 section 4.2 according to the used FFT size
+        switch (ue->frame_parms.N_RB_DL) {
+          case 106: bw_scaling = 16; break;
+          case 217: bw_scaling = 32; break;
+          case 245: bw_scaling = 32; break;
+          case 273: bw_scaling = 32; break;
+          default: abort();
+        }
+
+        /* Time Alignment procedure
+        // - UE processing capability 1
+        // - Setting the TA update to be applied after the reception of the TA command
+        // - Timing adjustment computed according to TS 38.213 section 4.2
+        // - Durations of N1 and N2 symbols corresponding to PDSCH and PUSCH are
+        //   computed according to sections 5.3 and 6.4 of TS 38.214 */
+        factor_mu = 1 << numerology;
+        N_TA_max = 3846 * bw_scaling / factor_mu;
+
+        /* PDSCH decoding time N_1 for processing capability 1 */
+        if (ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition == pdsch_dmrs_pos0)
+          N_1 = pdsch_N_1_capability_1[numerology][1];
+        else if (ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition == pdsch_dmrs_pos1 || ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition == 2) // TODO set to pdsch_dmrs_pos2 when available
+          N_1 = pdsch_N_1_capability_1[numerology][2];
+        else
+          N_1 = pdsch_N_1_capability_1[numerology][3];
+
+        /* PUSCH preapration time N_2 for processing capability 1 */
+        N_2 = pusch_N_2_timing_capability_1[numerology][1];
+        mapping_type_dl = ue->PDSCH_Config.pdsch_TimeDomainResourceAllocation[0]->mappingType;
+        mapping_type_ul = ue->pusch_config.pusch_TimeDomainResourceAllocation[0]->mappingType;
+
+        /* d_1_1 depending on the number of PDSCH symbols allocated */
+        d = 0; // TODO number of overlapping symbols of the scheduling PDCCH and the scheduled PDSCH
+        if (mapping_type_dl == typeA)
+         if (nb_symb_sch + start_symbol < 7)
+          d_1_1 = 7 - (nb_symb_sch + start_symbol);
+         else
+          d_1_1 = 0;
+        else // mapping type B
+          switch (nb_symb_sch){
+            case 7: d_1_1 = 0; break;
+            case 4: d_1_1 = 3; break;
+            case 2: d_1_1 = 3 + d; break;
+            default: break;
+          }
+
+        /* d_2_1 */
+        if (mapping_type_ul == typeB && start_symbol != 0)
+          d_2_1 = 0;
+        else
+          d_2_1 = 1;
+
+        /* N_t_1 time duration in msec of N_1 symbols corresponding to a PDSCH reception time
+        // N_t_2 time duration in msec of N_2 symbols corresponding to a PUSCH preparation time */
+        N_t_1 = (N_1 + d_1_1) * (ofdm_symbol_size + nb_prefix_samples) / factor_mu;
+        N_t_2 = (N_2 + d_2_1) * (ofdm_symbol_size + nb_prefix_samples) / factor_mu;
+        if (N_t_2 < d_2_2) N_t_2 = d_2_2;
+
+        /* Time alignment procedure */
+        // N_t_1 + N_t_2 + N_TA_max is in unit of Ts, therefore must be converted to Tc
+        // N_t_1 + N_t_2 + N_TA_max must be in msec
+        tc_factor = 64 * 0.509 * 10e-7;
+        ul_tx_timing_adjustment = 1 + ceil(slots_per_subframe*((N_t_1 + N_t_2 + N_TA_max)*tc_factor + 0.5)/t_subframe);
+
+        if (ul_time_alignment->apply_ta == 1){
+          ul_time_alignment->ta_slot = (nr_tti_rx + ul_tx_timing_adjustment) % slots_per_frame;
+          if (nr_tti_rx + ul_tx_timing_adjustment > slots_per_frame){
+            ul_time_alignment->ta_frame = (frame_rx + 1) % 1024;
+          } else {
+            ul_time_alignment->ta_frame = frame_rx;
+          }
+          // reset TA flag
+          ul_time_alignment->apply_ta = 0;
+          LOG_D(PHY,"Frame %d slot %d -- Starting UL time alignment procedures. TA update will be applied at frame %d slot %d\n", frame_rx, nr_tti_rx, ul_time_alignment->ta_frame, ul_time_alignment->ta_slot);
+        }
+      }
+
+      /*ue->total_TBS[eNB_id] =  ue->total_TBS[eNB_id] + dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS;
+      ue->total_received_bits[eNB_id] = ue->total_TBS[eNB_id] + dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS;
+    }*/
+
+    // TODO CRC check for CW1
+
+  }
 }


@@ -0,0 +1,109 @@
+/*
+ * 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       phy_sch_processing_time.h
+ \brief         tables for UE PDSCH processing and UE PUSCH preparation procedure time
+                from TS 38.214 Physical procedures for data v15.6.0
+ \author        Guido Casati
+ \date 	        2019
+ \version       0.1
+ \company       Fraunhofer IIS
+ \email:        guido.casati@iis.fraunhofer.de
+ \note
+ \warning
+*/
+
+/* TS 38.214 Table 5.3-1: PDSCH processing time for PDSCH processing capability 1
+//   corresponding to the PDSCH decoding time N_1 [symbols]
+// where mu corresponds to the one of {mu_PDCCH, mu_PDSCH, mu_UL}
+//   resulting with the largest T_proc_1
+// where mu_PDCCH is the SCS of PDCCH scheduling PDSCH
+//   mu_PDSCH is the SCS of the scheduled PDSCH
+//   mu_UL is the SCS of the UL channel with which the HARQ-ACK is to be transmitted
+// column A is N_1 corresponding to dmrs-AdditionalPosition pos0 in DMRS-DownlinkConfig
+//   in both dmrs-DownlinkForPDSCH-MappingTypeA and dmrs-DownlinkForPDSCH-MappingTypeB
+// column B is N_1 corresponding to corresponds to dmrs-AdditionalPosition !0
+//   in DMRS-DownlinkConfig in both dmrs-DownlinkForPDSCH-MappingTypeA,
+//   dmrs-DownlinkForPDSCH-MappingTypeB or if the higher layer param is not configured
+//   when PDSCH DM-RS position l1 for the additional DM-RS is l1 = 1,2
+// column C is N_1 corresponding to corresponds to dmrs-AdditionalPosition !0
+//   in DMRS-DownlinkConfig in both dmrs-DownlinkForPDSCH-MappingTypeA,
+//   dmrs-DownlinkForPDSCH-MappingTypeB or if the higher layer param is not configured
+//   when PDSCH DM-RS position l1 for the additional DM-RS is != 1,2
+
+*/
+int8_t pdsch_N_1_capability_1[4][4] = {
+/* mu      A            B            C   */
+{  0,      8,           14,          13  },
+{  1,      10,          13,          13  },
+{  2,      17,          20,          20  },
+{  3,      20,          24,          24  },
+};
+
+/* TS 38.214 Table 5.3-2: PDSCH processing time for PDSCH processing capability 2
+//   corresponding to the PDSCH decoding time N_1 [symbols]
+// where mu corresponds to the one of {mu_PDCCH, mu_PDSCH, mu_UL}
+//   resulting with the largest T_proc_1
+// where mu_PDCCH is the SCS of PDCCH scheduling PDSCH
+//   mu_PDSCH is the SCS of the scheduled PDSCH
+//   mu_UL is the SCS of the UL channel with which the HARQ-ACK is to be transmitted
+// column A is N_1 corresponding to dmrs-AdditionalPosition pos0 in DMRS-DownlinkConfig in both
+//   dmrs-DownlinkForPDSCH-MappingTypeA and dmrs-DownlinkForPDSCH-MappingTypeB
+// mu == 2 is for FR1 only
+*/
+float pdsch_N_1_capability_2[3][2] = {
+/* mu      A */   
+{  0,      3   },
+{  1,      4.5 },
+{  2,      9   },
+};
+
+/* TS 38.214 Table 6.4-1: PUSCH preparation time for PUSCH timing capability 1
+//   corresponding to the PUSCH preparation time N_2 [symbols]
+// where mu corresponds to the one of {mu_DL, mu_UL}
+//   resulting with the largest T_proc_2
+// where mu_DL is the SCS with which the PDCCH
+//   carrying the DCI scheduling the PUSCH was transmitted
+//   mu_UL is the SCS of the UL channel with which PUSCH to be transmitted
+*/
+int8_t pusch_N_2_timing_capability_1[4][2] = {
+/* mu      N_2   */
+{  0,      10 },
+{  1,      12 },
+{  2,      23 },
+{  3,      36 },
+};
+
+/* TS 38.214 Table 6.4-2: PUSCH preparation time for PUSCH timing capability 2
+//   corresponding to the PUSCH preparation time N_2 [symbols]
+// where mu corresponds to the one of {mu_DL, mu_UL}
+//   resulting with the largest T_proc_2
+// where mu_DL is the SCS with which the PDCCH
+//   carrying the DCI scheduling the PUSCH was transmitted
+//   mu_UL is the SCS of the UL channel with which PUSCH to be transmitted
+// mu == 2 is for FR1 only
+*/
+float pusch_N_2_timing_capability_2[3][2] = {
+/* mu      N_2   */
+{  0,      5   },
+{  1,      5.5 },
+{  2,      11  },
+};
@@ -36,7 +36,7 @@
 #include "assertions.h"
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern_ue.h"
-#include "executables/nr-uesoftmodem.h"
+//#include "executables/nr-uesoftmodem.h"
 #include "targets/RT/USER/lte-softmodem.h"

 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
@@ -56,7 +56,7 @@ RAN_CONTEXT_t RC;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];

 double cpuf;
-int nfapi_mode = 0;
+uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;

 // needed for some functions
@@ -63,7 +63,7 @@ RAN_CONTEXT_t RC;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];

 double cpuf;
-int nfapi_mode=0;
+uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;

 //Dummy Functions
@@ -550,6 +550,9 @@ int main(int argc, char **argv)
  nr_gold_pdcch(UE,0,2);

  RC.nb_nr_macrlc_inst = 1;
+  RC.nb_nr_mac_CC = (int*)malloc(RC.nb_nr_macrlc_inst*sizeof(int));
+  for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
+    RC.nb_nr_mac_CC[i] = 1;
  mac_top_init_gNB();
  gNB_mac = RC.nrmac[0];

@@ -55,7 +55,7 @@ RAN_CONTEXT_t RC;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];

 double cpuf;
-int nfapi_mode=0;
+uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;

 // needed for some functions
@@ -53,7 +53,7 @@ openair0_config_t openair0_cfg[MAX_CARDS];
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];

 double cpuf;
-int nfapi_mode=0;
+uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;

 // needed for some functions
@@ -55,7 +55,7 @@ RAN_CONTEXT_t RC;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];

 double cpuf;
-int nfapi_mode = 0;
+uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;

 // needed for some functions
@@ -64,7 +64,7 @@ RAN_CONTEXT_t RC;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];

 double cpuf;
-int nfapi_mode = 0;
+uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;

 // dummy functions
@@ -394,6 +394,10 @@ int main(int argc, char **argv)
  gNB = RC.gNB[0][0];
  //gNB_config = &gNB->gNB_config;

+  //memset((void *)&gNB->UL_INFO,0,sizeof(gNB->UL_INFO));
+  gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list = (nfapi_rx_indication_pdu_t *)malloc(NB_UE_INST*sizeof(nfapi_rx_indication_pdu_t));
+  gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus = 0;
+
  frame_parms = &gNB->frame_parms; //to be initialized I suppose (maybe not necessary for PBCH)
  frame_parms->nb_antennas_tx = n_tx;
  frame_parms->nb_antennas_rx = n_rx;
@@ -34,7 +34,6 @@

 //#include "PHY/defs_common.h"
 #include "mac.h"
-
 #include "RRC/LTE/rrc_defs.h"

 extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE];
@@ -51,13 +50,9 @@ extern const uint8_t cqi2fmt2x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
 extern UE_RRC_INST *UE_rrc_inst;
 extern UE_MAC_INST *UE_mac_inst;

-
 extern eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][MAX_MOBILES_PER_ENB];	// eNBxUE = 8x8
 extern eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][MAX_MOBILES_PER_ENB];	// eNBxUE = 8x8

-
-
-
 extern unsigned char NB_INST;
 extern unsigned char NB_eNB_INST;
 extern uint16_t NB_UE_INST;
@@ -65,7 +60,6 @@ extern uint16_t NB_THREAD_INST;
 extern unsigned char NB_RN_INST;
 extern unsigned short NODE_ID[1];

-
 extern int cqi_to_mcs[16];

 extern uint32_t RRC_CONNECTION_FLAG;
@@ -0,0 +1,136 @@
+/*
+ * 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       nr_mac.h
+ * \brief      common MAC data structures, constant, and function prototype
+ * \author     R. Knopp, K.H. HSU, G. Casati
+ * \date       2019
+ * \version    0.1
+ * \company    Eurecom / NTUST / Fraunhofer IIS 
+ * \email:     knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr, guido.casati@iis.fraunhofer.de 
+ * \note
+ * \warning
+ */
+
+#ifndef __LAYER2_NR_MAC_H__
+#define __LAYER2_NR_MAC_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define NR_BCCH_DL_SCH 3 // SI
+
+#define NR_BCCH_BCH 5    // MIB
+
+//  For both DL/UL-SCH
+//  Except:
+//   - UL/DL-SCH: fixed-size MAC CE(known by LCID)
+//   - UL/DL-SCH: padding
+//   - UL-SCH:    MSG3 48-bits
+//  |0|1|2|3|4|5|6|7|  bit-wise
+//  |R|F|   LCID    |
+//  |       L       |
+//  |0|1|2|3|4|5|6|7|  bit-wise
+//  |R|F|   LCID    |
+//  |       L       |
+//  |       L       |
+
+//  For both DL/UL-SCH
+//  For:
+//   - UL/DL-SCH: fixed-size MAC CE(known by LCID)
+//   - UL/DL-SCH: padding, for single/multiple 1-oct padding CE(s)
+//   - UL-SCH:    MSG3 48-bits
+//  |0|1|2|3|4|5|6|7|  bit-wise
+//  |R|R|   LCID    |
+//  LCID: The Logical Channel ID field identifies the logical channel instance of the corresponding MAC SDU or the type of the corresponding MAC CE or padding as described in Tables 6.2.1-1 and 6.2.1-2 for the DL-SCH and UL-SCH respectively. There is one LCID field per MAC subheader. The LCID field size is 6 bits;
+//  L: The Length field indicates the length of the corresponding MAC SDU or variable-sized MAC CE in bytes. There is one L field per MAC subheader except for subheaders corresponding to fixed-sized MAC CEs and padding. The size of the L field is indicated by the F field;
+//  F: lenght of L is 0:8 or 1:16 bits wide
+//  R: Reserved bit, set to zero.
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L:8;        // octet 2 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_SHORT;
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L1:8;       // octet 2 [7:0]
+    uint8_t L2:8;       // octet 3 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_LONG;
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t R:2;        // octet 1 [7:6]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
+
+// 38.321 ch. 6.1.3.4
+typedef struct {
+    uint8_t TA_COMMAND:6;   // octet 1 [5:0]
+    uint8_t TAGID:2;        // octet 1 [7:6]
+} __attribute__ ((__packed__)) NR_MAC_CE_TA;
+
+//  38.321 ch6.2.1, 38.331
+#define DL_SCH_LCID_CCCH                           0x00
+#define DL_SCH_LCID_DCCH                           0x01
+#define DL_SCH_LCID_DCCH1                          0x02
+#define DL_SCH_LCID_DTCH                           0x03
+#define DL_SCH_LCID_RECOMMENDED_BITRATE            0x2F
+#define DL_SCH_LCID_SP_ZP_CSI_RS_RES_SET_ACT       0x30
+#define DL_SCH_LCID_PUCCH_SPATIAL_RELATION_ACT     0x31
+#define DL_SCH_LCID_SP_SRS_ACTIVATION              0x32
+#define DL_SCH_LCID_SP_CSI_REP_PUCCH_ACT           0x33
+#define DL_SCH_LCID_TCI_STATE_IND_UE_SPEC_PDCCH    0x34
+#define DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH    0x35
+#define DL_SCH_LCID_APERIODIC_CSI_TRI_STATE_SUBSEL 0x36
+#define DL_SCH_LCID_SP_CSI_RS_CSI_IM_RES_SET_ACT   0X37 
+#define DL_SCH_LCID_DUPLICATION_ACT                0X38
+#define DL_SCH_LCID_SCell_ACT_4_OCT                0X39
+#define DL_SCH_LCID_SCell_ACT_1_OCT                0X3A
+#define DL_SCH_LCID_L_DRX                          0x3B
+#define DL_SCH_LCID_DRX                            0x3C
+#define DL_SCH_LCID_TA_COMMAND                     0x3D
+#define DL_SCH_LCID_CON_RES_ID                     0x3E
+#define DL_SCH_LCID_PADDING                        0x3F
+
+#define UL_SCH_LCID_CCCH                           0x00
+#define UL_SCH_LCID_SRB1                           0x01
+#define UL_SCH_LCID_SRB2                           0x02
+#define UL_SCH_LCID_SRB3                           0x03
+#define UL_SCH_LCID_CCCH_MSG3                      0x21
+#define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY      0x35
+#define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT          0x36
+#define UL_SCH_LCID_CONFIGURED_GRANT_CONFIRMATION  0x37
+#define UL_SCH_LCID_MULTI_ENTRY_PHR_1_OCT          0x38
+#define UL_SCH_LCID_SINGLE_ENTRY_PHR               0x39
+#define UL_SCH_LCID_C_RNTI                         0x3A
+#define UL_SCH_LCID_S_TRUNCATED_BSR                0x3B
+#define UL_SCH_LCID_L_TRUNCATED_BSR                0x3C
+#define UL_SCH_LCID_S_BSR                          0x3D
+#define UL_SCH_LCID_L_BSR                          0x3E
+#define UL_SCH_LCID_PADDING                        0x3F
+
+
+#endif /*__LAYER2_MAC_H__ */
@@ -0,0 +1,73 @@
+/*
+ * 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 extern.h
+* \brief NR mac externs
+* \author G. Casati
+* \date 2019
+* \version 1.0
+* \email guido.casati@iis.fraunhofer.de
+* @ingroup _mac
+
+*/
+
+#ifndef __NR_MAC_EXTERN_H__
+#define __NR_MAC_EXTERN_H__
+
+//#include "PHY/defs_common.h"
+#include "nr_mac.h"
+#include "RRC/LTE/rrc_defs.h"
+#include "common/ran_context.h"
+
+/* extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE];
+extern const uint32_t Extended_BSR_TABLE[BSR_TABLE_SIZE];
+extern const uint8_t cqi2fmt0_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
+extern const uint8_t cqi2fmt1x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
+extern const uint8_t cqi2fmt2x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
+extern UE_RRC_INST *UE_rrc_inst;
+extern eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][MAX_MOBILES_PER_ENB];	// eNBxUE = 8x8
+extern eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][MAX_MOBILES_PER_ENB];	// eNBxUE = 8x8
+extern int cqi_to_mcs[16];
+extern uint32_t RRC_CONNECTION_FLAG;
+extern uint8_t rb_table[34];
+extern mac_rlc_am_muilist_t rlc_am_mui;
+extern SCHEDULER_MODES global_scheduler_mode;
+extern unsigned char NB_UE_INST;*/
+
+extern unsigned char NB_INST;
+extern unsigned char NB_eNB_INST;
+extern unsigned char NB_RN_INST;
+extern unsigned short NODE_ID[1];
+
+/* Scheduler */
+extern RAN_CONTEXT_t RC;
+extern int phy_test;
+extern uint8_t nfapi_mode;
+
+/*#if defined(PRE_SCD_THREAD)
+extern uint16_t pre_nb_rbs_required[2][MAX_NUM_CCs][NUMBER_OF_UE_MAX];
+extern uint8_t dlsch_ue_select_tbl_in_use;
+extern uint8_t new_dlsch_ue_select_tbl_in_use;
+extern boolean_t pre_scd_activeUE[NUMBER_OF_UE_MAX];
+extern eNB_UE_STATS pre_scd_eNB_UE_stats[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
+#endif*/
+
+#endif //DEF_H
@@ -37,10 +37,6 @@
 #include <stdlib.h>
 #include <string.h>

-#define NR_BCCH_DL_SCH 3            // SI
-
-#define NR_BCCH_BCH 5           // MIB
-
 /*!\brief UE layer 2 status */
 typedef enum {
    UE_CONNECTION_OK = 0,
@@ -49,65 +45,4 @@ typedef enum {
    UE_PHY_HO_PRACH
 } NR_UE_L2_STATE_t;

-typedef struct {
-    uint8_t LCID:6;     // octet 1 [5:0]
-    uint8_t F:1;        // octet 1 [6]
-    uint8_t R:1;        // octet 1 [7]
-    uint8_t L:8;        // octet 2 [7:0]
-} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_SHORT;
-
-typedef struct {
-    uint8_t LCID:6;     // octet 1 [5:0]
-    uint8_t F:1;        // octet 1 [6]
-    uint8_t R:1;        // octet 1 [7]
-    uint8_t L1:8;       // octet 2 [7:0]
-    uint8_t L2:8;       // octet 3 [7:0]
-} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_LONG;
-
-typedef struct {
-    uint8_t LCID:6;     // octet 1 [5:0]
-    uint8_t R:2;        // octet 1 [7:6]
-} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
-
-//  38.321 ch6.2.1, 38.331
-#define DL_SCH_LCID_CCCH                           0x00
-#define DL_SCH_LCID_SRB1                           0x01
-#define DL_SCH_LCID_SRB2                           0x02
-#define DL_SCH_LCID_SRB3                           0x03
-#define DL_SCH_LCID_RECOMMENDED_BITRATE            0x2F
-#define DL_SCH_LCID_SP_ZP_CSI_RS_RES_SET_ACT       0x30
-#define DL_SCH_LCID_PUCCH_SPATIAL_RELATION_ACT     0x31
-#define DL_SCH_LCID_SP_SRS_ACTIVATION              0x32
-#define DL_SCH_LCID_SP_CSI_REP_PUCCH_ACT           0x33
-#define DL_SCH_LCID_TCI_STATE_IND_UE_SPEC_PDCCH    0x34
-#define DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH    0x35
-#define DL_SCH_LCID_APERIODIC_CSI_TRI_STATE_SUBSEL 0x36
-#define DL_SCH_LCID_SP_CSI_RS_CSI_IM_RES_SET_ACT   0X37 
-#define DL_SCH_LCID_DUPLICATION_ACT                0X38
-#define DL_SCH_LCID_SCell_ACT_4_OCT                0X39
-#define DL_SCH_LCID_SCell_ACT_1_OCT                0X3A
-#define DL_SCH_LCID_L_DRX                          0x3B
-#define DL_SCH_LCID_DRX                            0x3C
-#define DL_SCH_LCID_TA_COMMAND                     0x3D
-#define DL_SCH_LCID_CON_RES_ID                     0x3E
-#define DL_SCH_LCID_PADDING                        0x3F
-
-#define UL_SCH_LCID_CCCH                           0x00
-#define UL_SCH_LCID_SRB1                           0x01
-#define UL_SCH_LCID_SRB2                           0x02
-#define UL_SCH_LCID_SRB3                           0x03
-#define UL_SCH_LCID_CCCH_MSG3                      0x21
-#define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY      0x35
-#define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT          0x36
-#define UL_SCH_LCID_CONFIGURED_GRANT_CONFIRMATION  0x37
-#define UL_SCH_LCID_MULTI_ENTRY_PHR_1_OCT          0x38
-#define UL_SCH_LCID_SINGLE_ENTRY_PHR               0x39
-#define UL_SCH_LCID_C_RNTI                         0x3A
-#define UL_SCH_LCID_S_TRUNCATED_BSR                0x3B
-#define UL_SCH_LCID_L_TRUNCATED_BSR                0x3C
-#define UL_SCH_LCID_S_BSR                          0x3D
-#define UL_SCH_LCID_L_BSR                          0x3E
-#define UL_SCH_LCID_PADDING                        0x3F
-
-
-#endif /*__LAYER2_MAC_DEFS_H__ */
+#endif /*__LAYER2_NR_UE_MAC_DEFS_H__ */
@@ -30,6 +30,10 @@
 * \warning
 */

+#include "mac_defs.h"
+
+//extern NR_UE_MAC_INST_t *UE_mac_inst;
+
 //	Type0-PDCCH search space
 extern const int32_t table_38213_13_1_c2[16];
 extern const int32_t table_38213_13_1_c3[16];
@@ -125,16 +125,30 @@ uint32_t get_ssb_slot(uint32_t ssb_index);
 uint32_t mr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t eNB_id, uint16_t rnti, sub_frame_t subframe);


+
+/* \brief Get payload (MAC PDU) from UE PHY
+@param module_idP Instance id of UE in machine
+@param CC_id Component Carrier index
+@param frameP Current Rx frame
+@param ttiP Current Rx tti subframe
+@param pdu Pointer to the MAC PDU
+@param pdu_len Length of the MAC PDU
+@param eNB_id Index of eNB that UE is attached to
+@returns void
+*/
+void nr_ue_send_sdu(module_id_t module_idP,uint8_t CC_id, frame_t frameP, uint8_t ttiP,
+                    uint8_t * pdu, uint16_t pdu_len, uint8_t gNB_index, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);
+
 void nr_ue_process_mac_pdu(
    module_id_t module_idP,
    uint8_t CC_id,
+    frame_t frameP,
    uint8_t *pduP, 
-    uint16_t mac_pdu_len, 
-    uint8_t eNB_index);
+    uint16_t mac_pdu_len,
+    uint8_t eNB_index,
+    NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);

 int8_t nr_ue_process_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, void *pduP, uint32_t pdu_len);

-void nr_ue_send_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP, sub_frame_t subframeP, uint8_t * sdu, uint16_t sdu_len, uint8_t eNB_index);
-
 #endif
 /** @}*/
@@ -21,22 +21,38 @@

 /* \file ue_procedures.c
 * \brief procedures related to UE
- * \author R. Knopp, K.H. HSU
+ * \author R. Knopp, K.H. HSU, G. Casati
 * \date 2018
 * \version 0.1
 * \company Eurecom / NTUST
- * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
+ * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr, guido.casati@iis.fraunhofer.de
 * \note
 * \warning
 */

+#include "executables/nr-softmodem.h"
+
+/* MAC related headers */
 #include "mac_proto.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac.h"
 #include "mac_extern.h"
+//#include "LAYER2/MAC/mac_vars.h" // TODO Note that mac_vars.h is not NR specific and this should be updated
+                                 // also, the use of the same should be updated in nr-softmodem and nr-uesoftmodem
+
+/* PHY UE related headers*/
+#include "SCHED_NR_UE/defs.h"
+
 #include "RRC/NR_UE/rrc_proto.h"
 #include "assertions.h"
 #include "PHY/defs_nr_UE.h"
+
+/*Openair Packet Tracer */
+#include "UTIL/OPT/opt.h"
+#include "OCG.h"
+
+/* log utils */
 #include "common/utils/LOG/log.h"
-#include "openair2/LAYER2/MAC/mac.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"

 #include <stdio.h>
 #include <math.h>
@@ -2027,20 +2043,85 @@ int8_t nr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t e
    return 0;
 }

+void nr_ue_send_sdu(module_id_t module_idP,
+                    uint8_t CC_id,
+                    frame_t frameP,
+                    uint8_t ttiP,
+                    uint8_t * pdu, uint16_t pdu_len, uint8_t gNB_index,
+                    NR_UL_TIME_ALIGNMENT_t *ul_time_alignment){
+
+  LOG_D(MAC, "Handling PDU frame %d slot %d\n", frameP, ttiP);
+
+  uint8_t * pduP = pdu;
+  NR_UE_MAC_INST_t *UE_mac_inst = get_mac_inst(module_idP);
+
+  /*
+  #if UE_TIMING_TRACE
+    start_meas(&UE_mac_inst[module_idP].rx_dlsch_sdu);
+  #endif
+  */
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SEND_SDU, VCD_FUNCTION_IN);
+
+  //LOG_D(MAC,"sdu: %x.%x.%x\n",sdu[0],sdu[1],sdu[2]);
+
+  if (opt_enabled) {
+    trace_pdu(DIRECTION_DOWNLINK, pduP, pdu_len, module_idP, WS_C_RNTI,
+    (int) UE_mac_inst[module_idP].cs_RNTI, frameP, ttiP, 0, 0); //subframeP
+    LOG_D(OPT, "[UE %d][DLSCH] Frame %d trace pdu for rnti %p  with size %d\n",
+      module_idP, frameP, UE_mac_inst[module_idP].cs_RNTI, pdu_len);
+    }
+
+  /*
+  #ifdef DEBUG_HEADER_PARSING
+    LOG_D(MAC, "[UE %d] ue_send_sdu : Frame %d gNB_index %d : num_ce %d num_sdu %d\n",
+      module_idP, frameP, gNB_index, num_ce, num_sdu);
+  #endif
+  */
+
+  /*
+  #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+    LOG_T(MAC, "[UE %d] First 32 bytes of DLSCH : \n", module_idP);
+    for (i = 0; i < 32; i++) {
+      LOG_T(MAC, "%x.", sdu[i]);
+    }
+    LOG_T(MAC, "\n");
+  #endif
+  */
+
+  // Processing MAC PDU
+  // it parses MAC CEs subheaders, MAC CEs, SDU subheaderds and SDUs
+  if (pduP != NULL)
+    nr_ue_process_mac_pdu(module_idP, CC_id, frameP, pduP, pdu_len, gNB_index, ul_time_alignment);
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SEND_SDU, VCD_FUNCTION_OUT);
+
+  /*
+  #if UE_TIMING_TRACE
+    stop_meas(&UE_mac_inst[module_idP].rx_dlsch_sdu);
+  #endif
+  */
+}

 void nr_ue_process_mac_pdu(
    module_id_t module_idP,
    uint8_t CC_id,
+    frame_t frameP,
    uint8_t *pduP, 
-    uint16_t mac_pdu_len, 
-    uint8_t eNB_index){
+    uint16_t mac_pdu_len,
+    uint8_t gNB_index,
+    NR_UL_TIME_ALIGNMENT_t *ul_time_alignment){

-    uint8_t *pdu_ptr = pduP;
-    uint16_t pdu_len = mac_pdu_len;
+    // This function is adapting code from the old
+    // parse_header(...) and ue_send_sdu(...) functions of OAI LTE

-    uint16_t mac_ce_len;
-    uint16_t mac_subheader_len;
-    uint16_t mac_sdu_len;
+    uint8_t *pdu_ptr = pduP, rx_lcid, done = 0;
+    int pdu_len = mac_pdu_len;
+    uint16_t mac_ce_len, mac_subheader_len, mac_sdu_len;
+
+    //NR_UE_MAC_INST_t *UE_mac_inst = get_mac_inst(module_idP);
+    //uint8_t scs = UE_mac_inst->mib->subCarrierSpacingCommon;
+    //uint16_t bwp_ul_NB_RB = UE_mac_inst->initial_bwp_ul.N_RB;

    //  For both DL/UL-SCH
    //  Except:
@@ -2066,15 +2147,19 @@ void nr_ue_process_mac_pdu(
    //  L: The Length field indicates the length of the corresponding MAC SDU or variable-sized MAC CE in bytes. There is one L field per MAC subheader except for subheaders corresponding to fixed-sized MAC CEs and padding. The size of the L field is indicated by the F field;
    //  F: lenght of L is 0:8 or 1:16 bits wide
    //  R: Reserved bit, set to zero.
-
-    uint8_t done = 0;
    
-    while (!done || pdu_len <= 0){
-        mac_ce_len = 0x0000;
-        mac_subheader_len = 0x0001; //  default to fixed-length subheader = 1-oct
-        mac_sdu_len = 0x0000;
-        switch(((NR_MAC_SUBHEADER_FIXED *)pdu_ptr)->LCID){
+    while (!done && pdu_len > 0){
+        mac_ce_len = 0;
+        mac_subheader_len = 1; //  default to fixed-length subheader = 1-oct
+        mac_sdu_len = 0;
+        rx_lcid = ((NR_MAC_SUBHEADER_FIXED *)pdu_ptr)->LCID;
+
+        switch(rx_lcid){
            //  MAC CE
+
+            /*#ifdef DEBUG_HEADER_PARSING
+              LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", ((NR_MAC_SUBHEADER_FIXED *)pdu_ptr)->LCID, pdu_len);
+            #endif*/
            case DL_SCH_LCID_CCCH:
                //  MSG4 RRC Connection Setup 38.331
                //  varialbe length
@@ -2084,8 +2169,11 @@ void nr_ue_process_mac_pdu(
                    mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pdu_ptr)->L2)<<8;
                    mac_subheader_len = 3;
                }
+
                break;
+
            case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH:
+
                //  38.321 Ch6.1.3.14
                //  varialbe length
                mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pdu_ptr)->L;
@@ -2171,10 +2259,27 @@ void nr_ue_process_mac_pdu(
            case DL_SCH_LCID_TA_COMMAND:
                //  38.321 Ch6.1.3.4
                mac_ce_len = 1;
+
+                /*uint8_t ta_command = ((NR_MAC_CE_TA *)pdu_ptr)[1].TA_COMMAND;
+                uint8_t tag_id = ((NR_MAC_CE_TA *)pdu_ptr)[1].TAGID;*/
+
+                ul_time_alignment->apply_ta = 1;
+                ul_time_alignment->ta_command = ((NR_MAC_CE_TA *)pdu_ptr)[1].TA_COMMAND;
+                ul_time_alignment->tag_id = ((NR_MAC_CE_TA *)pdu_ptr)[1].TAGID;
+
+                /*
+                #ifdef DEBUG_HEADER_PARSING
+                LOG_D(MAC, "[UE] CE %d : UE Timing Advance : %d\n", i, pdu_ptr[1]);
+                #endif
+                */
+
+                LOG_D(MAC, "Received TA_COMMAND %u TAGID %u CC_id %d\n", ul_time_alignment->ta_command, ul_time_alignment->tag_id, CC_id);
+
                break;
            case DL_SCH_LCID_CON_RES_ID:
                //  38.321 Ch6.1.3.3
                mac_ce_len = 6;
+
                break;
            case DL_SCH_LCID_PADDING:
                done = 1;
@@ -2182,235 +2287,61 @@ void nr_ue_process_mac_pdu(
                break;

            //  MAC SDU
-            case DL_SCH_LCID_SRB1:
+
+            case DL_SCH_LCID_DCCH:
                //  check if LCID is valid at current time.
-            case UL_SCH_LCID_SRB2:
-                //  check if LCID is valid at current time.
-            case UL_SCH_LCID_SRB3:
+
+            case DL_SCH_LCID_DCCH1:
                //  check if LCID is valid at current time.
+
            default:
                //  check if LCID is valid at current time.
-                mac_sdu_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pdu_ptr)->L;
-                mac_subheader_len = 2;
                if(((NR_MAC_SUBHEADER_SHORT *)pdu_ptr)->F){
-                    mac_sdu_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pdu_ptr)->L2)<<8;
+                    //mac_sdu_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pdu_ptr)->L2)<<8;
                    mac_subheader_len = 3;
+                    mac_sdu_len = ((uint16_t)(((NR_MAC_SUBHEADER_LONG *) pdu_ptr)->L1 & 0x7f) << 8)
+                    | ((uint16_t)((NR_MAC_SUBHEADER_LONG *) pdu_ptr)->L2 & 0xff);
+
+                } else {
+                  mac_sdu_len = (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pdu_ptr)->L;
+                  mac_subheader_len = 2;
                }
-                //  DRB LCID by RRC
-                break;
+
+                LOG_D(MAC, "[UE %d] Frame %d : DLSCH -> DL-DTCH %d (gNB %d, %d bytes)\n", module_idP, frameP, rx_lcid, gNB_index, mac_sdu_len);
+
+                #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+                    LOG_T(MAC, "[UE %d] First 32 bytes of DLSCH : \n", module_idP);
+
+                    for (i = 0; i < 32; i++)
+                      LOG_T(MAC, "%x.", (pdu_ptr + mac_subheader_len)[i]);
+
+                    LOG_T(MAC, "\n");
+                #endif
+
+                if (IS_SOFTMODEM_NOS1){
+                  if (rx_lcid < NB_RB_MAX && rx_lcid >= DL_SCH_LCID_DTCH) {
+
+                    mac_rlc_data_ind(module_idP,
+                                     0x1234,
+                                     gNB_index,
+                                     frameP,
+                                     ENB_FLAG_NO,
+                                     MBMS_FLAG_NO,
+                                     rx_lcid,
+                                     (char *) (pdu_ptr + mac_subheader_len),
+                                     mac_sdu_len,
+                                     1,
+                                     NULL);
+                  } else {
+                    LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, gNB_index);
+                  }
+                }
+
+            break;
        }
        pdu_ptr += ( mac_subheader_len + mac_ce_len + mac_sdu_len );
        pdu_len -= ( mac_subheader_len + mac_ce_len + mac_sdu_len );
+
        AssertFatal(pdu_len >= 0, "[MAC] nr_ue_process_mac_pdu, residual mac pdu length < 0!\n");
    }
 }
-
-//---------------------------------------------------------------------------------
-
-
-unsigned char *nr_parse_header(unsigned char *mac_header,
-			    unsigned char *num_ce,
-			    unsigned char *num_sdu,
-			    unsigned char *rx_ces,
-			    unsigned char *rx_lcids,
-			    unsigned short *rx_lengths,
-			    unsigned short tb_length)
-{
-
-    unsigned char not_done = 1, num_ces = 0, num_cont_res =
-	0, num_padding = 0, num_sdus = 0, lcid, num_sdu_cnt;
-    unsigned char *mac_header_ptr = mac_header;
-    unsigned short length, ce_len = 0;
-
-    while (not_done == 1) {
-
-	if (((SCH_SUBHEADER_FIXED *) mac_header_ptr)->E == 0) {
-	    //      printf("E=0\n");
-	    not_done = 0;
-	}
-
-	lcid = ((SCH_SUBHEADER_FIXED *) mac_header_ptr)->LCID;
-
-	if (lcid < UE_CONT_RES) {
-	    //printf("[MAC][UE] header %x.%x.%x\n",mac_header_ptr[0],mac_header_ptr[1],mac_header_ptr[2]);
-	    if (not_done == 0) {	// last MAC SDU, length is implicit
-		mac_header_ptr++;
-		length =
-		    tb_length - (mac_header_ptr - mac_header) - ce_len;
-
-		for (num_sdu_cnt = 0; num_sdu_cnt < num_sdus;
-		     num_sdu_cnt++) {
-		    length -= rx_lengths[num_sdu_cnt];
-		}
-	    } else {
-		if (((SCH_SUBHEADER_LONG *) mac_header_ptr)->F == 1) {
-		    length =
-			((((SCH_SUBHEADER_LONG *) mac_header_ptr)->
-			  L_MSB & 0x7f)
-			 << 8) | (((SCH_SUBHEADER_LONG *) mac_header_ptr)->
-				  L_LSB & 0xff);
-		    mac_header_ptr += 3;
-#ifdef DEBUG_HEADER_PARSING
-		    LOG_D(MAC, "[UE] parse long sdu, size %x \n", length);
-#endif
-
-		} else {	//if (((SCH_SUBHEADER_SHORT *)mac_header_ptr)->F == 0) {
-		    length = ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->L;
-		    mac_header_ptr += 2;
-		}
-	    }
-
-#ifdef DEBUG_HEADER_PARSING
-	    LOG_D(MAC, "[UE] sdu %d lcid %d length %d (offset now %ld)\n",
-		  num_sdus, lcid, length, mac_header_ptr - mac_header);
-#endif
-	    rx_lcids[num_sdus] = lcid;
-	    rx_lengths[num_sdus] = length;
-	    num_sdus++;
-	} else {		// This is a control element subheader
-	    if (lcid == SHORT_PADDING) {
-		num_padding++;
-		mac_header_ptr++;
-	    } else {
-		rx_ces[num_ces] = lcid;
-		num_ces++;
-		mac_header_ptr++;
-
-		if (lcid == TIMING_ADV_CMD) {
-		    ce_len++;
-		} else if (lcid == UE_CONT_RES) {
-
-		    // FNA: check MAC Header is one of thoses defined in Annex B of 36.321
-		    // Check there is only 1 Contention Resolution
-		    if (num_cont_res) {
-			LOG_W(MAC,
-			      "[UE] Msg4 Wrong received format: More than 1 Contention Resolution\n");
-			// exit parsing
-			return NULL;
-
-		    }
-		    // UE_CONT_RES shall never be the last subheader unless this is the only MAC subheader
-		    if ((not_done == 0)
-			&& ((num_sdus) || (num_ces > 1) || (num_padding))) {
-			LOG_W(MAC,
-			      "[UE] Msg4 Wrong received format: Contention Resolution after num_ces=%d num_sdus=%d num_padding=%d\n",
-			      num_ces, num_sdus, num_padding);
-			// exit parsing
-			return NULL;
-		    }
-		    num_cont_res++;
-		    ce_len += 6;
-		}
-	    }
-
-#ifdef DEBUG_HEADER_PARSING
-	    LOG_D(MAC, "[UE] ce %d lcid %d (offset now %ld)\n", num_ces,
-		  lcid, mac_header_ptr - mac_header);
-#endif
-	}
-    }
-
-    *num_ce = num_ces;
-    *num_sdu = num_sdus;
-
-    return (mac_header_ptr);
-}
-
-
-//------------------------------------------------------------------------------
-void
-nr_ue_send_sdu(module_id_t module_idP,
-	    uint8_t CC_id,
-	    frame_t frameP,
-	    sub_frame_t subframeP,
-	    uint8_t * sdu, uint16_t sdu_len, uint8_t eNB_index)
-//------------------------------------------------------------------------------
-{
-
-    unsigned char rx_ces[MAX_NUM_CE], num_ce, num_sdu, i, *payload_ptr;
-    unsigned char rx_lcids[NB_RB_MAX];
-    unsigned short rx_lengths[NB_RB_MAX];
-
-
-  //LOG_D(MAC,"sdu: %x.%x.%x\n",sdu[0],sdu[1],sdu[2]);
-
-
-    payload_ptr =
-	nr_parse_header(sdu, &num_ce, &num_sdu, rx_ces, rx_lcids, rx_lengths,
-		     sdu_len);
-
-#ifdef DEBUG_HEADER_PARSING
-    LOG_D(MAC,
-	  "[UE %d] ue_send_sdu : Frame %d eNB_index %d : num_ce %d num_sdu %d\n",
-	  module_idP, frameP, eNB_index, num_ce, num_sdu);
-#endif
-
-#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
-    LOG_T(MAC, "[UE %d] First 32 bytes of DLSCH : \n", module_idP);
-
-    for (i = 0; i < 32; i++) {
-	LOG_T(MAC, "%x.", sdu[i]);
-    }
-
-    LOG_T(MAC, "\n");
-#endif
-
-    if (payload_ptr != NULL) {
-
-	for (i = 0; i < num_ce; i++) {
-	    //    printf("ce %d : %d\n",i,rx_ces[i]);
-	    switch (rx_ces[i]) {
-	    case UE_CONT_RES:
-
-		break;
-
-	    case TIMING_ADV_CMD:
-
-        break;
-
-	    case DRX_CMD:
-
-		break;
-	    }
-	}
-
-	for (i = 0; i < num_sdu; i++) {
-#ifdef DEBUG_HEADER_PARSING
-	    LOG_I(MAC, "[UE] SDU %d : LCID %d, length %d\n", i,
-		  rx_lcids[i], rx_lengths[i]);
-#endif
-	    if ((rx_lcids[i] < NB_RB_MAX) && (rx_lcids[i] > DCCH1)) {
-
-		LOG_D(MAC,
-		      "[UE %d] Frame %d : DLSCH -> DL-DTCH%d (eNB %d, %d bytes)\n",
-		      module_idP, frameP, rx_lcids[i], eNB_index,
-		      rx_lengths[i]);
-
-#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
-		LOG_I(MAC, "Printing MAC PDU contents at slot: %d \n", subframeP);
-		int j;
-		for (j = 0; j < 20; j++) //rx_lengths[i]
-			LOG_I(MAC, "%x.", (unsigned char) payload_ptr[j]);
-		LOG_I(MAC, "\n");
-#endif
-		mac_rlc_data_ind(module_idP,
-				 4660, //UE_mac_inst[module_idP].crnti //hardcode value corresponding to the one from the eNB
-				 eNB_index,
-				 frameP,
-				 ENB_FLAG_NO,
-				 MBMS_FLAG_NO,
-				 rx_lcids[i],
-				 (char *) payload_ptr, rx_lengths[i], 1,
-				 NULL);
-	    } else {
-		LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (eNB %d)\n",
-		      module_idP, frameP, rx_lcids[i], eNB_index);
-	    }
-	    payload_ptr += rx_lengths[i];
-	}
-    }				// end if (payload_ptr != NULL)
-
-}
-
-
-
@@ -33,9 +33,10 @@
 #include "assertions.h"

 #include "LAYER2/MAC/mac.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/MAC/mac_proto.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
+
 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
@@ -64,10 +65,6 @@
 #define ENABLE_MAC_PAYLOAD_DEBUG
 #define DEBUG_eNB_SCHEDULER 1

-extern RAN_CONTEXT_t RC;
-extern int phy_test;
-extern uint8_t nfapi_mode;
-
 uint16_t nr_pdcch_order_table[6] = { 31, 31, 511, 2047, 2047, 8191 };

 void clear_nr_nfapi_information(gNB_MAC_INST * gNB,
@@ -302,12 +299,12 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
 			       
  protocol_ctxt_t   ctxt;

-  int               CC_id, i = -1;
-  UE_list_t         *UE_list = &RC.nrmac[module_idP]->UE_list;
-  rnti_t            rnti;
-
-  NR_COMMON_channels_t *cc      = RC.nrmac[module_idP]->common_channels;
-  //nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config = NULL;
+  int CC_id, i = -1, UE_id = 0;
+  gNB_MAC_INST *gNB = RC.nrmac[module_idP];
+  UE_list_t *UE_list = &gNB->UE_list;
+  rnti_t rnti;
+  UE_sched_ctrl_t *ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+  NR_COMMON_channels_t *cc = gNB->common_channels;

  start_meas(&RC.nrmac[module_idP]->eNB_scheduler);
  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ULSCH_SCHEDULER,VCD_FUNCTION_IN);
@@ -375,12 +372,28 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,

  // Phytest scheduling
 
-  if (slot_rxP==NR_UPLINK_SLOT){
+  // TODO once RACH is available, start ta_timer when UE is connected
+  if (ue_sched_ctl->ta_timer) ue_sched_ctl->ta_timer--;
+
+  if (ue_sched_ctl->ta_timer == 0) {
+    gNB->ta_command = ue_sched_ctl->ta_update;
+    /* if time is up, then set the timer to not send it for 5 frames
+    // regardless of the TA value */
+    ue_sched_ctl->ta_timer = 100;
+    /* reset ta_update */
+    ue_sched_ctl->ta_update = 31;
+    /* MAC CE flag indicating TA length */
+    gNB->ta_len = 2;
+  }
+
+  if (slot_rxP == NR_UPLINK_SLOT){
    nr_schedule_uss_ulsch_phytest(&RC.nrmac[module_idP]->UL_tti_req[0], frame_rxP, slot_rxP);
  }
  
-  if (slot_txP==NR_DOWNLINK_SLOT){
+  if (slot_txP == NR_DOWNLINK_SLOT){
    nr_schedule_uss_dlsch_phytest(module_idP, frame_txP, slot_txP,NULL);
+    // resetting ta flag
+    gNB->ta_len = 0;
  }

  /*
@@ -33,7 +33,7 @@
 #include "assertions.h"
 #include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
@@ -0,0 +1,181 @@
+/*
+ * 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       gNB_scheduler_dlsch.c
+ * \brief       procedures related to gNB for the DLSCH transport channel
+ * \author      Guido Casati
+ * \date        2019
+ * \email:      guido.casati@iis.fraunhofe.de
+ * \version     1.0
+ * @ingroup     _mac
+
+ */
+
+/*PHY*/
+#include "PHY/CODING/coding_defs.h"
+#include "PHY/defs_nr_common.h"
+#include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
+/*MAC*/
+#include "LAYER2/NR_MAC_COMMON/nr_mac.h"
+#include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
+#include "LAYER2/MAC/mac.h"
+
+/*NFAPI*/
+#include "nfapi_nr_interface.h"
+/*TAG*/
+#include "NR_TAG-Id.h"
+
+
+int nr_generate_dlsch_pdu(module_id_t module_idP,
+                          unsigned char *sdus_payload,
+                          unsigned char *mac_pdu,
+                          unsigned char num_sdus,
+                          unsigned short *sdu_lengths,
+                          unsigned char *sdu_lcids,
+                          unsigned char drx_cmd,
+                          unsigned char *ue_cont_res_id,
+                          unsigned short post_padding){
+
+  gNB_MAC_INST *gNB = RC.nrmac[module_idP];
+
+  NR_MAC_SUBHEADER_FIXED *mac_pdu_ptr = (NR_MAC_SUBHEADER_FIXED *) mac_pdu;
+  unsigned char * dlsch_buffer_ptr = sdus_payload;
+  uint8_t last_size = 0;
+  int offset = 0, mac_ce_size, i, timing_advance_cmd, tag_id = 0;
+
+  // MAC CEs 
+  uint8_t mac_header_control_elements[16], *ce_ptr;
+  ce_ptr = &mac_header_control_elements[0];
+
+  // 1) Compute MAC CE and related subheaders 
+
+  // DRX command subheader (MAC CE size 0)
+  if (drx_cmd != 255) {
+    mac_pdu_ptr->R = 0;
+    mac_pdu_ptr->LCID = DL_SCH_LCID_DRX;
+    //last_size = 1;
+    mac_pdu_ptr++;
+  }
+
+  // Timing Advance subheader
+  /* This was done only when timing_advance_cmd != 31
+  // now TA is always send when ta_timer resets regardless of its value
+  // this is done to avoid issues with the timeAlignmentTimer which is
+  // supposed to monitor if the UE received TA or not */
+  if (gNB->ta_len){
+    mac_pdu_ptr->R = 0;
+    mac_pdu_ptr->LCID = DL_SCH_LCID_TA_COMMAND;
+    //last_size = 1;
+    mac_pdu_ptr++;
+
+    // TA MAC CE (1 octet)
+    timing_advance_cmd = gNB->ta_command;
+    AssertFatal(timing_advance_cmd < 64,"timing_advance_cmd %d > 63\n", timing_advance_cmd);
+    ((NR_MAC_CE_TA *) ce_ptr)->TA_COMMAND = timing_advance_cmd;    //(timing_advance_cmd+31)&0x3f;
+    if (gNB->tag->tag_Id != 0){
+       tag_id = gNB->tag->tag_Id;
+      ((NR_MAC_CE_TA *) ce_ptr)->TAGID = tag_id;
+    }
+
+    LOG_D(MAC, "NR MAC CE timing advance command = %d (%d) TAG ID = %d\n", timing_advance_cmd, ((NR_MAC_CE_TA *) ce_ptr)->TA_COMMAND, tag_id);
+    mac_ce_size = sizeof(NR_MAC_CE_TA);
+
+    // Copying  bytes for MAC CEs to the mac pdu pointer
+    memcpy((void *) mac_pdu_ptr, (void *) ce_ptr, mac_ce_size);
+    ce_ptr += mac_ce_size;
+    mac_pdu_ptr += (unsigned char) mac_ce_size;
+  }
+
+
+  // Contention resolution fixed subheader and MAC CE
+  if (ue_cont_res_id) {
+    mac_pdu_ptr->R = 0;
+  	mac_pdu_ptr->LCID = DL_SCH_LCID_CON_RES_ID;
+    mac_pdu_ptr++;
+    //last_size = 1;
+
+    // contention resolution identity MAC ce has a fixed 48 bit size
+    // this contains the UL CCCH SDU. If UL CCCH SDU is longer than 48 bits, 
+    // it contains the first 48 bits of the UL CCCH SDU
+    LOG_T(MAC, "[gNB ][RAPROC] Generate contention resolution msg: %x.%x.%x.%x.%x.%x\n",
+        ue_cont_res_id[0], ue_cont_res_id[1], ue_cont_res_id[2],
+        ue_cont_res_id[3], ue_cont_res_id[4], ue_cont_res_id[5]);
+
+    // Copying bytes (6 octects) to CEs pointer
+    mac_ce_size = 6;
+    memcpy(ce_ptr, ue_cont_res_id, mac_ce_size);
+    
+    // Copying bytes for MAC CEs to mac pdu pointer
+    memcpy((void *) mac_pdu_ptr, (void *) ce_ptr, mac_ce_size);
+    ce_ptr += mac_ce_size;
+    mac_pdu_ptr += (unsigned char) mac_ce_size;
+  }
+
+
+  // 2) Generation of DLSCH MAC SDU subheaders
+  for (i = 0; i < num_sdus; i++) {
+    LOG_D(MAC, "[gNB] Generate DLSCH header num sdu %d len sdu %d\n", num_sdus, sdu_lengths[i]);
+
+    if (sdu_lengths[i] < 128) {
+      ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->R = 0;
+      ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->F = 0;
+      ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->LCID = sdu_lcids[i];
+      ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->L = (unsigned char) sdu_lengths[i];
+      last_size = 2;
+    } else {
+      ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->R = 0;
+      ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->F = 1;
+      ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->LCID = sdu_lcids[i];
+      ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->L1 = ((unsigned short) sdu_lengths[i] >> 8) & 0x7f;
+      ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->L2 = (unsigned short) sdu_lengths[i] & 0xff;
+      last_size = 3;
+    }
+
+    mac_pdu_ptr += last_size;
+
+    // 3) cycle through SDUs, compute each relevant and place dlsch_buffer in   
+    memcpy((void *) mac_pdu_ptr, (void *) dlsch_buffer_ptr, sdu_lengths[i]);
+    dlsch_buffer_ptr+= sdu_lengths[i]; 
+    mac_pdu_ptr += sdu_lengths[i];
+  }
+
+  // 4) Compute final offset for padding
+  if (post_padding > 0) {    
+    ((NR_MAC_SUBHEADER_FIXED *) mac_pdu_ptr)->R = 0;
+    ((NR_MAC_SUBHEADER_FIXED *) mac_pdu_ptr)->LCID = DL_SCH_LCID_PADDING;
+    mac_pdu_ptr++;
+
+  } else {            
+    // no MAC subPDU with padding
+  }
+
+  // compute final offset
+  offset = ((unsigned char *) mac_pdu_ptr - mac_pdu);
+    
+  //printf("Offset %d \n", ((unsigned char *) mac_pdu_ptr - mac_pdu));
+
+  return offset;
+}
+
+/* functionalities of this function have been moved to nr_schedule_uss_dlsch_phytest */
+void nr_schedule_ue_spec(module_id_t module_idP, frame_t frameP, sub_frame_t slotP){
+}
@@ -21,9 +21,9 @@

 /*! \file gNB_scheduler_phytest.c
 * \brief gNB scheduling procedures in phy_test mode
- * \author  Guy De Souza
+ * \author  Guy De Souza, G. Casati
 * \date 07/2018
- * \email: desouza@eurecom.fr
+ * \email: desouza@eurecom.fr, guido.casati@iis.fraunhofer.de
 * \version 1.0
 * @ingroup _mac
 */
@@ -37,6 +37,8 @@
 extern RAN_CONTEXT_t RC;
 //#define ENABLE_MAC_PAYLOAD_DEBUG 1

+uint8_t mac_pdu[MAX_NR_DLSCH_PAYLOAD_BYTES];
+
 /*Scheduling of DLSCH with associated DCI in common search space
 * current version has only a DCI for type 1 PDCCH for C_RNTI*/
 void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
@@ -154,16 +156,13 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
  }
 }

-int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
-                         nfapi_tx_request_pdu_t *TX_req,
-                         nfapi_nr_config_request_t *cfg,
-                         nfapi_nr_coreset_t *coreset,
-                         nfapi_nr_search_space_t *search_space,
-                         int16_t pdu_index,
-                         nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config) {
+int configure_fapi_dl_pdu(nfapi_nr_dl_config_request_body_t *dl_req,
+                          nfapi_nr_config_request_t *cfg,
+                          nfapi_nr_coreset_t *coreset,
+                          nfapi_nr_search_space_t *search_space,
+                          nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config){
  nfapi_nr_dl_config_request_pdu_t  *dl_config_dci_pdu;
  nfapi_nr_dl_config_request_pdu_t  *dl_config_dlsch_pdu;
-  int TBS;
  uint16_t rnti = 0x1234;
  int dl_carrier_bandwidth = cfg->rf_config.dl_carrier_bandwidth.value;
  dl_config_dci_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
@@ -240,9 +239,20 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
        params_rel15->rb_offset,
        params_rel15->first_symbol,
        params_rel15->search_space_type);
+
  nr_get_tbs_dl(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
-  TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;
-  LOG_D(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d TBS: %d\n",
+
+  return dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size/8;
+}
+
+void configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
+                          nfapi_tx_request_pdu_t *tx_req,
+                          int tbs_bytes,
+                          int16_t pdu_index){
+  nfapi_nr_dl_config_request_pdu_t  *dl_config_dlsch_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu + 1];
+  nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_pdu_rel15 = &dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15;
+
+  LOG_D(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d TBS (bytes): %d\n",
        dlsch_pdu_rel15->start_prb,
        dlsch_pdu_rel15->n_prb,
        dlsch_pdu_rel15->start_symbol,
@@ -250,80 +260,62 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
        dlsch_pdu_rel15->nb_layers,
        dlsch_pdu_rel15->nb_codewords,
        dlsch_pdu_rel15->mcs_idx,
-        TBS);
+        tbs_bytes);
+
  dl_req->number_dci++;
  dl_req->number_pdsch_rnti++;
  dl_req->number_pdu+=2;
-  TX_req->pdu_length = dlsch_pdu_rel15->transport_block_size/8;
-  TX_req->pdu_index = pdu_index++;
-  TX_req->num_segments = 1;
-  return TBS/8; //Return TBS in bytes
+
+  tx_req->pdu_length = tbs_bytes;
+  tx_req->pdu_index = pdu_index++;
+  tx_req->num_segments = 1;
+  //tx_req->segments[0].segment_length = 8;
+  tx_req->segments[0].segment_length = tbs_bytes + 2;
+  tx_req->segments[0].segment_data = mac_pdu;
 }

-
-
-
-
-
-
 void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                                   frame_t       frameP,
                                   sub_frame_t   slotP,
                                   nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config) {
-  LOG_D(MAC, "In nr_schedule_uss_dlsch_phytest \n");
-  uint8_t  CC_id;
-  gNB_MAC_INST                        *nr_mac      = RC.nrmac[module_idP];
-  //NR_COMMON_channels_t                *cc           = nr_mac->common_channels;
-  nfapi_nr_dl_config_request_body_t   *dl_req;
-  nfapi_tx_request_pdu_t            *TX_req;
-  uint16_t rnti = 0x1234;
-  nfapi_nr_config_request_t *cfg = &nr_mac->config[0];
-  uint16_t sfn_sf = frameP << 7 | slotP;
-  // everything here is hard-coded to 30 kHz
-  //int scs = get_dlscs(cfg);
-  //int slots_per_frame = get_spf(cfg);
-  int TBS;
-  int TBS_bytes;
-  int lcid;
-  int ta_len = 0;
-  int header_length_total=0;
-  int header_length_last;
-  int sdu_length_total = 0;
-  mac_rlc_status_resp_t rlc_status;
-  uint16_t sdu_lengths[NB_RB_MAX];
-  int num_sdus = 0;
-  unsigned char dlsch_buffer[MAX_DLSCH_PAYLOAD_BYTES];
-  int offset;
-  int UE_id = 0;
-  unsigned char sdu_lcids[NB_RB_MAX];
-  int padding = 0, post_padding = 0;
-  UE_list_t *UE_list = &nr_mac->UE_list;
-  DLSCH_PDU DLSCH_pdu;
-  //DLSCH_PDU *DLSCH_pdu = (DLSCH_PDU*) malloc(sizeof(DLSCH_PDU));

-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    LOG_D(MAC, "Scheduling UE specific search space DCI type 1 for CC_id %d\n",CC_id);
-    dl_req = &nr_mac->DL_req[CC_id].dl_config_request_body;
-    TX_req = &nr_mac->TX_req[CC_id].tx_request_body.tx_pdu_list[nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus];
+  gNB_MAC_INST *gNB_mac = RC.nrmac[module_idP];
+  nfapi_nr_dl_config_request_body_t *dl_req;
+  nfapi_tx_request_pdu_t *tx_req;
+  mac_rlc_status_resp_t rlc_status;
+  nfapi_nr_config_request_t *cfg = &gNB_mac->config[0];
+
+  unsigned char sdu_lcids[NB_RB_MAX] = {0};
+  uint16_t sdu_lengths[NB_RB_MAX] = {0};
+
+  int post_padding = 0, ta_len = 0, header_length_total = 0, sdu_length_total = 0, num_sdus = 0;
+  int CC_id, lcid, offset, i, header_length_last, TBS_bytes;
+
+  int UE_id = 0; 
+  uint16_t rnti = 0x1234;
+  uint16_t sfn_sf = frameP << 7 | slotP;
+
+  uint8_t mac_sdus[MAX_NR_DLSCH_PAYLOAD_BYTES];
+
+  for (CC_id = 0; CC_id < RC.nb_nr_mac_CC[module_idP]; CC_id++) {
+
+    LOG_D(MAC, "Scheduling UE specific search space DCI type 1 for UE_id %d CC_id %d frame %d slot %d\n", UE_id, CC_id, frameP, slotP);
+
+    dl_req = &gNB_mac->DL_req[CC_id].dl_config_request_body;
+    tx_req = &gNB_mac->TX_req[CC_id].tx_request_body.tx_pdu_list[gNB_mac->TX_req[CC_id].tx_request_body.number_of_pdus];
+    ta_len = gNB_mac->ta_len;
+
+    TBS_bytes = configure_fapi_dl_pdu(dl_req, cfg, &gNB_mac->coreset[CC_id][1], &gNB_mac->search_space[CC_id][1], dlsch_config);

    //The --NOS1 use case currently schedules DLSCH transmissions only when there is IP traffic arriving
    //through the LTE stack
-    if (IS_SOFTMODEM_NOS1) {
-      memset(&DLSCH_pdu, 0, sizeof(DLSCH_pdu));
-      int ta_update = 31;
-      ta_len = 0;
-      // Hardcode it for now
-      TBS = 6784/8; //TBS in bytes
-      //nr_get_tbs_dl(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
-      //TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;
+    if (IS_SOFTMODEM_NOS1){

      for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
-        // TODO: check if the lcid is active
-        LOG_D(MAC, "[eNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (tbs %d, len %d)\n",
-              module_idP, frameP, lcid, TBS,
-              TBS - ta_len - header_length_total - sdu_length_total - 3);
+        LOG_D(MAC, "[gNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (TBS %d bytes, len %d)\n",
+          module_idP, frameP, lcid, TBS_bytes, TBS_bytes - ta_len - header_length_total - sdu_length_total - 3);

-        if (TBS - ta_len - header_length_total - sdu_length_total - 3 > 0) {
+        if (TBS_bytes - ta_len - header_length_total - sdu_length_total - 3 > 0) {
          rlc_status = mac_rlc_status_ind(module_idP,
                                          rnti,
                                          module_idP,
@@ -332,132 +324,121 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                                          ENB_FLAG_YES,
                                          MBMS_FLAG_NO,
                                          lcid,
-                                          TBS - ta_len - header_length_total - sdu_length_total - 3,
+                                          TBS_bytes - ta_len - header_length_total - sdu_length_total - 3,
                                          0,
                                          0);

          if (rlc_status.bytes_in_buffer > 0) {
-            LOG_D(MAC,
-                  "[eNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d), TBS: %d \n \n",
-                  module_idP, frameP,
-                  TBS - ta_len - header_length_total - sdu_length_total - 3,
-                  lcid,
-                  header_length_total,
-                  TBS);
+            LOG_D(MAC, "[gNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d), TBS_bytes: %d \n \n",
+              module_idP, frameP, TBS_bytes - ta_len - header_length_total - sdu_length_total - 3,
+              lcid, header_length_total, TBS_bytes);
+
            sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP,
-                                    rnti,
-                                    module_idP,
-                                    frameP,
-                                    ENB_FLAG_YES,
-                                    MBMS_FLAG_NO,
-                                    lcid,
-                                    TBS,
-                                    (char *)&dlsch_buffer[sdu_length_total],
-                                    0,
-                                    0);
-            LOG_D(MAC,
-                  "[eNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n",
-                  module_idP, sdu_lengths[num_sdus], lcid);
+                                                     rnti,
+                                                     module_idP,
+                                                     frameP,
+                                                     ENB_FLAG_YES,
+                                                     MBMS_FLAG_NO,
+                                                     lcid,
+                                                     TBS_bytes,
+                                                     (char *)&mac_sdus[sdu_length_total],
+                                                     0,
+                                                     0);
+
+            LOG_D(MAC, "[gNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n", module_idP, sdu_lengths[num_sdus], lcid);
+
            sdu_lcids[num_sdus] = lcid;
            sdu_length_total += sdu_lengths[num_sdus];
-            UE_list->eNB_UE_stats[CC_id][UE_id].num_pdu_tx[lcid]++;
-            UE_list->eNB_UE_stats[CC_id][UE_id].lcid_sdu[num_sdus] = lcid;
-            UE_list->eNB_UE_stats[CC_id][UE_id].sdu_length_tx[lcid] = sdu_lengths[num_sdus];
-            UE_list->eNB_UE_stats[CC_id][UE_id].num_bytes_tx[lcid] += sdu_lengths[num_sdus];
            header_length_last = 1 + 1 + (sdu_lengths[num_sdus] >= 128);
            header_length_total += header_length_last;
+
            num_sdus++;
-            UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
+
+            //ue_sched_ctl->uplane_inactivity_timer = 0;
          }
-        } else {
-          // no TBS left
-          break;
+        } else { // no TBS_bytes left
+        break;
        }
      }

-      // last header does not have length field
-      if (header_length_total) {
-        header_length_total -= header_length_last;
-        header_length_total++;
-      }
-
-      if (ta_len + sdu_length_total + header_length_total > 0) {
-        if (TBS - header_length_total - sdu_length_total - ta_len <= 2) {
-          padding = TBS - header_length_total - sdu_length_total - ta_len;
-          post_padding = 0;
-        } else {
-          padding = 0;
-          post_padding = 1;
-        }
-
-        offset = generate_dlsch_header((unsigned char *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0], //DLSCH_pdu.payload[0],
-                                       num_sdus,    //num_sdus
-                                       sdu_lengths,    //
-                                       sdu_lcids, 255,    // no drx
-                                       ta_update,    // timing advance
-                                       NULL,    // contention res id
-                                       padding, post_padding);
-        LOG_D(MAC, "Offset bits: %d \n", offset);
-        // Probably there should be other actions done before that
-        // cycle through SDUs and place in dlsch_buffer
-        //memcpy(&UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset], dlsch_buffer, sdu_length_total);
-        memcpy(&nr_mac->UE_list.DLSCH_pdu[CC_id][0][UE_id].payload[0][offset], dlsch_buffer, sdu_length_total);
-
-        // fill remainder of DLSCH with 0
-        for (int j = 0; j < (TBS - sdu_length_total - offset); j++) {
-          //UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset + sdu_length_total + j] = 0;
-          nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0][offset + sdu_length_total + j] = 0;
-        }
-
-        TBS_bytes = configure_fapi_dl_Tx(dl_req, TX_req, cfg, &nr_mac->coreset[CC_id][1], &nr_mac->search_space[CC_id][1], nr_mac->pdu_index[CC_id], dlsch_config);
-#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
-        LOG_I(MAC, "Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, , TBS size: %d \n \n", frameP, slotP, TBS_bytes);
-
-        for(int i = 0; i < 10; i++) { // TBS_bytes dlsch_pdu_rel15->transport_block_size/8 6784/8
-          LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
-        }
-
-#endif
-        //TX_req->segments[0].segment_length = 8;
-        TX_req->segments[0].segment_length = TBS_bytes +2;
-        TX_req->segments[0].segment_data = nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0];
-        nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;
-        nr_mac->TX_req[CC_id].sfn_sf = sfn_sf;
-        nr_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
-        nr_mac->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
-      } //if (ta_len + sdu_length_total + header_length_total > 0)
    } //if (IS_SOFTMODEM_NOS1)
-    //When the --NOS1 option is not enabled, DLSCH transmissions with random data
-    //occur every time that the current function is called (dlsch phytest mode)
    else {
-      TBS_bytes = configure_fapi_dl_Tx(dl_req, TX_req, cfg, &nr_mac->coreset[CC_id][1], &nr_mac->search_space[CC_id][1], nr_mac->pdu_index[CC_id], dlsch_config);
+      //When the --NOS1 option is not enabled, DLSCH transmissions with random data
+      //occur every time that the current function is called (dlsch phytest mode)

-      for(int i = 0; i < TBS_bytes; i++) { //
-        ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i] = (unsigned char) rand();
-        //LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
+      // fill dlsch_buffer with random data
+      for (i = 0; i < TBS_bytes; i++){
+        mac_sdus[i] = (unsigned char) rand(); //i&0xFF;
      }

-#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+      //Sending SDUs with size 1
+      //Initialize elements of sdu_lcids and sdu_lengths
+      sdu_lcids[0] = 0x05; // DRB
+      sdu_lengths[0] = TBS_bytes - ta_len - 3;
+      header_length_total += 2 + (sdu_lengths[0] >= 128);
+      sdu_length_total += sdu_lengths[0];
+      num_sdus +=1;
+    } // else IS_SOFTMODEM_NOS1

-      if (frameP%100 == 0) {
-        LOG_I(MAC, "Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, TBS size: %d \n", frameP, slotP, TBS_bytes);
+    // there is at least one SDU or TA command
+    // if (num_sdus > 0 ){
+    if (ta_len + sdu_length_total + header_length_total > 0) {

-        for(int i = 0; i < 10; i++) {
-          LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
+      // Check if there is data from RLC or CE
+      if (TBS_bytes >= 2 + header_length_total + sdu_length_total + ta_len) {
+        // we have to consider padding
+        // padding param currently not in use
+        //padding = TBS_bytes - header_length_total - sdu_length_total - ta_len - 1;
+        post_padding = 1;
+      } else {
+        //padding = 0;
+        post_padding = 0;
+      }
+
+      offset = nr_generate_dlsch_pdu(module_idP,
+                                     (unsigned char *) mac_sdus,
+                                     (unsigned char *) mac_pdu,
+                                     num_sdus, //num_sdus
+                                     sdu_lengths,
+                                     sdu_lcids,
+                                     255, // no drx
+                                     NULL, // contention res id
+                                     post_padding);
+
+      // Padding: fill remainder of DLSCH with 0
+      if (post_padding > 0){
+        for (int j = 0; j < (TBS_bytes - offset); j++)
+          mac_pdu[offset + j] = 0;
+      }
+
+      configure_fapi_dl_Tx(dl_req, tx_req, TBS_bytes, gNB_mac->pdu_index[CC_id]);
+
+      gNB_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;
+      gNB_mac->TX_req[CC_id].sfn_sf = sfn_sf;
+      gNB_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
+      gNB_mac->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
+
+      if(IS_SOFTMODEM_NOS1){
+        #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+          LOG_I(MAC, "Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, TBS size: %d \n \n", frameP, slotP, TBS_bytes);
+          for(int i = 0; i < 10; i++) { // TBS_bytes dlsch_pdu_rel15->transport_block_size/8 6784/8
+            LOG_I(MAC, "%x. ", mac_payload[i]);
+          }
+        #endif
+      } else {
+        #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+        if (frameP%100 == 0){
+          LOG_I(MAC, "Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, TBS size: %d \n", frameP, slotP, TBS_bytes);
+          for(int i = 0; i < 10; i++) {
+            LOG_I(MAC, "%x. ", mac_payload[i]);
+          }
        }
+        #endif
      }
-
-#endif
-      //TX_req->segments[0].segment_length = 8;
-      TX_req->segments[0].segment_length = TBS_bytes +2;
-      TX_req->segments[0].segment_data = nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0];
-      nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;
-      nr_mac->TX_req[CC_id].sfn_sf = sfn_sf;
-      nr_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
-      nr_mac->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
-
    }
-  } //for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++)
+    else {  // There is no data from RLC or MAC header, so don't schedule
+    }
+  } // CC_id loop
 }


@@ -34,7 +34,7 @@

 #include "LAYER2/MAC/mac.h"
 #include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"

 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "common/utils/LOG/log.h"
@@ -464,3 +464,21 @@ int get_symbolsperslot(nfapi_nr_config_request_t *cfg) {

 }

+int find_nrUE_id(module_id_t mod_idP, rnti_t rntiP) {
+  
+  int UE_id;
+  UE_list_t *UE_list = &RC.nrmac[mod_idP]->UE_list;
+
+  for (UE_id = 0; UE_id < MAX_MOBILES_PER_GNB; UE_id++) {
+    if (UE_list->active[UE_id] == TRUE) {
+      if (UE_list->UE_template[nrUE_PCCID(mod_idP, UE_id)][UE_id].rnti == rntiP) {
+        return UE_id;
+      }
+    }
+  }
+  return -1;
+}
+
+int nrUE_PCCID(module_id_t mod_idP, int ue_idP) {
+  return (RC.nrmac[mod_idP]->UE_list.pCC_id[ue_idP]);
+}
@@ -0,0 +1,74 @@
+/*
+ * 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 gNB_scheduler_ulsch.c
+ * \brief gNB procedures for the ULSCH transport channel
+ * \author Navid Nikaein and Raymond Knopp, Guido Casati
+ * \date 2019
+ * \email: guido.casati@iis.fraunhofer.de
+ * \version 1.0
+ * @ingroup _mac
+ */
+
+#include "LAYER2/NR_MAC_gNB/mac_proto.h"
+
+/*
+* When data are received on PHY and transmitted to MAC
+*/
+void nr_rx_sdu(const module_id_t gnb_mod_idP,
+               const int CC_idP,
+               const frame_t frameP,
+               const sub_frame_t subframeP,
+               const rnti_t rntiP,
+               uint8_t *sduP,
+               const uint16_t sdu_lenP,
+               const uint16_t timing_advance,
+               const uint8_t ul_cqi){
+  int current_rnti = 0, UE_id = -1, harq_pid = 0;
+  gNB_MAC_INST *gNB_mac = NULL;
+  UE_list_t *UE_list = NULL;
+  UE_sched_ctrl_t *UE_scheduling_control = NULL;
+
+  current_rnti = rntiP;
+  UE_id = find_nrUE_id(gnb_mod_idP, current_rnti);
+  gNB_mac = RC.nrmac[gnb_mod_idP];
+  UE_list = &gNB_mac->UE_list;
+
+  UE_id = 0;
+
+  if (UE_id != -1) {
+    UE_scheduling_control = &(UE_list->UE_sched_ctrl[UE_id]);
+
+    LOG_D(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d Received ULSCH sdu round %d from PHY (rnti %x, UE_id %d) ul_cqi %d\n",
+          gnb_mod_idP,
+          harq_pid,
+          CC_idP,
+          frameP,
+          subframeP,
+          UE_scheduling_control->round_UL[CC_idP][harq_pid],
+          current_rnti,
+          UE_id,
+          ul_cqi);
+
+    if (sduP != NULL)
+      UE_scheduling_control->ta_update = timing_advance;
+  }
+}
@@ -33,6 +33,7 @@

 #include "nr_mac_gNB.h"
 #include "PHY/defs_gNB.h"
+#include "NR_TAG-Id.h"

 void set_cset_offset(uint16_t);

@@ -70,20 +71,35 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
 			       frame_t frame_txP, sub_frame_t slot_txP,
 			       frame_t frame_rxP, sub_frame_t slot_rxP);

+int nr_generate_dlsch_pdu(module_id_t Mod_idP,
+                          unsigned char *sdus_payload,
+                          unsigned char *mac_pdu,
+                          unsigned char num_sdus,
+                          unsigned short *sdu_lengths,
+                          unsigned char *sdu_lcids,
+                          unsigned char drx_cmd,
+                          unsigned char *ue_cont_res_id,
+                          unsigned short post_padding);
+
+void nr_schedule_ue_spec(module_id_t module_idP, frame_t frameP, sub_frame_t slotP);
+
 void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP);

 void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
                                   frame_t       frameP,
                                   sub_frame_t   subframeP);

-int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
-		                  nfapi_tx_request_pdu_t *TX_req,
-						  nfapi_nr_config_request_t *cfg,
-						  nfapi_nr_coreset_t* coreset,
-						  nfapi_nr_search_space_t* search_space,
-						  int16_t pdu_index,
+int configure_fapi_dl_pdu(nfapi_nr_dl_config_request_body_t *dl_req,
+                          nfapi_nr_config_request_t *cfg,
+                          nfapi_nr_coreset_t* coreset,
+                          nfapi_nr_search_space_t* search_space,
                          nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config);

+void configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
+                          nfapi_tx_request_pdu_t *tx_req,
+                          int tbs_bytes,
+                          int16_t pdu_index);
+
 void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                                   frame_t       frameP,
                                   sub_frame_t   slotP,
@@ -135,6 +151,10 @@ uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint32_t bw);

 int32_t get_nr_uldl_offset(int nr_bandP);

+int find_nrUE_id(module_id_t mod_idP, rnti_t rntiP);
+
+int nrUE_PCCID(module_id_t mod_idP, int ue_idP);
+
 void config_nr_mib(int Mod_idP, 
                   int CC_idP,
                   int p_gNBP,
@@ -145,4 +165,22 @@ void config_nr_mib(int Mod_idP,
                   int cellBarred,
                   int intraFreqReselection);

+/* \brief Function to indicate a received SDU on ULSCH.
+@param Mod_id Instance ID of gNB
+@param CC_id Component carrier index
+@param rnti RNTI of UE transmitting the SDU
+@param sdu Pointer to received SDU
+@param sdu_len Length of SDU
+@param timing_advance timing advance adjustment after this pdu
+@param ul_cqi Uplink CQI estimate after this pdu (SNR quantized to 8 bits, -64 ... 63.5 dB in .5dB steps)
+*/
+void nr_rx_sdu(const module_id_t gnb_mod_idP,
+      const int CC_idP,
+      const frame_t frameP,
+      const sub_frame_t subframeP,
+      const rnti_t rntiP,
+      uint8_t * sduP,
+      const uint16_t sdu_lenP,
+      const uint16_t timing_advance, const uint8_t ul_cqi);
+
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/
@@ -31,7 +31,7 @@
 */

 #include "mac_proto.h"
-#include "LAYER2/MAC/mac_extern.h" //temporary
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "assertions.h"

 #include "LAYER2/PDCP_v10.1.0/pdcp.h"
@@ -106,6 +106,9 @@ void mac_top_init_gNB(void)

        RC.nrmac[i]->Mod_id = i;

+        RC.nrmac[i]->tag = (NR_TAG_t*)malloc(sizeof(NR_TAG_t));
+        memset((void*)RC.nrmac[i]->tag,0,sizeof(NR_TAG_t));
+

        for (j = 0; j < MAX_NUM_CCs; j++) {
          RC.nrmac[i]->DL_req[j].dl_config_request_body.dl_config_pdu_list = RC.nrmac[i]->dl_config_pdu_list[j];
@@ -55,12 +55,14 @@
 #include "common/ran_context.h"
 #include "LAYER2/MAC/mac.h"
 #include "LAYER2/MAC/mac_proto.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/TOOLS/time_meas.h"
 #include "targets/ARCH/COMMON/common_lib.h"


+#include "NR_TAG.h"
+
 /*! \brief gNB common channels */
 typedef struct {
    int physCellId;
@@ -107,10 +109,16 @@ typedef struct gNB_MAC_INST_s {
  /// frame counter
  frame_t                         frame;
  /// slot counter
-  int                             slot;  
+  int                             slot;
+  /// timing advance group
+  NR_TAG_t                        *tag;
  /// Pointer to IF module instance for PHY
  NR_IF_Module_t                  *if_inst;
-    /// Common cell resources
+  /// TA command
+  int                             ta_command;
+  /// MAC CE flag indicating TA length
+  int                             ta_len;
+  /// Common cell resources
  NR_COMMON_channels_t common_channels[NFAPI_CC_MAX];
  /// current PDU index (BCH,DLSCH)
  uint16_t pdu_index[NFAPI_CC_MAX];
@@ -136,6 +144,7 @@ typedef struct gNB_MAC_INST_s {
  /// NFAPI search space structure
  nfapi_nr_search_space_t           search_space[NFAPI_CC_MAX][NFAPI_NR_MAX_NB_SEARCH_SPACES];

+  /// this is an LTE structure and needs to be urgenly updated
  UE_list_t UE_list;

  /// UL handle
@@ -34,7 +34,7 @@
 #include "openair1/PHY/phy_extern.h"
 #include "openair1/SCHED_NR/fapi_nr_l1.h"
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/MAC/mac_proto.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "common/ran_context.h"
@@ -169,6 +169,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info) {
      UL_info->rx_ind.rx_indication_body.number_of_pdus = 0;
    }
  } else {
+    // printf("UL_info->rx_ind.rx_indication_body.number_of_pdus %d UL_info->crc_ind.crc_indication_body.number_of_crcs %d\n", UL_info->rx_ind.rx_indication_body.number_of_pdus, UL_info->crc_ind.crc_indication_body.number_of_crcs);
    if (UL_info->rx_ind.rx_indication_body.number_of_pdus>0 && UL_info->crc_ind.crc_indication_body.number_of_crcs>0) {
      for (int i=0; i<UL_info->rx_ind.rx_indication_body.number_of_pdus; i++) {
        for (int j=0; j<UL_info->crc_ind.crc_indication_body.number_of_crcs; j++) {
@@ -182,28 +183,29 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info) {

            if (UL_info->crc_ind.crc_indication_body.crc_pdu_list[j].crc_indication_rel8.crc_flag == 1) { // CRC error indication
              LOG_D(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC error) \n",UL_info->frame,UL_info->slot);
-              rx_sdu(UL_info->module_id,
-                     UL_info->CC_id,
-                     NFAPI_SFNSF2SFN(UL_info->rx_ind.sfn_sf), //UL_info->frame,
-                     NFAPI_SFNSF2SF(UL_info->rx_ind.sfn_sf), //UL_info->slot,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_ue_information.rnti,
-                     (uint8_t *)NULL,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.length,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.ul_cqi);
-            } else {
-              LOG_D(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC ok) \n",UL_info->frame,UL_info->slot);
-              rx_sdu(UL_info->module_id,
-                     UL_info->CC_id,
-                     NFAPI_SFNSF2SFN(UL_info->rx_ind.sfn_sf), //UL_info->frame,
-                     NFAPI_SFNSF2SF(UL_info->rx_ind.sfn_sf), //UL_info->slot,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_ue_information.rnti,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].data,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.length,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance,
-                     UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.ul_cqi);
+              nr_rx_sdu(UL_info->module_id,
+                  UL_info->CC_id,
+                  NFAPI_SFNSF2SFN(UL_info->rx_ind.sfn_sf), //UL_info->frame,
+                  NFAPI_SFNSF2SF(UL_info->rx_ind.sfn_sf), //UL_info->slot,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_ue_information.rnti,
+                  (uint8_t *)NULL,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.length,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.ul_cqi);
            }
-
+            else {
+              LOG_D(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC ok) \n",UL_info->frame,UL_info->slot);
+              nr_rx_sdu(UL_info->module_id,
+                  UL_info->CC_id,
+                  NFAPI_SFNSF2SFN(UL_info->rx_ind.sfn_sf), //UL_info->frame,
+                  NFAPI_SFNSF2SF(UL_info->rx_ind.sfn_sf), //UL_info->slot,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_ue_information.rnti,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].data,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.length,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance,
+                  UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.ul_cqi);
+            }
+            //printf("rx_indication_rel8.timing_advance %d\n", UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance);
            break;
          } //if (UL_info->crc_ind.crc_pdu_list[j].rx_ue_information.rnti ==

@@ -30,6 +30,7 @@
 * \warning
 */

+#include "PHY/defs_nr_UE.h"
 #include "NR_IF_Module.h"
 #include "mac_proto.h"
 #include "assertions.h"
@@ -71,22 +72,24 @@ int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, fapi_nr

 }
 //  L2 Abstraction Layer
-int8_t handle_dlsch (module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, uint8_t *pduP, uint32_t pdu_len, frame_t frame, int slot){
+int8_t handle_dlsch (module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, uint8_t *pduP, uint32_t pdu_len, frame_t frame, int slot, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment){
+
+  //if (IS_SOFTMODEM_NOS1 || IS_SOFTMODEM_RFSIM)
+  // sdu should be processed even when is S1 mode because data and timing advance updates are transmitted by the UE
+    nr_ue_send_sdu(module_id, cc_id, frame, slot,
+                   pduP,
+                   pdu_len,
+                   gNB_index,
+                   ul_time_alignment);

-	LOG_I(MAC, "handle_dlsch at MAC layer \n");
-	if (IS_SOFTMODEM_NOS1)
-		nr_ue_send_sdu(module_id, 0, frame, slot,
-										pduP,
-										pdu_len,
-										0);
  return 0;
  /*
-  return nr_ue_process_dlsch( module_id,
-			      cc_id,
-			      gNB_index,
-			      dci_ind,
-			      pduP,
-			      pdu_len);
+  return nr_ue_process_dlsch(module_id,
+                             cc_id,
+                             gNB_index,
+                             dci_ind,
+                             pduP,
+                             pdu_len);
  */
 }

@@ -130,7 +133,7 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
  return 0;
 }

-int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
+int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment){
    
  int32_t i;
  uint32_t ret_mask = 0x0;
@@ -246,7 +249,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
 	//                    ret_mask |= (0) << FAPI_NR_RX_PDU_TYPE_DLSCH;
 	ret_mask |= (handle_dlsch(dl_info->module_id, dl_info->cc_id, dl_info->gNB_index, dl_info->dci_ind,
 				  (dl_info->rx_ind->rx_indication_body+i)->pdsch_pdu.pdu,
-				  (dl_info->rx_ind->rx_indication_body+i)->pdsch_pdu.pdu_length, dl_info->frame, dl_info->slot)) << FAPI_NR_RX_PDU_TYPE_DLSCH;
+				  (dl_info->rx_ind->rx_indication_body+i)->pdsch_pdu.pdu_length, dl_info->frame, dl_info->slot,ul_time_alignment)) << FAPI_NR_RX_PDU_TYPE_DLSCH;

    	  LOG_I(MAC,"[L2][IF MODULE][DL INDICATION][RX_IND], DLSCH case Number of PDUs: %d \n", dl_info->rx_ind->number_pdus);

@@ -37,7 +37,7 @@
 #include <openair1/PHY/thread_NR_UE.h>
 #include "fapi_nr_ue_interface.h"

-
+typedef struct NR_UL_TIME_ALIGNMENT NR_UL_TIME_ALIGNMENT_t;

 typedef struct {
    /// module id
@@ -163,7 +163,7 @@ typedef int8_t (nr_ue_phy_config_request_f)(nr_phy_config_t *phy_config);
 *  -1: Failed to consume bytes. Abort the mission.
 * Non-negative return values indicate success, and ignored.
 */
-typedef int (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info);
+typedef int (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);

 /*
 * Generic type of an application-defined callback to return various
@@ -202,7 +202,7 @@ int nr_ue_if_module_kill(uint32_t module_id);

 /**\brief interface between L1/L2, indicating the downlink related information, like dci_ind and rx_req
   \param dl_info including dci_ind and rx_request messages*/
-int nr_ue_dl_indication(nr_downlink_indication_t *dl_info);
+int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);

 int nr_ue_ul_indication(nr_uplink_indication_t *ul_info);

@@ -1686,6 +1686,9 @@ int rrc_eNB_process_S1AP_E_RAB_RELEASE_COMMAND(MessageDef *msg_p, const char *ms
  memcpy(&e_rab_release_params[0], &(S1AP_E_RAB_RELEASE_COMMAND (msg_p).e_rab_release_params[0]), sizeof(e_rab_release_t)*S1AP_MAX_E_RAB);
  eNB_ue_s1ap_id = S1AP_E_RAB_RELEASE_COMMAND (msg_p).eNB_ue_s1ap_id;
  nb_e_rabs_torelease = S1AP_E_RAB_RELEASE_COMMAND (msg_p).nb_e_rabs_torelease;
+  if (nb_e_rabs_torelease > S1AP_MAX_E_RAB) {
+    return -1;
+  }
  ue_context_p   = rrc_eNB_get_ue_context_from_s1ap_ids(instance, UE_INITIAL_ID_INVALID, eNB_ue_s1ap_id);

  if(ue_context_p != NULL) {
@@ -29,7 +29,7 @@
 */

 #include "nr_rrc_extern.h"
-#include "LAYER2/MAC/mac_extern.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "COMMON/openair_defs.h"
 #include "COMMON/platform_types.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
@@ -40,6 +40,7 @@
 #include "platform_types.h"

 #include "LAYER2/NR_MAC_UE/mac.h"
+#include "LAYER2/NR_MAC_COMMON/nr_mac.h"
 #include "rrc_list.h"
 #include "NR_asn_constant.h"
 #include "NR_MeasConfig.h"