Corrected task id and instance value in ITTI generic log for SIB encoding.

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

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -100,7 +100,9 @@
 int errno;
 #endif
 #else
-#define msg printf
+# if !defined (msg)
+#   define msg printf
+# endif
 #endif
 
 typedef struct xer_sprint_string_s
@@ -356,7 +358,7 @@ uint8_t do_MIB(LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, uint8_t *buffer)
   */
 }
 
-uint8_t do_SIB1(LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer,
+uint8_t do_SIB1(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer,
                 BCCH_DL_SCH_Message_t *bcch_message,
                 SystemInformationBlockType1_t **sib1
 #if defined(ENABLE_ITTI)
@@ -508,10 +510,10 @@ uint8_t do_SIB1(LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer,
     {
       MessageDef *message_p;
 
-      message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
+      message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size);
       memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
 
-      itti_send_msg_to_task(TASK_UNKNOWN, INSTANCE_DEFAULT, message_p);
+      itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p);
     }
   }
 # endif
@@ -527,9 +529,9 @@ uint8_t do_SIB1(LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer,
 }
 
 uint8_t do_SIB2_AT4(uint8_t Mod_id,
-		    uint8_t *buffer,
-		    BCCH_DL_SCH_Message_t *bcch_message,
-		    SystemInformationBlockType2_t **sib2) {
+		                uint8_t *buffer,
+                    BCCH_DL_SCH_Message_t *bcch_message,
+                    SystemInformationBlockType2_t **sib2) {
 
   struct SystemInformation_r8_IEs_sib_TypeAndInfo_Member *sib2_part;
 
@@ -696,10 +698,10 @@ uint8_t do_SIB2_AT4(uint8_t Mod_id,
     {
       MessageDef *message_p;
 
-      message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
+      message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size);
       memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
 
-      itti_send_msg_to_task(TASK_UNKNOWN, INSTANCE_DEFAULT, message_p);
+      itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p);
     }
   }
 # endif
@@ -1083,10 +1085,10 @@ uint8_t do_SIB23(uint8_t Mod_id,
     {
       MessageDef *message_p;
 
-      message_p = itti_alloc_new_message_sized (TASK_RRC_UE, GENERIC_LOG, message_string_size);
+      message_p = itti_alloc_new_message_sized (TASK_RRC_ENB, GENERIC_LOG, message_string_size);
       memcpy(&message_p->ittiMsg.generic_log, message_string, message_string_size);
 
-      itti_send_msg_to_task(TASK_UNKNOWN, INSTANCE_DEFAULT, message_p);
+      itti_send_msg_to_task(TASK_UNKNOWN, Mod_id, message_p);
     }
   }
 # endif

openair2/RRC/LITE/MESSAGES/asn1_msg.h

@@ -74,7 +74,7 @@ u8 get_adjacent_cell_mod_id(uint16_t phyCellId);
 @param sib1 Pointer to asn1c C representation of SIB1
 @return size of encoded bit stream in bytes*/
 
-uint8_t do_SIB1(LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer,
+uint8_t do_SIB1(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer,
                 BCCH_DL_SCH_Message_t *bcch_message,
                 SystemInformationBlockType1_t **sib1
 #if defined(ENABLE_ITTI)

openair2/RRC/LITE/rrc_eNB.c

@@ -180,7 +180,8 @@ static void init_SI (u8 Mod_id
    */
 
   if (eNB_rrc_inst[Mod_id].SIB1)
-    eNB_rrc_inst[Mod_id].sizeof_SIB1 = do_SIB1 (mac_xface->lte_frame_parms,
+    eNB_rrc_inst[Mod_id].sizeof_SIB1 = do_SIB1 (Mod_id,
+                                                mac_xface->lte_frame_parms,
                                                 (uint8_t *)
                                                 eNB_rrc_inst[Mod_id].SIB1,
                                                 &eNB_rrc_inst[Mod_id].