Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop

openair1/PHY/LTE_TRANSPORT/pucch.c

@@ -795,25 +795,11 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
       for (j=0;j<NUMBER_OF_UE_MAX;j++) {
 	eNB->pucch1_stats_cnt[j][i]=0;
 	eNB->pucch1ab_stats_cnt[j][i]=0;
-      }
-    }
-#if defined(USRP_REC_PLAY)
-    // It's probably bad to do this statically only once.
-    // Looks like the above is incomplete.
-    // Such reset needs to be done once a UE PHY structure is being used/re-used
-    // Don't know if this is ever possible in current architecture
-    for (i=0;i<10240;i++) {
-      for (j=0;j<NUMBER_OF_UE_MAX;j++) {
-	eNB->pucch1_stats[j][i]=0;
+#if defined(USRP_REC_PLAY) // not 100% sure
 	eNB->pucch1_stats_thres[j][i]=0;
+#endif	
       }
     }
-    for (i=0;i<20480;i++) {
-      for (j=0;j<NUMBER_OF_UE_MAX;j++) {
-	eNB->pucch1ab_stats[j][i]=0;
-      }
-    }
-#endif    
     first_call=0;
   }
 
@@ -1236,6 +1222,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
 #if defined(USRP_REC_PLAY)
     // It looks like the value is a bit messy when RF is replayed.
     // For instance i assume to skip pucch1_thres from the test below.
+    // Not 100% sure
     if (sigma2_dB<(dB_fixed(stat_max)))  {//
 #else
     if (sigma2_dB<(dB_fixed(stat_max)-pucch1_thres))  {//

openair2/LAYER2/MAC/mac.h

@@ -130,7 +130,7 @@
 /*!\brief Maximum number od control elemenets */
 #define MAX_NUM_CE 5
 /*!\brief Maximum number of random access process */
-#if defined(USRP_REC_PLAY)
+#if 0 // #if defined(USRP_REC_PLAY)
 #define NB_RA_PROC_MAX 1
 #else
 #define NB_RA_PROC_MAX 4

openair2/RRC/LTE/rrc_defs.h

@@ -384,11 +384,7 @@ typedef enum SL_TRIGGER_e {
 // #define NUM_MAX_CBA_GROUP 4 // in the platform_constants
 
 /* TS 36.331: RRC-TransactionIdentifier ::= INTEGER (0..3) */
-#if defined(USRP_REC_PLAY)
-#define RRC_TRANSACTION_IDENTIFIER_NUMBER  1
-#else
 #define RRC_TRANSACTION_IDENTIFIER_NUMBER  3
-#endif
 
 typedef struct {
   unsigned short transport_block_size;                  /*!< \brief Minimum PDU size in bytes provided by RLC to MAC layer interface */

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.h

@@ -47,7 +47,7 @@ typedef struct {
 } iqrec_t;
 #define DEF_NB_SF           120000               // default nb of sf or ms to capture (2 minutes at 5MHz)
 #define DEF_SF_FILE         "/home/nokia/iqfile" // default subframes file name
-#define DEF_SF_DELAY_READ   400                  // default read delay  µs (860=real)
+#define DEF_SF_DELAY_READ   700                  // default read delay  µs (860=real)
 #define DEF_SF_DELAY_WRITE  15                   // default write delay µs (15=real)
 #define DEF_SF_NB_LOOP      5                    // default nb loops
 

targets/RT/USER/lte-ru.c

@@ -825,8 +825,12 @@ void rx_rf(RU_t *ru,int *frame,int *subframe) {
   
   if (rxs != fp->samples_per_tti)
   {
+#if defined(USRP_REC_PLAY)
+    exit_fun("Exiting IQ record/playback");
+#else    
     //exit_fun( "problem receiving samples" );
     LOG_E(PHY, "problem receiving samples");
+#endif    
   }
 }