Commit 2ee4242d authored by winckel's avatar winckel
Browse files

Fixed a compile issue without ITTI.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4532 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 114cd1e8
...@@ -588,7 +588,9 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 ...@@ -588,7 +588,9 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
u16 UE_index, u16 UE_index,
u8 ho_state) u8 ho_state)
{ {
#if defined(ENABLE_ITTI)
eNB_RRC_UE_INFO *UE_info = &eNB_rrc_inst[Mod_id].Info.UE[UE_index]; eNB_RRC_UE_INFO *UE_info = &eNB_rrc_inst[Mod_id].Info.UE[UE_index];
#endif
u8 buffer[RRC_BUF_SIZE]; u8 buffer[RRC_BUF_SIZE];
u8 size; u8 size;
int i; int i;
...@@ -636,7 +638,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 ...@@ -636,7 +638,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
QuantityConfig_t *quantityConfig=NULL; QuantityConfig_t *quantityConfig=NULL;
CellsToAddMod_t *CellToAdd; CellsToAddMod_t *CellToAdd;
CellsToAddModList_t *CellsToAddModList; CellsToAddModList_t *CellsToAddModList;
struct RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList *dedicatedInfoNASList; struct RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList *dedicatedInfoNASList = NULL;
DedicatedInfoNAS_t *dedicatedInfoNas; DedicatedInfoNAS_t *dedicatedInfoNas;
C_RNTI_t *cba_RNTI = NULL; C_RNTI_t *cba_RNTI = NULL;
...@@ -1022,6 +1024,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 ...@@ -1022,6 +1024,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
} }
#if defined(ENABLE_ITTI)
/* Initialize NAS list */ /* Initialize NAS list */
dedicatedInfoNASList = CALLOC (1, sizeof (struct RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList)); dedicatedInfoNASList = CALLOC (1, sizeof (struct RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList));
/* Add all NAS PDUs to the list */ /* Add all NAS PDUs to the list */
...@@ -1044,6 +1047,8 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 ...@@ -1044,6 +1047,8 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
free (dedicatedInfoNASList); free (dedicatedInfoNASList);
dedicatedInfoNASList = NULL; dedicatedInfoNASList = NULL;
} }
#endif
memset (buffer, 0, RRC_BUF_SIZE); memset (buffer, 0, RRC_BUF_SIZE);
size = do_RRCConnectionReconfiguration (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id), //Transaction_id, size = do_RRCConnectionReconfiguration (Mod_id, buffer, UE_index, rrc_eNB_get_next_transaction_identifier(Mod_id), //Transaction_id,
...@@ -1054,6 +1059,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 ...@@ -1054,6 +1059,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
MeasId_list, mac_MainConfig, NULL,NULL,Sparams,rsrp, MeasId_list, mac_MainConfig, NULL,NULL,Sparams,rsrp,
cba_RNTI, dedicatedInfoNASList); cba_RNTI, dedicatedInfoNASList);
#if defined(ENABLE_ITTI)
/* Free all NAS PDUs */ /* Free all NAS PDUs */
for (i = 0; i < UE_info->nb_of_e_rabs; i++) for (i = 0; i < UE_info->nb_of_e_rabs; i++)
{ {
...@@ -1064,6 +1070,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32 ...@@ -1064,6 +1070,7 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration (u8 Mod_id, u32
UE_info->e_rab[i].param.nas_pdu.buffer = NULL; UE_info->e_rab[i].param.nas_pdu.buffer = NULL;
} }
} }
#endif
LOG_I (RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCConnectionReconfiguration (bytes %d, UE id %d)\n", LOG_I (RRC,"[eNB %d] Frame %d, Logical Channel DL-DCCH, Generate RRCConnectionReconfiguration (bytes %d, UE id %d)\n",
Mod_id, frame, size, UE_index); Mod_id, frame, size, UE_index);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment