Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony

Conflicts: targets/RT/USER/lte-softmodem.c
2016-12-22 23:17:37 +01:00
parent 12ed6c21f1 3bf8768d1b
commit db4b77ebd2
425 changed files with 53277 additions and 2473 deletions
@@ -44,8 +44,9 @@
 #define BBU_LOCAL_RADIO_HEAD  0
 #define BBU_REMOTE_RADIO_HEAD 1

+#ifndef MAX_CARDS
 #define MAX_CARDS 8
-
+#endif

 typedef int64_t openair0_timestamp;
 typedef volatile int64_t openair0_vtimestamp;