Commit 4526622b authored by Cedric Roux's avatar Cedric Roux
Browse files

bugfix: don't check for physicalConfigDedicated at the wrong places

physicalConfigDedicated may be legitimately NULL at some places
with the current code.

A cleaner solution is needed (we should always have a dedicated
config, initialized with values from the 3GPP specs, not have
a NULL as we do now).
parent b0d505d2
...@@ -352,17 +352,17 @@ schedule_SR(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP) ...@@ -352,17 +352,17 @@ schedule_SR(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
ul_req = ul_req =
&RC.mac[module_idP]->UL_req[CC_id].ul_config_request_body; &RC.mac[module_idP]->UL_req[CC_id].ul_config_request_body;
// drop the allocation if the UE hasn't send RRCConnectionSetupComplete yet
if (mac_eNB_get_rrc_status
(module_idP, UE_RNTI(module_idP, UE_id)) < RRC_CONNECTED)
continue;
AssertFatal(UE_list-> AssertFatal(UE_list->
UE_template[CC_id][UE_id].physicalConfigDedicated UE_template[CC_id][UE_id].physicalConfigDedicated
!= NULL, != NULL,
"physicalConfigDedicated is null for UE %d\n", "physicalConfigDedicated is null for UE %d\n",
UE_id); UE_id);
// drop the allocation if the UE hasn't send RRCConnectionSetupComplete yet
if (mac_eNB_get_rrc_status
(module_idP, UE_RNTI(module_idP, UE_id)) < RRC_CONNECTED)
continue;
if ((SRconfig = if ((SRconfig =
UE_list-> UE_list->
UE_template[CC_id][UE_id].physicalConfigDedicated-> UE_template[CC_id][UE_id].physicalConfigDedicated->
......
...@@ -1349,9 +1349,14 @@ fill_nfapi_harq_information(module_id_t module_idP, ...@@ -1349,9 +1349,14 @@ fill_nfapi_harq_information(module_id_t module_idP,
AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n"); AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n");
AssertFatal(UE_list != NULL, "UE_list is null\n"); AssertFatal(UE_list != NULL, "UE_list is null\n");
#if 0
/* TODO: revisit, don't use Assert, it's perfectly possible to
* have physicalConfigDedicated NULL here
*/
AssertFatal(UE_list->UE_template[CC_idP][UE_id]. AssertFatal(UE_list->UE_template[CC_idP][UE_id].
physicalConfigDedicated != NULL, physicalConfigDedicated != NULL,
"physicalConfigDedicated for rnti %x is null\n", rntiP); "physicalConfigDedicated for rnti %x is null\n", rntiP);
#endif
harq_information->harq_information_rel11.num_ant_ports = 1; harq_information->harq_information_rel11.num_ant_ports = 1;
...@@ -3585,11 +3590,9 @@ extract_harq(module_id_t mod_idP, int CC_idP, int UE_id, ...@@ -3585,11 +3590,9 @@ extract_harq(module_id_t mod_idP, int CC_idP, int UE_id,
uint8_t *pdu; uint8_t *pdu;
#ifdef Rel14 #ifdef Rel14
AssertFatal(UE_list-> if (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated != NULL &&
UE_template[pCCid][UE_id].physicalConfigDedicated-> UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->pucch_ConfigDedicated != NULL &&
pucch_ConfigDedicated != NULL, (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7)
"pucch_ConfigDedicated is null!\n");
if ((UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7)
&& (UE_list->UE_template[pCCid][UE_id]. && (UE_list->UE_template[pCCid][UE_id].
physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13) physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13)
&& &&
......
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