Merge remote-tracking branch 'origin/NR_PUCCH_format1' into integration_develop-nr_2019w28

cmake_targets/CMakeLists.txt

@@ -1302,7 +1302,7 @@ set(PHY_SRC_UE
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_LDPCSRC}
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c # added by prasanth
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c 
   )
 
   set(PHY_NR_UE_SRC

cmake_targets/autotests/test_case_list.xml

@@ -1160,6 +1160,29 @@
       <nruns>3</nruns>
     </testCase>
 
+    <testCase id="015109">
+      <class>execution</class>
+      <desc>nr_nr_pucchsim Test cases. (Test1: Format 0 ACK miss 106 PRB),
+                                       (Test2: Format 1 ACK miss 106 PRB),
+				       (Test3: Format 1 ACK miss 273 PRB),
+			               (Test4: Format 1 NACKtoACK 106 PRB)</desc>
+      <pre_compile_prog></pre_compile_prog>
+      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
+      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
+      <pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
+      <pre_exec_args></pre_exec_args>
+      <main_exec> $OPENAIR_DIR/targets/bin/nr_pucchsim.Rel15</main_exec>
+      <main_exec_args>-R 106 -i 1 -P 0 -b 1 -s3 -n100
+	              -R 106 -i 14 -P 1 -b 1 -s-6 -n 100
+                      -R 273 -i 14 -P 1 -b 1 -s-6 -n100
+                      -R 106 -i 14 -P 1 -b 1 -s-6 -T 0.001 -n1000</main_exec_args>
+      <tags>nr_pucchsim.test1 nr_pucchsim.test2 nr_pucchsim.test3 nr_pucchsim.test4</tags>
+      <search_expr_true>PUCCH test OK</search_expr_true>
+      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
+      <nruns>3</nruns>
+    </testCase>
+
+
     <testCase id="015110">
       <class>execution</class>
       <desc>dlsim_tm4 test cases (Test 1: 10 MHz, R2.FDD (MCS 5), EVA5, -1dB), 

openair1/PHY/NR_UE_TRANSPORT/pucch_nr.h

@@ -42,10 +42,25 @@
 #include "T.h"
 #define ONE_OVER_SQRT2 23170 // 32767/sqrt(2) = 23170 (ONE_OVER_SQRT2)
 
+void nr_decode_pucch1(  int32_t **rxdataF,
+                        pucch_GroupHopping_t pucch_GroupHopping,
+                        uint32_t n_id,       // hoppingID higher layer parameter
+                        uint64_t *payload,
+                        NR_DL_FRAME_PARMS *frame_parms,
+                        int16_t amp,
+                        int nr_tti_tx,
+                        uint8_t m0,
+                        uint8_t nrofSymbols,
+                        uint8_t startingSymbolIndex,
+                        uint16_t startingPRB,
+                        uint16_t startingPRB_intraSlotHopping,
+                        uint8_t timeDomainOCC,
+                        uint8_t nr_bit);
+
 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,
+                        uint64_t *payload,
                         NR_DL_FRAME_PARMS *frame_parms,
                         int16_t amp,
                         int nr_tti_tx,
@@ -74,7 +89,7 @@ void nr_generate_pucch0(PHY_VARS_NR_UE *ue,
                         int16_t amp,
                         int nr_tti_tx,
                         uint8_t m0,
-                        uint8_t mcs,
+			uint8_t mcs,
                         uint8_t nrofSymbols,
                         uint8_t startingSymbolIndex,
                         uint16_t startingPRB);