Merge branch 'enhancement-10-harmony' into develop

openair1/PHY/defs.h

@@ -875,7 +875,7 @@ typedef struct {
 
 void exit_fun(const char* s);
 
-inline int wait_on_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
+static inline int wait_on_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
 
   if (pthread_mutex_lock(mutex) != 0) {
     LOG_E( PHY, "[SCHED][eNB] error locking mutex for %s\n",name);
@@ -897,7 +897,7 @@ inline int wait_on_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *in
   return(0);
 }
 
-inline int wait_on_busy_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
+static inline int wait_on_busy_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
 
   if (pthread_mutex_lock(mutex) != 0) {
     LOG_E( PHY, "[SCHED][eNB] error locking mutex for %s\n",name);
@@ -919,7 +919,7 @@ inline int wait_on_busy_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,in
   return(0);
 }
 
-inline int release_thread(pthread_mutex_t *mutex,int *instance_cnt,char *name) {
+static inline int release_thread(pthread_mutex_t *mutex,int *instance_cnt,char *name) {
 
   if (pthread_mutex_lock(mutex) != 0) {
     LOG_E( PHY, "[SCHED][eNB] error locking mutex for %s\n",name);

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf

@@ -23,6 +23,10 @@ eNBs =
 
     component_carriers = (
       {
+            node_function                                         = "eNodeB_3GPP";
+            node_timing                                           = "synch_to_ext_device";
+            node_synch_ref                                        = 0;
+
   		    frame_type					              = "FDD";
             tdd_config 					              = 3;
             tdd_config_s            			      = 0;

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_mme.conf

@@ -23,6 +23,9 @@ eNBs =
 
     component_carriers = (
     	{
+            node_function                                         = "eNodeB_3GPP";
+            node_timing                                           = "synch_to_ext_device";
+            node_synch_ref                                        = 0;
   		    frame_type					              = "FDD";
             tdd_config 					              = 3;
             tdd_config_s            			      = 0;