Merge remote-tracking branch 'origin/nr_pucch_format0_receiver' into integration-nr-2019-w21

ci-scripts/oai-ci-vm-tool

@@ -252,7 +252,7 @@ case $key in
     VM_NAME=ci-phy-sim
     ARCHIVES_LOC=phy_sim
     LOG_PATTERN=.Rel15.txt
-    NB_PATTERN_FILES=10
+    NB_PATTERN_FILES=11
     BUILD_OPTIONS="--phy_simulators"
     VM_MEMORY=8192
     RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
@@ -331,7 +331,7 @@ case $key in
         VM_NAME=ci-phy-sim
         ARCHIVES_LOC=phy_sim
         LOG_PATTERN=.Rel15.txt
-        NB_PATTERN_FILES=10
+        NB_PATTERN_FILES=11
         BUILD_OPTIONS="--phy_simulators"
 	VM_MEMORY=8192
         RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"

cmake_targets/CMakeLists.txt

@@ -1299,6 +1299,7 @@ set(PHY_SRC_UE
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_LDPCSRC}
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c # added by prasanth
   )
 
   set(PHY_NR_UE_SRC
@@ -2551,6 +2552,14 @@ add_executable(nr_pbchsim
   ${T_SOURCE})
 target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 
+#PUCCH ---> Prashanth
+add_executable(nr_pucchsim  
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c 
+  ${OPENAIR_DIR}/common/utils/backtrace.c
+  ${T_SOURCE})
+target_link_libraries(nr_pucchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+#PUCCH ---> Prashanth
+
 add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c 
   ${OPENAIR_DIR}/common/utils/backtrace.c

cmake_targets/build_oai

@@ -684,7 +684,7 @@ function main() {
     echo_info "Compiling unitary tests simulators"
     # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
     #simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
-    simlist="dlsim ulsim polartest ldpctest smallblocktest nr_pbchsim nr_dlschsim nr_dlsim nr_ulschsim"
+    simlist="nr_pucchsim dlsim ulsim polartest ldpctest smallblocktest nr_pbchsim nr_dlschsim nr_dlsim nr_ulschsim"
     for f in $simlist ; do
       compilations \
       phy_simulators $f \

openair1/PHY/NR_TRANSPORT/pucch_rx.c

+#include<stdio.h>
+#include <string.h>
+#include <math.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include "PHY/impl_defs_nr.h"
+#include "PHY/defs_nr_common.h"
+#include "PHY/defs_nr_UE.h"
+#include "PHY/NR_UE_TRANSPORT/pucch_nr.h"
+#include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
+
+#include "common/utils/LOG/log.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
+
+#include "T.h"
+
+
+void nr_decode_pucch0( int32_t **rxdataF,
+			pucch_GroupHopping_t pucch_GroupHopping,
+			uint32_t n_id,       // hoppingID higher layer parameter                                        
+                        uint8_t *payload,
+                        NR_DL_FRAME_PARMS *frame_parms,
+                        int16_t amp,
+                        int nr_tti_tx,
+                        uint8_t m0,                                          // should come from resource set
+                        uint8_t nrofSymbols,				    // should come from resource set	
+                        uint8_t startingSymbolIndex,			    // should come from resource set
+                        uint16_t startingPRB,				   // should come from resource set
+			uint8_t nr_bit) {                                 // is number of UCI bits to be decoded
+  int nr_sequences;
+  const uint8_t *mcs;
+  if(nr_bit==1){
+    mcs=table1_mcs;
+    nr_sequences=4;
+  }
+  else{
+    mcs=table2_mcs;
+    nr_sequences=8;
+  }
+  /*
+   * Implement TS 38.211 Subclause 6.3.2.3.1 Sequence generation
+   *
+   */
+  /*
+   * Defining cyclic shift hopping TS 38.211 Subclause 6.3.2.2.2
+   */
+  // alpha is cyclic shift
+  double alpha;
+  // lnormal is the OFDM symbol number in the PUCCH transmission where l=0 corresponds to the first OFDM symbol of the PUCCH transmission
+  //uint8_t lnormal;
+  // lprime is the index of the OFDM symbol in the slot that corresponds to the first OFDM symbol of the PUCCH transmission in the slot given by [5, TS 38.213]
+  //uint8_t lprime;
+  // mcs is provided by TC 38.213 subclauses 9.2.3, 9.2.4, 9.2.5 FIXME!
+  //uint8_t mcs;
+
+  /*
+   * in TS 38.213 Subclause 9.2.1 it is said that:
+   * for PUCCH format 0 or PUCCH format 1, the index of the cyclic shift
+   * is indicated by higher layer parameter PUCCH-F0-F1-initial-cyclic-shift
+   */
+
+  /*
+   * Implementing TS 38.211 Subclause 6.3.2.3.1, the sequence x(n) shall be generated according to:
+   * x(l*12+n) = r_u_v_alpha_delta(n)
+   */
+  // the value of u,v (delta always 0 for PUCCH) has to be calculated according to TS 38.211 Subclause 6.3.2.2.1
+  uint8_t u=0,v=0;//,delta=0;
+  // if frequency hopping is disabled by the higher-layer parameter PUCCH-frequency-hopping
+  //              n_hop = 0
+  // if frequency hopping is enabled by the higher-layer parameter PUCCH-frequency-hopping
+  //              n_hop = 0 for first hop
+  //              n_hop = 1 for second hop
+  uint8_t n_hop = 0;
+  //uint8_t PUCCH_Frequency_Hopping; // from higher layers FIXME!!
+
+  // x_n contains the sequence r_u_v_alpha_delta(n)
+  int16_t x_n_re[nr_sequences][24],x_n_im[nr_sequences][24];
+  int n,i,l;
+  for(i=0;i<nr_sequences;i++){ 
+  // we proceed to calculate alpha according to TS 38.211 Subclause 6.3.2.2.2
+    for (l=0; l<nrofSymbols; l++){
+    // if frequency hopping is enabled n_hop = 1 for second hop. Not sure frequency hopping concerns format 0. FIXME!!!
+    // if ((PUCCH_Frequency_Hopping == 1)&&(l == (nrofSymbols-1))) n_hop = 1;
+      nr_group_sequence_hopping(pucch_GroupHopping,n_id,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
+      alpha = nr_cyclic_shift_hopping(n_id,m0,mcs[i],l,startingSymbolIndex,nr_tti_tx);
+      #ifdef DEBUG_NR_PUCCH_TX
+        printf("\t [nr_generate_pucch0] sequence generation \tu=%d \tv=%d \talpha=%lf \t(for symbol l=%d)\n",u,v,alpha,l);
+      #endif
+      for (n=0; n<12; n++){
+        x_n_re[i][(12*l)+n] = (int16_t)((int32_t)(amp)*(int16_t)(((((int32_t)(round(32767*cos(alpha*n))) * table_5_2_2_2_2_Re[u][n])>>15)
+                                  - (((int32_t)(round(32767*sin(alpha*n))) * table_5_2_2_2_2_Im[u][n])>>15)))>>15); // Re part of base sequence shifted by alpha
+        x_n_im[i][(12*l)+n] =(int16_t)((int32_t)(amp)* (int16_t)(((((int32_t)(round(32767*cos(alpha*n))) * table_5_2_2_2_2_Im[u][n])>>15)
+                                  + (((int32_t)(round(32767*sin(alpha*n))) * table_5_2_2_2_2_Re[u][n])>>15)))>>15); // Im part of base sequence shifted by alpha
+        #ifdef DEBUG_NR_PUCCH_TX
+          printf("\t [nr_generate_pucch0] sequence generation \tu=%d \tv=%d \talpha=%lf \tx_n(l=%d,n=%d)=(%d,%d)\n",
+                u,v,alpha,l,n,x_n_re[(12*l)+n],x_n_im[(12*l)+n]);
+        #endif
+      }
+    }
+  }
+  int16_t r_re[24],r_im[24];
+  /*
+   * Implementing TS 38.211 Subclause 6.3.2.3.2 Mapping to physical resources FIXME!
+   */
+  uint32_t re_offset=0;
+  for (l=0; l<nrofSymbols; l++) {
+    if ((startingPRB <  (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 0)) { // if number RBs in bandwidth is even and current PRB is lower band
+      re_offset = ((l+startingSymbolIndex)*frame_parms->ofdm_symbol_size) + (12*startingPRB) + frame_parms->first_carrier_offset;
+    }
+    if ((startingPRB >= (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 0)) { // if number RBs in bandwidth is even and current PRB is upper band
+      re_offset = ((l+startingSymbolIndex)*frame_parms->ofdm_symbol_size) + (12*(startingPRB-(frame_parms->N_RB_DL>>1)));
+    }
+    if ((startingPRB <  (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 1)) { // if number RBs in bandwidth is odd  and current PRB is lower band
+      re_offset = ((l+startingSymbolIndex)*frame_parms->ofdm_symbol_size) + (12*startingPRB) + frame_parms->first_carrier_offset;
+    }
+    if ((startingPRB >  (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 1)) { // if number RBs in bandwidth is odd  and current PRB is upper band
+      re_offset = ((l+startingSymbolIndex)*frame_parms->ofdm_symbol_size) + (12*(startingPRB-(frame_parms->N_RB_DL>>1))) + 6;
+    }
+    if ((startingPRB == (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 1)) { // if number RBs in bandwidth is odd  and current PRB contains DC
+      re_offset = ((l+startingSymbolIndex)*frame_parms->ofdm_symbol_size) + (12*startingPRB) + frame_parms->first_carrier_offset;
+    }
+    for (n=0; n<12; n++){
+      if ((n==6) && (startingPRB == (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 1)) {
+        // if number RBs in bandwidth is odd  and current PRB contains DC, we need to recalculate the offset when n=6 (for second half PRB)
+        re_offset = ((l+startingSymbolIndex)*frame_parms->ofdm_symbol_size);
+      }
+      r_re[(12*l)+n]=((int16_t *)&rxdataF[0][re_offset])[0];
+      r_im[(12*l)+n]=((int16_t *)&rxdataF[0][re_offset])[1];
+      #ifdef DEBUG_NR_PUCCH_TX
+        printf("\t [nr_generate_pucch0] mapping to RE \t amp=%d \tofdm_symbol_size=%d \tN_RB_DL=%d \tfirst_carrier_offset=%d \ttxptr(%d)=(x_n(l=%d,n=%d)=(%d,%d))\n",
+                amp,frame_parms->ofdm_symbol_size,frame_parms->N_RB_DL,frame_parms->first_carrier_offset,re_offset,
+                l,n,((int16_t *)&rxdataF[0][re_offset])[0],((int16_t *)&rxdataF[0][re_offset])[1]);
+      #endif
+      re_offset++;
+    }
+  }   
+  double corr[nr_sequences],corr_re[nr_sequences],corr_im[nr_sequences];
+  memset(corr,0,nr_sequences*sizeof(double));
+  memset(corr_re,0,nr_sequences*sizeof(double));
+  memset(corr_im,0,nr_sequences*sizeof(double));
+  for(i=0;i<nr_sequences;i++){
+    for(l=0;l<nrofSymbols;l++){
+      for(n=0;n<12;n++){
+        corr_re[i]+= (double)(r_re[12*l+n])/32767*(double)(x_n_re[i][12*l+n])/32767+(double)(r_im[12*l+n])/32767*(double)(x_n_im[i][12*l+n])/32767;
+	corr_im[i]+= (double)(r_re[12*l+n])/32767*(double)(x_n_im[i][12*l+n])/32767-(double)(r_im[12*l+n])/32767*(double)(x_n_re[i][12*l+n])/32767;
+      }
+    }
+    corr[i]=corr_re[i]*corr_re[i]+corr_im[i]*corr_im[i];
+  }
+  float max_corr=corr[0];
+  int index=0;
+  for(i=1;i<nr_sequences;i++){
+    if(corr[i]>max_corr){
+      index= i;
+      max_corr=corr[i];
+    }
+  }
+  *payload=(uint8_t)index;  // payload bits 00..b3b2b0, b0 is the SR bit and b3b2 are HARQ bits
+}
+

openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c

@@ -48,10 +48,8 @@
 #endif
 //#define ONE_OVER_SQRT2 23170 // 32767/sqrt(2) = 23170 (ONE_OVER_SQRT2)
 
-void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_nr.puch_GroupHopping,
-  //uint8_t PUCCH_GroupHopping,
-  PHY_VARS_NR_UE *ue,
-  //uint32_t n_id,
+void nr_group_sequence_hopping (pucch_GroupHopping_t PUCCH_GroupHopping,
+  				uint32_t n_id,
   				uint8_t n_hop,
   				int nr_tti_tx,
   				uint8_t *u,
@@ -69,12 +67,12 @@ void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_n
    *                n_hop=1 for the second hop
    */
   // depending on the value of the PUCCH_GroupHopping, we will obtain different values for u,v
-  pucch_GroupHopping_t PUCCH_GroupHopping = ue->pucch_config_common_nr->pucch_GroupHopping; // from higher layers FIXME!!!
+  //pucch_GroupHopping_t PUCCH_GroupHopping = ue->pucch_config_common_nr->pucch_GroupHopping; // from higher layers FIXME!!!
   // n_id defined as per TS 38.211 subclause 6.3.2.2.1 (is given by the higher-layer parameter hoppingId)
   // it is hoppingId from PUCCH-ConfigCommon:
   // Cell-Specific scrambling ID for group hoppping and sequence hopping if enabled
   // Corresponds to L1 parameter 'HoppingID' (see 38.211, section 6.3.2.2) BIT STRING (SIZE (10))
-  uint16_t n_id = ue->pucch_config_common_nr->hoppingId; // from higher layers FIXME!!!
+  //uint16_t n_id = ue->pucch_config_common_nr->hoppingId; // from higher layers FIXME!!!
 #ifdef DEBUG_NR_PUCCH_TX
   // initialization to be removed
   PUCCH_GroupHopping=neither;
@@ -84,8 +82,8 @@ void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_n
   uint8_t f_ss=0,f_gh=0;
   *u=0;
   *v=0;
-  uint32_t c_init = (1<<5)*floor(n_id/30)+(n_id%30); // we initialize c_init to calculate u,v
-  uint32_t x1,s = lte_gold_generic(&x1, &c_init, 1); // TS 38.211 Subclause 5.2.1
+  uint32_t c_init = 0; 
+  uint32_t x1,s; // TS 38.211 Subclause 5.2.1
   int l = 32, minShift = ((2*nr_tti_tx+n_hop)<<3);
   int tmpShift =0;
 #ifdef DEBUG_NR_PUCCH_TX
@@ -97,6 +95,8 @@ void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_n
   }
 
   if (PUCCH_GroupHopping == enable) { // PUCCH_GroupHopping 'enabled'
+    c_init = floor(n_id/30); // we initialize c_init to calculate u,v according to 6.3.2.2.1 of 38.211
+    s = lte_gold_generic(&x1, &c_init, 1); // TS 38.211 Subclause 5.2.1
     for (int m=0; m<8; m++) {
       while(minShift >= l) {
         s = lte_gold_generic(&x1, &c_init, 0);
@@ -118,6 +118,8 @@ void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_n
   }
 
   if (PUCCH_GroupHopping == disable) { // PUCCH_GroupHopping 'disabled'
+    c_init = (1<<5)*floor(n_id/30)+(n_id%30); // we initialize c_init to calculate u,v
+    s = lte_gold_generic(&x1, &c_init, 1); // TS 38.211 Subclause 5.2.1
     f_ss = n_id%30;
     l = 32, minShift = (2*nr_tti_tx+n_hop);
 
@@ -137,7 +139,7 @@ void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_n
 #endif
 }
 
-double nr_cyclic_shift_hopping(PHY_VARS_NR_UE *ue,
+double nr_cyclic_shift_hopping(uint32_t n_id,
                                uint8_t m0,
                                uint8_t mcs,
                                uint8_t lnormal,
@@ -153,7 +155,7 @@ double nr_cyclic_shift_hopping(PHY_VARS_NR_UE *ue,
    */
   // alpha_init initialized to 2*PI/12=0.5235987756
   double alpha = 0.5235987756;
-  uint32_t c_init = ue->pucch_config_common_nr->hoppingId; // we initialize c_init again to calculate n_cs
+  uint32_t c_init = n_id; // we initialize c_init again to calculate n_cs
 #ifdef DEBUG_NR_PUCCH_TX
   // initialization to be remo.ved
   c_init=10;
@@ -246,8 +248,8 @@ void nr_generate_pucch0(PHY_VARS_NR_UE *ue,
   for (int l=0; l<nrofSymbols; l++) {
     // if frequency hopping is enabled n_hop = 1 for second hop. Not sure frequency hopping concerns format 0. FIXME!!!
     // if ((PUCCH_Frequency_Hopping == 1)&&(l == (nrofSymbols-1))) n_hop = 1;
-    nr_group_sequence_hopping(ue,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
-    alpha = nr_cyclic_shift_hopping(ue,m0,mcs,l,startingSymbolIndex,nr_tti_tx);
+    nr_group_sequence_hopping(ue->pucch_config_common_nr->pucch_GroupHopping,ue->pucch_config_common_nr->hoppingId,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
+    alpha = nr_cyclic_shift_hopping(ue->pucch_config_common_nr->hoppingId,m0,mcs,l,startingSymbolIndex,nr_tti_tx);
 #ifdef DEBUG_NR_PUCCH_TX
     printf("\t [nr_generate_pucch0] sequence generation \tu=%d \tv=%d \talpha=%lf \t(for symbol l=%d)\n",u,v,alpha,l);
 #endif
@@ -435,8 +437,8 @@ void nr_generate_pucch1(PHY_VARS_NR_UE *ue,
     printf("\t [nr_generate_pucch1] entering function nr_group_sequence_hopping with n_hop=%d, nr_tti_tx=%d\n",
            n_hop,nr_tti_tx);
 #endif
-    nr_group_sequence_hopping(ue,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
-    alpha = nr_cyclic_shift_hopping(ue,m0,mcs,l,lprime,nr_tti_tx);
+    nr_group_sequence_hopping(ue->pucch_config_common_nr->pucch_GroupHopping,ue->pucch_config_common_nr->hoppingId,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
+    alpha = nr_cyclic_shift_hopping(ue->pucch_config_common_nr->hoppingId,m0,mcs,l,lprime,nr_tti_tx);
 
     for (int n=0; n<12; n++) {
       r_u_v_alpha_delta_re[n] = (int16_t)(((((int32_t)(round(32767*cos(alpha*n))) * table_5_2_2_2_2_Re[u][n])>>15)
@@ -753,8 +755,8 @@ void nr_generate_pucch1_old(PHY_VARS_NR_UE *ue,
   printf("\t [nr_generate_pucch1] entering function nr_group_sequence_hopping with n_hop=%d, nr_tti_tx=%d\n",
          n_hop,nr_tti_tx);
 #endif
-  nr_group_sequence_hopping(ue,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
-  alpha = nr_cyclic_shift_hopping(ue,m0,mcs,lnormal,lprime,nr_tti_tx);
+  nr_group_sequence_hopping(ue->pucch_config_common_nr->pucch_GroupHopping,ue->pucch_config_common_nr->hoppingId,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
+  alpha = nr_cyclic_shift_hopping(ue->pucch_config_common_nr->hoppingId,m0,mcs,lnormal,lprime,nr_tti_tx);
 
   for (int n=0; n<12; n++) {
     r_u_v_alpha_delta_re[n] = (int16_t)(((((int32_t)(round(32767*cos(alpha*n))) * table_5_2_2_2_2_Re[u][n])>>15)
@@ -1571,7 +1573,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
   for (int l=0; l<nrofSymbols; l++) {
     if ((intraSlotFrequencyHopping == 1) && (l >= (int)floor(nrofSymbols/2))) n_hop = 1; // n_hop = 1 for second hop
 
-    nr_group_sequence_hopping(ue,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
+    nr_group_sequence_hopping(ue->pucch_config_common_nr->pucch_GroupHopping,ue->pucch_config_common_nr->hoppingId,n_hop,nr_tti_tx,&u,&v); // calculating u and v value
 
     // Next we proceed to calculate base sequence for DM-RS signal, according to TS 38.211 subclause 6.4.1.33
     if (nrofPRB >= 3) { // TS 38.211 subclause 5.2.2.1 (Base sequences of length 36 or larger) applies
@@ -1617,7 +1619,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
     }
 
     uint16_t j=0;
-    alpha = nr_cyclic_shift_hopping(ue,m0,mcs,l,startingSymbolIndex,nr_tti_tx);
+    alpha = nr_cyclic_shift_hopping(ue->pucch_config_common_nr->hoppingId,m0,mcs,l,startingSymbolIndex,nr_tti_tx);
 
     for (int rb=0; rb<nrofPRB; rb++) {
       if ((intraSlotFrequencyHopping == 1) && (l<floor(nrofSymbols/2))) { // intra-slot hopping enabled, we need to calculate new offset PRB

openair1/PHY/NR_UE_TRANSPORT/pucch_nr.h

@@ -42,15 +42,26 @@
 #include "T.h"
 #define ONE_OVER_SQRT2 23170 // 32767/sqrt(2) = 23170 (ONE_OVER_SQRT2)
 
-void nr_group_sequence_hopping (//pucch_GroupHopping_t ue->pucch_config_common_nr.puch_GroupHopping,
-                                //uint8_t PUCCH_GroupHopping,
-                                PHY_VARS_NR_UE *ue,
-                                //uint32_t n_id,
+void nr_decode_pucch0( int32_t **rxdataF,
+			pucch_GroupHopping_t PUCCH_GroupHopping,
+                        uint32_t n_id,                                       //PHY_VARS_gNB *gNB, generally rxdataf is in gNB->common_vars
+                        uint8_t *payload,
+                        NR_DL_FRAME_PARMS *frame_parms,
+                        int16_t amp,
+                        int nr_tti_tx,
+                        uint8_t m0,                                          // should come from resource set
+                        uint8_t nrofSymbols,				    // should come from resource set	
+                        uint8_t startingSymbolIndex,			    // should come from resource set
+                        uint16_t startingPRB,				   // should come from resource set
+			uint8_t nr_bit);
+
+void nr_group_sequence_hopping (pucch_GroupHopping_t PUCCH_GroupHopping,
+                                uint32_t n_id,
                                 uint8_t n_hop,
                                 int nr_tti_tx,
                                 uint8_t *u,
                                 uint8_t *v);
-double nr_cyclic_shift_hopping(PHY_VARS_NR_UE *ue,
+double nr_cyclic_shift_hopping(uint32_t n_id,
                                uint8_t m0,
                                uint8_t mcs,
                                uint8_t lnormal,
@@ -111,6 +122,11 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
                           uint8_t nr_bit,
                           uint8_t occ_length_format4,
                           uint8_t occ_index_format4);
+
+// tables for mcs values for different payloads 
+ static const uint8_t table1_mcs[]={0,3,6,9};
+ static const uint8_t table2_mcs[]={0,1,3,4,6,7,9,10};
+
   /*
    * The following tables implement TS 38.211 Subclause 5.2.2.2 Base sequences of length less than 36 (rows->u {0,1,..,29} / columns->n {0,1,...,M_ZC-1)
    * Where base sequence r_u_v(n)=exp[j*phi(n)*pi/4] 0<=n<=M_ZC-1 and M_ZC={6,12,18,24}