Merge remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -99,7 +99,7 @@ int errno;
 # endif
 #endif
 
-//#define XER_PRINT
+#define XER_PRINT
 
 extern Enb_properties_array_t enb_properties;
 typedef struct xer_sprint_string_s {

openair2/RRC/LITE/rrc_UE.c

@@ -98,7 +98,7 @@ extern UE_MAC_INST *UE_mac_inst;
 extern void *bigphys_malloc(int);
 #endif
 
-//#define XER_PRINT
+#define XER_PRINT
 
 extern int8_t dB_fixed2(uint32_t x,uint32_t y);
 

openair2/RRC/LITE/rrc_eNB.c

@@ -3745,7 +3745,7 @@ rrc_eNB_generate_RRCConnectionSetup(
                           ue_context_pP,
                           CC_id,
                           (uint8_t*) eNB_rrc_inst[ctxt_pP->module_id].carrier[CC_id].Srb0.Tx_buffer.Payload,
-			  (fp->nb_antennas_tx_eNB==2)?2:1, //at this point we do not have the UE capability information, so it can only be TM1 or TM2
+			  (fp->nb_antenna_ports_eNB==2)?2:1, //at this point we do not have the UE capability information, so it can only be TM1 or TM2
                           rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id),
                           fp,
                           SRB_configList,