Merge remote-tracking branch 'origin/develop' into enhancement-rfsim

2018-07-06 06:24:31 +02:00
parent b4be5a4460 204488f879
commit 494348e2f0
141 changed files with 6550 additions and 716831 deletions
@@ -130,11 +130,7 @@
 /*!\brief Maximum number od control elemenets */
 #define MAX_NUM_CE 5
 /*!\brief Maximum number of random access process */
-#if 0 // #if defined(USRP_REC_PLAY)
-#define NB_RA_PROC_MAX 1
-#else
 #define NB_RA_PROC_MAX 4
-#endif
 /*!\brief size of buffer status report table */
 #define BSR_TABLE_SIZE 64
 /*!\brief The power headroom reporting range is from -23 ...+40 dB and beyond, with step 1 */