*fix few issues related to the OTG (rb_id and start time)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5220 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -704,7 +704,18 @@ void pdcp_run (frame_t frameP, eNB_flag_t  enb_flagP, module_id_t ue_mod_idP, mo
 # endif
 #endif
 
-  pdcp_fifo_read_input_sdus_from_otg(frameP, enb_flagP, ue_mod_idP, enb_mod_idP);
+#if defined(USER_MODE) && defined(OAI_EMU)
+  pdcp_t            *pdcp_p          = NULL;
+  // add other rb_ids 
+  if (enb_flagP == ENB_FLAG_NO) {
+      pdcp_p = &pdcp_array_ue[ue_mod_idP][DTCH];
+  } else {
+      pdcp_p = &pdcp_array_eNB[enb_mod_idP][ue_mod_idP][DTCH];
+  }
+
+  if (pdcp_p->instanciated_instance  == TRUE )
+    pdcp_fifo_read_input_sdus_from_otg(frameP, enb_flagP, ue_mod_idP, enb_mod_idP);
+#endif 
 
   // IP/NAS -> PDCP traffic : TX, read the pkt from the upper layer buffer
 #if defined(LINK_PDCP_TO_GTPV1U)

openair2/UTIL/OCG/OCG.h

@@ -757,7 +757,7 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need
 
   int OCG_main (char is_local_server[FILENAME_LENGTH_MAX]);
 
-  void init_oai_emulation (void);
+  //  void init_oai_emulation (void);
   //#include "UTIL/LOG/log.h"
 
 #ifdef __cplusplus