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

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 */