From 1a5a0297686876f84ea15f1aa7698504d2af6772 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sat, 2 Dec 2017 15:15:30 -0800
Subject: [PATCH] minor changes to config.c
---
openair2/LAYER2/MAC/config.c | 1895 ++++++++++++++++------------------
1 file changed, 904 insertions(+), 991 deletions(-)
diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c
index 764c762f6a..6943013c34 100644
--- a/openair2/LAYER2/MAC/config.c
+++ b/openair2/LAYER2/MAC/config.c
@@ -63,34 +63,34 @@ extern RAN_CONTEXT_t RC;
void ue_mac_reset(module_id_t module_idP, uint8_t eNB_index)
{
- //Resetting Bj
- UE_mac_inst[module_idP].scheduling_info.Bj[0] = 0;
- UE_mac_inst[module_idP].scheduling_info.Bj[1] = 0;
- UE_mac_inst[module_idP].scheduling_info.Bj[2] = 0;
+ //Resetting Bj
+ UE_mac_inst[module_idP].scheduling_info.Bj[0] = 0;
+ UE_mac_inst[module_idP].scheduling_info.Bj[1] = 0;
+ UE_mac_inst[module_idP].scheduling_info.Bj[2] = 0;
- //Stopping all timers
+ //Stopping all timers
- //timeAlignmentTimer expires
+ //timeAlignmentTimer expires
- // PHY changes for UE MAC reset
- phy_reset_ue(module_idP, 0, eNB_index);
+ // PHY changes for UE MAC reset
+ phy_reset_ue(module_idP, 0, eNB_index);
- // notify RRC to relase PUCCH/SRS
- // cancel all pending SRs
- UE_mac_inst[module_idP].scheduling_info.SR_pending = 0;
- UE_mac_inst[module_idP].scheduling_info.SR_COUNTER = 0;
+ // notify RRC to relase PUCCH/SRS
+ // cancel all pending SRs
+ UE_mac_inst[module_idP].scheduling_info.SR_pending = 0;
+ UE_mac_inst[module_idP].scheduling_info.SR_COUNTER = 0;
-//Set BSR Trigger Bmp and remove timer flags
- UE_mac_inst[module_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
+ //Set BSR Trigger Bmp and remove timer flags
+ UE_mac_inst[module_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
- // stop ongoing RACH procedure
+ // stop ongoing RACH procedure
- // discard explicitly signaled ra_PreambleIndex and ra_RACH_MaskIndex, if any
- UE_mac_inst[module_idP].RA_prach_resources.ra_PreambleIndex = 0; // check!
- UE_mac_inst[module_idP].RA_prach_resources.ra_RACH_MaskIndex = 0;
+ // discard explicitly signaled ra_PreambleIndex and ra_RACH_MaskIndex, if any
+ UE_mac_inst[module_idP].RA_prach_resources.ra_PreambleIndex = 0; // check!
+ UE_mac_inst[module_idP].RA_prach_resources.ra_RACH_MaskIndex = 0;
- ue_init_mac(module_idP); //This will hopefully do the rest of the MAC reset procedure
+ ue_init_mac(module_idP); //This will hopefully do the rest of the MAC reset procedure
}
@@ -99,121 +99,121 @@ int32_t **txdata;
typedef struct eutra_bandentry_s {
- int16_t band;
- uint32_t ul_min;
- uint32_t ul_max;
- uint32_t dl_min;
- uint32_t dl_max;
- uint32_t N_OFFs_DL;
+ int16_t band;
+ uint32_t ul_min;
+ uint32_t ul_max;
+ uint32_t dl_min;
+ uint32_t dl_max;
+ uint32_t N_OFFs_DL;
} eutra_bandentry_t;
typedef struct band_info_s {
- int nbands;
- eutra_bandentry_t band_info[100];
+ int nbands;
+ eutra_bandentry_t band_info[100];
} band_info_t;
static const eutra_bandentry_t eutra_bandtable[] = {
- {1, 19200, 19800, 21100, 21700, 0},
- {2, 18500, 19100, 19300, 19900, 6000},
- {3, 17100, 17850, 18050, 18800, 12000},
- {4, 17100, 17550, 21100, 21550, 19500},
- {5, 8240, 8490, 8690, 8940, 24000},
- {6, 8300, 8400, 8750, 8850, 26500},
- {7, 25000, 25700, 26200, 26900, 27500},
- {8, 8800, 9150, 9250, 9600, 34500},
- {9, 17499, 17849, 18449, 18799, 38000},
- {10, 17100, 17700, 21100, 21700, 41500},
- {11, 14279, 14529, 14759, 15009, 47500},
- {12, 6980, 7160, 7280, 7460, 50100},
- {13, 7770, 7870, 7460, 7560, 51800},
- {14, 7880, 7980, 7580, 7680, 52800},
- {17, 7040, 7160, 7340, 7460, 57300},
- {18, 8150, 9650, 8600, 10100, 58500},
- {19, 8300, 8450, 8750, 8900, 60000},
- {20, 8320, 8620, 7910, 8210, 61500},
- {21, 14479, 14629, 14959, 15109, 64500},
- {22, 34100, 34900, 35100, 35900, 66000},
- {23, 20000, 20200, 21800, 22000, 75000},
- {24, 16126, 16605, 15250, 15590, 77000},
- {25, 18500, 19150, 19300, 19950, 80400},
- {26, 8140, 8490, 8590, 8940, 86900},
- {27, 8070, 8240, 8520, 8690, 90400},
- {28, 7030, 7580, 7580, 8130, 92100},
- {29, 0, 0, 7170, 7280, 96600},
- {30, 23050, 23250, 23500, 23600, 97700},
- {31, 45250, 34900, 46250, 35900, 98700},
- {32, 0, 0, 14520, 14960, 99200},
- {33, 19000, 19200, 19000, 19200, 36000},
- {34, 20100, 20250, 20100, 20250, 36200},
- {35, 18500, 19100, 18500, 19100, 36350},
- {36, 19300, 19900, 19300, 19900, 36950},
- {37, 19100, 19300, 19100, 19300, 37550},
- {38, 25700, 26200, 25700, 26300, 37750},
- {39, 18800, 19200, 18800, 19200, 38250},
- {40, 23000, 24000, 23000, 24000, 38650},
- {41, 24960, 26900, 24960, 26900, 39650},
- {42, 34000, 36000, 34000, 36000, 41590},
- {43, 36000, 38000, 36000, 38000, 43590},
- {44, 7030, 8030, 7030, 8030, 45590},
- {45, 14470, 14670, 14470, 14670, 46590},
- {46, 51500, 59250, 51500, 59250, 46790},
- {65, 19200, 20100, 21100, 22000, 65536},
- {66, 17100, 18000, 21100, 22000, 66436},
- {67, 0, 0, 7380, 7580, 67336},
- {68, 6980, 7280, 7530, 7830, 67536}
+ {1, 19200, 19800, 21100, 21700, 0},
+ {2, 18500, 19100, 19300, 19900, 6000},
+ {3, 17100, 17850, 18050, 18800, 12000},
+ {4, 17100, 17550, 21100, 21550, 19500},
+ {5, 8240, 8490, 8690, 8940, 24000},
+ {6, 8300, 8400, 8750, 8850, 26500},
+ {7, 25000, 25700, 26200, 26900, 27500},
+ {8, 8800, 9150, 9250, 9600, 34500},
+ {9, 17499, 17849, 18449, 18799, 38000},
+ {10, 17100, 17700, 21100, 21700, 41500},
+ {11, 14279, 14529, 14759, 15009, 47500},
+ {12, 6980, 7160, 7280, 7460, 50100},
+ {13, 7770, 7870, 7460, 7560, 51800},
+ {14, 7880, 7980, 7580, 7680, 52800},
+ {17, 7040, 7160, 7340, 7460, 57300},
+ {18, 8150, 9650, 8600, 10100, 58500},
+ {19, 8300, 8450, 8750, 8900, 60000},
+ {20, 8320, 8620, 7910, 8210, 61500},
+ {21, 14479, 14629, 14959, 15109, 64500},
+ {22, 34100, 34900, 35100, 35900, 66000},
+ {23, 20000, 20200, 21800, 22000, 75000},
+ {24, 16126, 16605, 15250, 15590, 77000},
+ {25, 18500, 19150, 19300, 19950, 80400},
+ {26, 8140, 8490, 8590, 8940, 86900},
+ {27, 8070, 8240, 8520, 8690, 90400},
+ {28, 7030, 7580, 7580, 8130, 92100},
+ {29, 0, 0, 7170, 7280, 96600},
+ {30, 23050, 23250, 23500, 23600, 97700},
+ {31, 45250, 34900, 46250, 35900, 98700},
+ {32, 0, 0, 14520, 14960, 99200},
+ {33, 19000, 19200, 19000, 19200, 36000},
+ {34, 20100, 20250, 20100, 20250, 36200},
+ {35, 18500, 19100, 18500, 19100, 36350},
+ {36, 19300, 19900, 19300, 19900, 36950},
+ {37, 19100, 19300, 19100, 19300, 37550},
+ {38, 25700, 26200, 25700, 26300, 37750},
+ {39, 18800, 19200, 18800, 19200, 38250},
+ {40, 23000, 24000, 23000, 24000, 38650},
+ {41, 24960, 26900, 24960, 26900, 39650},
+ {42, 34000, 36000, 34000, 36000, 41590},
+ {43, 36000, 38000, 36000, 38000, 43590},
+ {44, 7030, 8030, 7030, 8030, 45590},
+ {45, 14470, 14670, 14470, 14670, 46590},
+ {46, 51500, 59250, 51500, 59250, 46790},
+ {65, 19200, 20100, 21100, 22000, 65536},
+ {66, 17100, 18000, 21100, 22000, 66436},
+ {67, 0, 0, 7380, 7580, 67336},
+ {68, 6980, 7280, 7530, 7830, 67536}
};
uint32_t to_earfcn(int eutra_bandP, uint32_t dl_CarrierFreq, uint32_t bw)
{
- uint32_t dl_CarrierFreq_by_100k = dl_CarrierFreq / 100000;
- int bw_by_100 = bw / 100;
+ uint32_t dl_CarrierFreq_by_100k = dl_CarrierFreq / 100000;
+ int bw_by_100 = bw / 100;
- int i;
+ int i;
- AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
- for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
+ AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
+ for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
- AssertFatal(dl_CarrierFreq_by_100k >= eutra_bandtable[i].dl_min,
- "Band %d, bw %u : DL carrier frequency %u Hz < %u\n",
- eutra_bandP, bw, dl_CarrierFreq,
- eutra_bandtable[i].dl_min);
- AssertFatal(dl_CarrierFreq_by_100k <=
- (eutra_bandtable[i].dl_max - bw_by_100),
- "Band %d, bw %u: DL carrier frequency %u Hz > %d\n",
- eutra_bandP, bw, dl_CarrierFreq,
- eutra_bandtable[i].dl_max - bw_by_100);
+ AssertFatal(dl_CarrierFreq_by_100k >= eutra_bandtable[i].dl_min,
+ "Band %d, bw %u : DL carrier frequency %u Hz < %u\n",
+ eutra_bandP, bw, dl_CarrierFreq,
+ eutra_bandtable[i].dl_min);
+ AssertFatal(dl_CarrierFreq_by_100k <=
+ (eutra_bandtable[i].dl_max - bw_by_100),
+ "Band %d, bw %u: DL carrier frequency %u Hz > %d\n",
+ eutra_bandP, bw, dl_CarrierFreq,
+ eutra_bandtable[i].dl_max - bw_by_100);
- return (dl_CarrierFreq_by_100k - eutra_bandtable[i].dl_min +
- (eutra_bandtable[i].N_OFFs_DL / 10));
+ return (dl_CarrierFreq_by_100k - eutra_bandtable[i].dl_min +
+ (eutra_bandtable[i].N_OFFs_DL / 10));
}
uint32_t from_earfcn(int eutra_bandP, uint32_t dl_earfcn)
{
- int i;
+ int i;
- AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
- for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
+ AssertFatal(eutra_bandP < 69, "eutra_band %d > 68\n", eutra_bandP);
+ for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
- return (eutra_bandtable[i].dl_min +
- (dl_earfcn - (eutra_bandtable[i].N_OFFs_DL / 10))) * 100000;
+ return (eutra_bandtable[i].dl_min +
+ (dl_earfcn - (eutra_bandtable[i].N_OFFs_DL / 10))) * 100000;
}
int32_t get_uldl_offset(int eutra_bandP)
{
- int i;
+ int i;
- for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
- return (eutra_bandtable[i].dl_min - eutra_bandtable[i].ul_min);
+ for (i = 0; i < 69 && eutra_bandtable[i].band != eutra_bandP; i++);
+ return (eutra_bandtable[i].dl_min - eutra_bandtable[i].ul_min);
}
uint32_t bw_table[6] =
- { 6 * 180, 15 * 180, 25 * 180, 50 * 180, 75 * 180, 100 * 180 };
+ { 6 * 180, 15 * 180, 25 * 180, 50 * 180, 75 * 180, 100 * 180 };
void
config_mib(int Mod_idP,
@@ -228,52 +228,52 @@ config_mib(int Mod_idP,
uint32_t ul_CarrierFreqP, uint32_t pbch_repetitionP)
{
- nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
+ nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
- cfg->subframe_config.pcfich_power_offset.value = 6000; // 0dB
- cfg->subframe_config.dl_cyclic_prefix_type.value = NcpP;
- cfg->subframe_config.ul_cyclic_prefix_type.value = NcpP;
+ cfg->subframe_config.pcfich_power_offset.value = 6000; // 0dB
+ cfg->subframe_config.dl_cyclic_prefix_type.value = NcpP;
+ cfg->subframe_config.ul_cyclic_prefix_type.value = NcpP;
- LOG_I(MAC, "Ncp %d,p_eNB %d\n", NcpP, p_eNBP);
+ LOG_I(MAC, "Ncp %d,p_eNB %d\n", NcpP, p_eNBP);
- cfg->rf_config.dl_channel_bandwidth.value = dl_BandwidthP;
- cfg->rf_config.ul_channel_bandwidth.value = dl_BandwidthP;
- cfg->rf_config.tx_antenna_ports.value = p_eNBP;
- cfg->rf_config.rx_antenna_ports.value = 2;
+ cfg->rf_config.dl_channel_bandwidth.value = dl_BandwidthP;
+ cfg->rf_config.ul_channel_bandwidth.value = dl_BandwidthP;
+ cfg->rf_config.tx_antenna_ports.value = p_eNBP;
+ cfg->rf_config.rx_antenna_ports.value = 2;
- cfg->nfapi_config.earfcn.value =
- to_earfcn(eutra_bandP, dl_CarrierFreqP,
- bw_table[dl_BandwidthP] / 100);
- cfg->nfapi_config.rf_bands.number_rf_bands = 1;
- cfg->nfapi_config.rf_bands.rf_band[0] = eutra_bandP;
- cfg->phich_config.phich_resource.value = phich_configP->phich_Resource;
- cfg->phich_config.phich_duration.value = phich_configP->phich_Duration;
- cfg->phich_config.phich_power_offset.value = 6000; // 0dB
+ cfg->nfapi_config.earfcn.value =
+ to_earfcn(eutra_bandP, dl_CarrierFreqP,
+ bw_table[dl_BandwidthP] / 100);
+ cfg->nfapi_config.rf_bands.number_rf_bands = 1;
+ cfg->nfapi_config.rf_bands.rf_band[0] = eutra_bandP;
+ cfg->phich_config.phich_resource.value = phich_configP->phich_Resource;
+ cfg->phich_config.phich_duration.value = phich_configP->phich_Duration;
+ cfg->phich_config.phich_power_offset.value = 6000; // 0dB
- cfg->sch_config.primary_synchronization_signal_epre_eprers.value = 6000; // 0dB
- cfg->sch_config.secondary_synchronization_signal_epre_eprers.value = 6000; // 0dB
- cfg->sch_config.physical_cell_id.value = Nid_cellP;
+ cfg->sch_config.primary_synchronization_signal_epre_eprers.value = 6000; // 0dB
+ cfg->sch_config.secondary_synchronization_signal_epre_eprers.value = 6000; // 0dB
+ cfg->sch_config.physical_cell_id.value = Nid_cellP;
#ifdef Rel14
- cfg->emtc_config.pbch_repetitions_enable_r13.value = pbch_repetitionP;
+ cfg->emtc_config.pbch_repetitions_enable_r13.value = pbch_repetitionP;
#endif
}
void config_sib1(int Mod_idP, int CC_idP, TDD_Config_t * tdd_ConfigP)
{
- nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
-
- if (tdd_ConfigP) { //TDD
- cfg->subframe_config.duplex_mode.value = 0;
- cfg->tdd_frame_structure_config.subframe_assignment.value =
- tdd_ConfigP->subframeAssignment;
- cfg->tdd_frame_structure_config.special_subframe_patterns.value =
- tdd_ConfigP->specialSubframePatterns;
- } else { // FDD
- cfg->subframe_config.duplex_mode.value = 1;
- // Note no half-duplex here
- }
+ nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
+
+ if (tdd_ConfigP) { //TDD
+ cfg->subframe_config.duplex_mode.value = 0;
+ cfg->tdd_frame_structure_config.subframe_assignment.value =
+ tdd_ConfigP->subframeAssignment;
+ cfg->tdd_frame_structure_config.special_subframe_patterns.value =
+ tdd_ConfigP->specialSubframePatterns;
+ } else { // FDD
+ cfg->subframe_config.duplex_mode.value = 1;
+ // Note no half-duplex here
+ }
}
@@ -294,241 +294,154 @@ config_sib2(int Mod_idP,
struct MBSFN_SubframeConfigList *mbsfn_SubframeConfigListP)
{
- nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
-
- cfg->subframe_config.pb.value =
- radioResourceConfigCommonP->pdsch_ConfigCommon.p_b;
- cfg->rf_config.reference_signal_power.value =
- radioResourceConfigCommonP->pdsch_ConfigCommon.
- referenceSignalPower;
- cfg->nfapi_config.max_transmit_power.value =
- cfg->rf_config.reference_signal_power.value +
- power_off_dB[cfg->rf_config.dl_channel_bandwidth.value];
-
- cfg->prach_config.configuration_index.value =
- radioResourceConfigCommonP->prach_Config.
- prach_ConfigInfo.prach_ConfigIndex;
- cfg->prach_config.root_sequence_index.value =
- radioResourceConfigCommonP->prach_Config.rootSequenceIndex;
- cfg->prach_config.zero_correlation_zone_configuration.value =
- radioResourceConfigCommonP->prach_Config.
- prach_ConfigInfo.zeroCorrelationZoneConfig;
- cfg->prach_config.high_speed_flag.value =
- radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.
- highSpeedFlag;
- cfg->prach_config.frequency_offset.value =
- radioResourceConfigCommonP->prach_Config.
- prach_ConfigInfo.prach_FreqOffset;
-
- cfg->pusch_config.hopping_mode.value =
- radioResourceConfigCommonP->pusch_ConfigCommon.
- pusch_ConfigBasic.hoppingMode;
- cfg->pusch_config.number_of_subbands.value =
- radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.
- n_SB;
- cfg->pusch_config.hopping_offset.value =
- radioResourceConfigCommonP->pusch_ConfigCommon.
- pusch_ConfigBasic.pusch_HoppingOffset;
-
-
-
- cfg->pucch_config.delta_pucch_shift.value =
- radioResourceConfigCommonP->pucch_ConfigCommon.deltaPUCCH_Shift;
- cfg->pucch_config.n_cqi_rb.value =
- radioResourceConfigCommonP->pucch_ConfigCommon.nRB_CQI;
- cfg->pucch_config.n_an_cs.value =
- radioResourceConfigCommonP->pucch_ConfigCommon.nCS_AN;
- cfg->pucch_config.n1_pucch_an.value =
- radioResourceConfigCommonP->pucch_ConfigCommon.n1PUCCH_AN;
-
- if (radioResourceConfigCommonP->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled ==
- true)
- cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 1;
- else if (radioResourceConfigCommonP->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- sequenceHoppingEnabled == true)
- cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 2;
- else // No hopping
- cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 0;
-
- cfg->uplink_reference_signal_config.group_assignment.value =
- radioResourceConfigCommonP->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
- cfg->uplink_reference_signal_config.cyclic_shift_1_for_drms.value =
- radioResourceConfigCommonP->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift;
-
- // how to enable/disable SRS?
- if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.present ==
- SoundingRS_UL_ConfigCommon_PR_setup) {
- cfg->srs_config.bandwidth_configuration.value =
- radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.
- choice.setup.srs_BandwidthConfig;
- cfg->srs_config.srs_subframe_configuration.value =
- radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.
- choice.setup.srs_SubframeConfig;
- cfg->srs_config.srs_acknack_srs_simultaneous_transmission.value =
- radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.
- choice.setup.ackNackSRS_SimultaneousTransmission;
-
- if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.
- choice.setup.srs_MaxUpPts)
- cfg->srs_config.max_up_pts.value = 1;
- else
- cfg->srs_config.max_up_pts.value = 0;
- }
+ nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
+
+ cfg->subframe_config.pb.value = radioResourceConfigCommonP->pdsch_ConfigCommon.p_b;
+ cfg->rf_config.reference_signal_power.value = radioResourceConfigCommonP->pdsch_ConfigCommon.referenceSignalPower;
+ cfg->nfapi_config.max_transmit_power.value = cfg->rf_config.reference_signal_power.value +
+ power_off_dB[cfg->rf_config.dl_channel_bandwidth.value];
+
+ cfg->prach_config.configuration_index.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.prach_ConfigIndex;
+ cfg->prach_config.root_sequence_index.value = radioResourceConfigCommonP->prach_Config.rootSequenceIndex;
+ cfg->prach_config.zero_correlation_zone_configuration.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
+ cfg->prach_config.high_speed_flag.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.highSpeedFlag;
+ cfg->prach_config.frequency_offset.value = radioResourceConfigCommonP->prach_Config.prach_ConfigInfo.prach_FreqOffset;
+
+ cfg->pusch_config.hopping_mode.value = radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode;
+ cfg->pusch_config.number_of_subbands.value = radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.n_SB;
+ cfg->pusch_config.hopping_offset.value = radioResourceConfigCommonP->pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset;
+
+ cfg->pucch_config.delta_pucch_shift.value = radioResourceConfigCommonP->pucch_ConfigCommon.deltaPUCCH_Shift;
+ cfg->pucch_config.n_cqi_rb.value = radioResourceConfigCommonP->pucch_ConfigCommon.nRB_CQI;
+ cfg->pucch_config.n_an_cs.value = radioResourceConfigCommonP->pucch_ConfigCommon.nCS_AN;
+ cfg->pucch_config.n1_pucch_an.value = radioResourceConfigCommonP->pucch_ConfigCommon.n1PUCCH_AN;
+
+ if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled == true)
+ cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 1;
+ else if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled == true)
+ cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 2;
+ else // No hopping
+ cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 0;
+
+ cfg->uplink_reference_signal_config.group_assignment.value = radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH;
+ cfg->uplink_reference_signal_config.cyclic_shift_1_for_drms.value = radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift;
+
+ // how to enable/disable SRS?
+ if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.present == SoundingRS_UL_ConfigCommon_PR_setup) {
+ cfg->srs_config.bandwidth_configuration.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_BandwidthConfig;
+ cfg->srs_config.srs_subframe_configuration.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_SubframeConfig;
+ cfg->srs_config.srs_acknack_srs_simultaneous_transmission.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.ackNackSRS_SimultaneousTransmission;
+
+ if (radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.srs_MaxUpPts)
+ cfg->srs_config.max_up_pts.value = 1;
+ else
+ cfg->srs_config.max_up_pts.value = 0;
+ }
#ifdef Rel14
- if (RC.mac[Mod_idP]->common_channels[CC_idP].mib->
- message.schedulingInfoSIB1_BR_r13 > 0) {
- AssertFatal(radioResourceConfigCommon_BRP != NULL,
- "radioResource rou is missing\n");
- AssertFatal(radioResourceConfigCommon_BRP->ext4 != NULL,
- "ext4 is missing\n");
- cfg->emtc_config.prach_catm_root_sequence_index.value =
- radioResourceConfigCommon_BRP->prach_Config.rootSequenceIndex;
- cfg->emtc_config.prach_catm_zero_correlation_zone_configuration.
- value =
- radioResourceConfigCommon_BRP->prach_Config.
- prach_ConfigInfo.zeroCorrelationZoneConfig;
- cfg->emtc_config.prach_catm_high_speed_flag.value =
- radioResourceConfigCommon_BRP->prach_Config.
- prach_ConfigInfo.highSpeedFlag;
-
- struct PRACH_ConfigSIB_v1310 *ext4_prach =
- radioResourceConfigCommon_BRP->ext4->prach_ConfigCommon_v1310;
-
- PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 =
- &ext4_prach->prach_ParametersListCE_r13;
-
- PRACH_ParametersCE_r13_t *p;
- cfg->emtc_config.prach_ce_level_0_enable.value = 0;
- cfg->emtc_config.prach_ce_level_1_enable.value = 0;
- cfg->emtc_config.prach_ce_level_2_enable.value = 0;
- cfg->emtc_config.prach_ce_level_3_enable.value = 0;
- switch (prach_ParametersListCE_r13->list.count) {
- case 4:
- p = prach_ParametersListCE_r13->list.array[3];
- cfg->emtc_config.prach_ce_level_3_enable.value = 1;
- cfg->emtc_config.prach_ce_level_3_configuration_index.value =
- p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_3_frequency_offset.value =
- p->prach_FreqOffset_r13;
- cfg->
- emtc_config.prach_ce_level_3_number_of_repetitions_per_attempt.
- value = p->numRepetitionPerPreambleAttempt_r13;
- if (p->prach_StartingSubframe_r13)
- cfg->
- emtc_config.prach_ce_level_3_starting_subframe_periodicity.
- value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_3_hopping_enable.value =
- p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_3_hopping_offset.value =
- cfg->rf_config.ul_channel_bandwidth.value - 6;
- case 3:
- p = prach_ParametersListCE_r13->list.array[2];
- cfg->emtc_config.prach_ce_level_2_enable.value = 1;
- cfg->emtc_config.prach_ce_level_2_configuration_index.value =
- p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_2_frequency_offset.value =
- p->prach_FreqOffset_r13;
- cfg->
- emtc_config.prach_ce_level_2_number_of_repetitions_per_attempt.
- value = p->numRepetitionPerPreambleAttempt_r13;
- if (p->prach_StartingSubframe_r13)
- cfg->
- emtc_config.prach_ce_level_2_starting_subframe_periodicity.
- value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_2_hopping_enable.value =
- p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_2_hopping_offset.value =
- cfg->rf_config.ul_channel_bandwidth.value - 6;
- case 2:
- p = prach_ParametersListCE_r13->list.array[1];
- cfg->emtc_config.prach_ce_level_1_enable.value = 1;
- cfg->emtc_config.prach_ce_level_1_configuration_index.value =
- p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_1_frequency_offset.value =
- p->prach_FreqOffset_r13;
- cfg->
- emtc_config.prach_ce_level_1_number_of_repetitions_per_attempt.
- value = p->numRepetitionPerPreambleAttempt_r13;
- if (p->prach_StartingSubframe_r13)
- cfg->
- emtc_config.prach_ce_level_1_starting_subframe_periodicity.
- value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_1_hopping_enable.value =
- p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_1_hopping_offset.value =
- cfg->rf_config.ul_channel_bandwidth.value - 6;
- case 1:
- p = prach_ParametersListCE_r13->list.array[0];
- cfg->emtc_config.prach_ce_level_0_enable.value = 1;
- cfg->emtc_config.prach_ce_level_0_configuration_index.value =
- p->prach_ConfigIndex_r13;
- cfg->emtc_config.prach_ce_level_0_frequency_offset.value =
- p->prach_FreqOffset_r13;
- cfg->
- emtc_config.prach_ce_level_0_number_of_repetitions_per_attempt.
- value = p->numRepetitionPerPreambleAttempt_r13;
- if (p->prach_StartingSubframe_r13)
- cfg->
- emtc_config.prach_ce_level_0_starting_subframe_periodicity.
- value = *p->prach_StartingSubframe_r13;
- cfg->emtc_config.prach_ce_level_0_hopping_enable.value =
- p->prach_HoppingConfig_r13;
- cfg->emtc_config.prach_ce_level_0_hopping_offset.value =
- cfg->rf_config.ul_channel_bandwidth.value - 6;
- }
+ if (RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.schedulingInfoSIB1_BR_r13 > 0) {
+ AssertFatal(radioResourceConfigCommon_BRP != NULL,
+ "radioResource rou is missing\n");
+ AssertFatal(radioResourceConfigCommon_BRP->ext4 != NULL,
+ "ext4 is missing\n");
+ cfg->emtc_config.prach_catm_root_sequence_index.value = radioResourceConfigCommon_BRP->prach_Config.rootSequenceIndex;
+ cfg->emtc_config.prach_catm_zero_correlation_zone_configuration.value = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
+ cfg->emtc_config.prach_catm_high_speed_flag.value = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.highSpeedFlag;
+
+ struct PRACH_ConfigSIB_v1310 *ext4_prach = radioResourceConfigCommon_BRP->ext4->prach_ConfigCommon_v1310;
+
+ PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
+
+ PRACH_ParametersCE_r13_t *p;
+ cfg->emtc_config.prach_ce_level_0_enable.value = 0;
+ cfg->emtc_config.prach_ce_level_1_enable.value = 0;
+ cfg->emtc_config.prach_ce_level_2_enable.value = 0;
+ cfg->emtc_config.prach_ce_level_3_enable.value = 0;
+ switch (prach_ParametersListCE_r13->list.count) {
+ case 4:
+ p = prach_ParametersListCE_r13->list.array[3];
+ cfg->emtc_config.prach_ce_level_3_enable.value = 1;
+ cfg->emtc_config.prach_ce_level_3_configuration_index.value = p->prach_ConfigIndex_r13;
+ cfg->emtc_config.prach_ce_level_3_frequency_offset.value = p->prach_FreqOffset_r13;
+ cfg->emtc_config.prach_ce_level_3_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
+ if (p->prach_StartingSubframe_r13)
+ cfg->emtc_config.prach_ce_level_3_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
+ cfg->emtc_config.prach_ce_level_3_hopping_enable.value = p->prach_HoppingConfig_r13;
+ cfg->emtc_config.prach_ce_level_3_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
+ case 3:
+ p = prach_ParametersListCE_r13->list.array[2];
+ cfg->emtc_config.prach_ce_level_2_enable.value = 1;
+ cfg->emtc_config.prach_ce_level_2_configuration_index.value = p->prach_ConfigIndex_r13;
+ cfg->emtc_config.prach_ce_level_2_frequency_offset.value = p->prach_FreqOffset_r13;
+ cfg->emtc_config.prach_ce_level_2_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
+ if (p->prach_StartingSubframe_r13)
+ cfg->emtc_config.prach_ce_level_2_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
+ cfg->emtc_config.prach_ce_level_2_hopping_enable.value = p->prach_HoppingConfig_r13;
+ cfg->emtc_config.prach_ce_level_2_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
+ case 2:
+ p = prach_ParametersListCE_r13->list.array[1];
+ cfg->emtc_config.prach_ce_level_1_enable.value = 1;
+ cfg->emtc_config.prach_ce_level_1_configuration_index.value = p->prach_ConfigIndex_r13;
+ cfg->emtc_config.prach_ce_level_1_frequency_offset.value = p->prach_FreqOffset_r13;
+ cfg->emtc_config.prach_ce_level_1_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
+ if (p->prach_StartingSubframe_r13)
+ cfg->emtc_config.prach_ce_level_1_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
+ cfg->emtc_config.prach_ce_level_1_hopping_enable.value = p->prach_HoppingConfig_r13;
+ cfg->emtc_config.prach_ce_level_1_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
+ case 1:
+ p = prach_ParametersListCE_r13->list.array[0];
+ cfg->emtc_config.prach_ce_level_0_enable.value = 1;
+ cfg->emtc_config.prach_ce_level_0_configuration_index.value = p->prach_ConfigIndex_r13;
+ cfg->emtc_config.prach_ce_level_0_frequency_offset.value = p->prach_FreqOffset_r13;
+ cfg->emtc_config.prach_ce_level_0_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
+ if (p->prach_StartingSubframe_r13)
+ cfg->emtc_config.prach_ce_level_0_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
+ cfg->emtc_config.prach_ce_level_0_hopping_enable.value = p->prach_HoppingConfig_r13;
+ cfg->emtc_config.prach_ce_level_0_hopping_offset.value = cfg->rf_config.ul_channel_bandwidth.value - 6;
+ }
- struct FreqHoppingParameters_r13 *ext4_freqHoppingParameters =
- radioResourceConfigCommonP->ext4->freqHoppingParameters_r13;
- if ((ext4_freqHoppingParameters)
- &&
- (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13))
- {
- switch
- (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
- present) {
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_NOTHING: /* No components present */
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_FDD_r13:
- cfg->emtc_config.
- pucch_interval_ulhoppingconfigcommonmodea.value =
- ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
- choice.interval_FDD_r13;
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_TDD_r13:
- cfg->emtc_config.
- pucch_interval_ulhoppingconfigcommonmodea.value =
- ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
- choice.interval_TDD_r13;
- break;
- }
+ struct FreqHoppingParameters_r13 *ext4_freqHoppingParameters = radioResourceConfigCommonP->ext4->freqHoppingParameters_r13;
+ if ((ext4_freqHoppingParameters)&&
+ (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13))
+ {
+ switch (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->present) {
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_NOTHING: /* No components present */
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_FDD_r13:
+ cfg->emtc_config.pucch_interval_ulhoppingconfigcommonmodea.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
+ choice.interval_FDD_r13;
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_TDD_r13:
+ cfg->emtc_config.
+ pucch_interval_ulhoppingconfigcommonmodea.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeA_r13->
+ choice.interval_TDD_r13;
+ break;
}
- if ((ext4_freqHoppingParameters) &&
- (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13))
- {
- switch
- (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
- present) {
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_NOTHING: /* No components present */
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_FDD_r13:
- cfg->emtc_config.
- pucch_interval_ulhoppingconfigcommonmodeb.value =
- ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
- choice.interval_FDD_r13;
- break;
- case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_TDD_r13:
- cfg->emtc_config.
- pucch_interval_ulhoppingconfigcommonmodeb.value =
- ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
- choice.interval_TDD_r13;
- break;
- }
+ }
+ if ((ext4_freqHoppingParameters) &&
+ (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13))
+ {
+ switch
+ (ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
+ present) {
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_NOTHING: /* No components present */
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_FDD_r13:
+ cfg->emtc_config.
+ pucch_interval_ulhoppingconfigcommonmodeb.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
+ choice.interval_FDD_r13;
+ break;
+ case FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeB_r13_PR_interval_TDD_r13:
+ cfg->emtc_config.
+ pucch_interval_ulhoppingconfigcommonmodeb.value =
+ ext4_freqHoppingParameters->interval_ULHoppingConfigCommonModeB_r13->
+ choice.interval_TDD_r13;
+ break;
}
- }
+ }
+ }
#endif
}
@@ -597,273 +510,273 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
SystemInformationBlockType1_v1310_IEs_t *
sib1_v13ext
#endif
- )
+ )
{
- int i;
-
- int UE_id = -1;
- eNB_MAC_INST *eNB = RC.mac[Mod_idP];
- UE_list_t *UE_list = &eNB->UE_list;
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
-
-
- if (mib != NULL) {
- if (RC.mac == NULL)
- l2_init_eNB();
-
- mac_top_init_eNB();
-
- RC.mac[Mod_idP]->common_channels[CC_idP].mib = mib;
- RC.mac[Mod_idP]->common_channels[CC_idP].physCellId = physCellId;
- RC.mac[Mod_idP]->common_channels[CC_idP].p_eNB = p_eNB;
- RC.mac[Mod_idP]->common_channels[CC_idP].Ncp = Ncp;
- RC.mac[Mod_idP]->common_channels[CC_idP].eutra_band = eutra_band;
- RC.mac[Mod_idP]->common_channels[CC_idP].dl_CarrierFreq =
- dl_CarrierFreq;
-
- LOG_I(MAC,
- "Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d,Nid_cell %d,p %d,DL freq %u,phich_config.resource %d, phich_config.duration %d)\n",
- Mod_idP,
- CC_idP,
- eutra_band,
- to_prb((int) mib->message.dl_Bandwidth),
- physCellId,
- p_eNB,
- dl_CarrierFreq,
- (int) mib->message.phich_Config.phich_Resource,
- (int) mib->message.phich_Config.phich_Duration);
-
- config_mib(Mod_idP, CC_idP,
- eutra_band,
- mib->message.dl_Bandwidth,
- &mib->message.phich_Config,
- physCellId, Ncp, p_eNB, dl_CarrierFreq, ul_CarrierFreq
+ int i;
+
+ int UE_id = -1;
+ eNB_MAC_INST *eNB = RC.mac[Mod_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
+
+
+ if (mib != NULL) {
+ if (RC.mac == NULL)
+ l2_init_eNB();
+
+ mac_top_init_eNB();
+
+ RC.mac[Mod_idP]->common_channels[CC_idP].mib = mib;
+ RC.mac[Mod_idP]->common_channels[CC_idP].physCellId = physCellId;
+ RC.mac[Mod_idP]->common_channels[CC_idP].p_eNB = p_eNB;
+ RC.mac[Mod_idP]->common_channels[CC_idP].Ncp = Ncp;
+ RC.mac[Mod_idP]->common_channels[CC_idP].eutra_band = eutra_band;
+ RC.mac[Mod_idP]->common_channels[CC_idP].dl_CarrierFreq =
+ dl_CarrierFreq;
+
+ LOG_I(MAC,
+ "Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d,Nid_cell %d,p %d,DL freq %u,phich_config.resource %d, phich_config.duration %d)\n",
+ Mod_idP,
+ CC_idP,
+ eutra_band,
+ to_prb((int) mib->message.dl_Bandwidth),
+ physCellId,
+ p_eNB,
+ dl_CarrierFreq,
+ (int) mib->message.phich_Config.phich_Resource,
+ (int) mib->message.phich_Config.phich_Duration);
+
+ config_mib(Mod_idP, CC_idP,
+ eutra_band,
+ mib->message.dl_Bandwidth,
+ &mib->message.phich_Config,
+ physCellId, Ncp, p_eNB, dl_CarrierFreq, ul_CarrierFreq
#ifdef Rel14
- , pbch_repetition
+ , pbch_repetition
#endif
- );
-
- mac_init_cell_params(Mod_idP, CC_idP);
- }
- if (schedulingInfoList != NULL) {
- RC.mac[Mod_idP]->common_channels[CC_idP].tdd_Config = tdd_Config;
- RC.mac[Mod_idP]->common_channels[CC_idP].schedulingInfoList =
- schedulingInfoList;
- config_sib1(Mod_idP, CC_idP, tdd_Config);
- }
+ );
+
+ mac_init_cell_params(Mod_idP, CC_idP);
+ }
+ if (schedulingInfoList != NULL) {
+ RC.mac[Mod_idP]->common_channels[CC_idP].tdd_Config = tdd_Config;
+ RC.mac[Mod_idP]->common_channels[CC_idP].schedulingInfoList =
+ schedulingInfoList;
+ config_sib1(Mod_idP, CC_idP, tdd_Config);
+ }
#ifdef Rel14
- if (sib1_v13ext != NULL) {
- RC.mac[Mod_idP]->common_channels[CC_idP].sib1_v13ext = sib1_v13ext;
- }
+ if (sib1_v13ext != NULL) {
+ RC.mac[Mod_idP]->common_channels[CC_idP].sib1_v13ext = sib1_v13ext;
+ }
#endif
- if (radioResourceConfigCommon != NULL) {
- LOG_I(MAC, "[CONFIG]SIB2/3 Contents (partial)\n");
- LOG_I(MAC, "[CONFIG]pusch_config_common.n_SB = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.n_SB);
- LOG_I(MAC, "[CONFIG]pusch_config_common.hoppingMode = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.pusch_HoppingOffset = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset);
- LOG_I(MAC, "[CONFIG]pusch_config_common.enable64QAM = %d\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.groupHoppingEnabled = %d\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- groupHoppingEnabled);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.groupAssignmentPUSCH = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- groupAssignmentPUSCH);
- LOG_I(MAC,
- "[CONFIG]pusch_config_common.sequenceHoppingEnabled = %d\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
- sequenceHoppingEnabled);
- LOG_I(MAC, "[CONFIG]pusch_config_common.cyclicShift = %ld\n",
- radioResourceConfigCommon->
- pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift);
-
- AssertFatal(radioResourceConfigCommon->
- rach_ConfigCommon.maxHARQ_Msg3Tx > 0,
- "radioResourceconfigCommon %d == 0\n",
- (int) radioResourceConfigCommon->
- rach_ConfigCommon.maxHARQ_Msg3Tx);
-
- RC.mac[Mod_idP]->common_channels[CC_idP].
- radioResourceConfigCommon = radioResourceConfigCommon;
- if (ul_CarrierFreq > 0)
- RC.mac[Mod_idP]->common_channels[CC_idP].ul_CarrierFreq =
- ul_CarrierFreq;
- if (ul_Bandwidth)
- RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
- *ul_Bandwidth;
- else
- RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
- RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.
- dl_Bandwidth;
-
- config_sib2(Mod_idP, CC_idP, radioResourceConfigCommon,
+ if (radioResourceConfigCommon != NULL) {
+ LOG_I(MAC, "[CONFIG]SIB2/3 Contents (partial)\n");
+ LOG_I(MAC, "[CONFIG]pusch_config_common.n_SB = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.n_SB);
+ LOG_I(MAC, "[CONFIG]pusch_config_common.hoppingMode = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.pusch_HoppingOffset = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.pusch_HoppingOffset);
+ LOG_I(MAC, "[CONFIG]pusch_config_common.enable64QAM = %d\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.pusch_ConfigBasic.enable64QAM);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.groupHoppingEnabled = %d\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
+ groupHoppingEnabled);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.groupAssignmentPUSCH = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
+ groupAssignmentPUSCH);
+ LOG_I(MAC,
+ "[CONFIG]pusch_config_common.sequenceHoppingEnabled = %d\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.
+ sequenceHoppingEnabled);
+ LOG_I(MAC, "[CONFIG]pusch_config_common.cyclicShift = %ld\n",
+ radioResourceConfigCommon->
+ pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.cyclicShift);
+
+ AssertFatal(radioResourceConfigCommon->
+ rach_ConfigCommon.maxHARQ_Msg3Tx > 0,
+ "radioResourceconfigCommon %d == 0\n",
+ (int) radioResourceConfigCommon->
+ rach_ConfigCommon.maxHARQ_Msg3Tx);
+
+ RC.mac[Mod_idP]->common_channels[CC_idP].
+ radioResourceConfigCommon = radioResourceConfigCommon;
+ if (ul_CarrierFreq > 0)
+ RC.mac[Mod_idP]->common_channels[CC_idP].ul_CarrierFreq =
+ ul_CarrierFreq;
+ if (ul_Bandwidth)
+ RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
+ *ul_Bandwidth;
+ else
+ RC.mac[Mod_idP]->common_channels[CC_idP].ul_Bandwidth =
+ RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.
+ dl_Bandwidth;
+
+ config_sib2(Mod_idP, CC_idP, radioResourceConfigCommon,
#ifdef Rel14
- radioResourceConfigCommon_BR,
+ radioResourceConfigCommon_BR,
#endif
- NULL, ul_Bandwidth, additionalSpectrumEmission,
- mbsfn_SubframeConfigList);
-
-
- }
- // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
- if (logicalChannelConfig != NULL) { // check for eMTC specific things
- UE_id = find_UE_id(Mod_idP, rntiP);
-
- if (UE_id == -1) {
- LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
- __LINE__, __FUNCTION__);
- } else {
- if (logicalChannelConfig)
- UE_list->
- UE_template[CC_idP][UE_id].lcgidmap
- [logicalChannelIdentity] =
- *logicalChannelConfig->
- ul_SpecificParameters->logicalChannelGroup;
- else
- UE_list->
- UE_template[CC_idP][UE_id].lcgidmap
- [logicalChannelIdentity] = 0;
- }
+ NULL, ul_Bandwidth, additionalSpectrumEmission,
+ mbsfn_SubframeConfigList);
+
+
+ }
+ // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
+ if (logicalChannelConfig != NULL) { // check for eMTC specific things
+ UE_id = find_UE_id(Mod_idP, rntiP);
+
+ if (UE_id == -1) {
+ LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
+ __LINE__, __FUNCTION__);
+ } else {
+ if (logicalChannelConfig)
+ UE_list->
+ UE_template[CC_idP][UE_id].lcgidmap
+ [logicalChannelIdentity] =
+ *logicalChannelConfig->
+ ul_SpecificParameters->logicalChannelGroup;
+ else
+ UE_list->
+ UE_template[CC_idP][UE_id].lcgidmap
+ [logicalChannelIdentity] = 0;
}
+ }
- if (physicalConfigDedicated != NULL) {
- UE_id = find_UE_id(Mod_idP, rntiP);
+ if (physicalConfigDedicated != NULL) {
+ UE_id = find_UE_id(Mod_idP, rntiP);
- if (UE_id == -1)
- LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
- __LINE__, __FUNCTION__);
- else
- UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated =
- physicalConfigDedicated;
- }
+ if (UE_id == -1)
+ LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
+ __LINE__, __FUNCTION__);
+ else
+ UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated =
+ physicalConfigDedicated;
+ }
#if defined(Rel10) || defined(Rel14)
- if (sCellToAddMod_r10 != NULL) {
- UE_id = find_UE_id(Mod_idP, rntiP);
- if (UE_id == -1)
- LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
- __LINE__, __FUNCTION__);
- else
- config_dedicated_scell(Mod_idP, rntiP, sCellToAddMod_r10);
+ if (sCellToAddMod_r10 != NULL) {
+ UE_id = find_UE_id(Mod_idP, rntiP);
+ if (UE_id == -1)
+ LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
+ __LINE__, __FUNCTION__);
+ else
+ config_dedicated_scell(Mod_idP, rntiP, sCellToAddMod_r10);
- }
+ }
#endif
- if (mbsfn_SubframeConfigList != NULL) {
- LOG_I(MAC,
- "[eNB %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
- Mod_idP, mbsfn_SubframeConfigList->list.count);
- RC.mac[Mod_idP]->common_channels[0].num_sf_allocation_pattern =
- mbsfn_SubframeConfigList->list.count;
+ if (mbsfn_SubframeConfigList != NULL) {
+ LOG_I(MAC,
+ "[eNB %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
+ Mod_idP, mbsfn_SubframeConfigList->list.count);
+ RC.mac[Mod_idP]->common_channels[0].num_sf_allocation_pattern =
+ mbsfn_SubframeConfigList->list.count;
- for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
- RC.mac[Mod_idP]->common_channels[0].mbsfn_SubframeConfig[i] =
- mbsfn_SubframeConfigList->list.array[i];
- LOG_I(MAC,
- "[eNB %d][CONFIG] MBSFN_SubframeConfig[%d] pattern is %x\n",
- Mod_idP, i,
- RC.mac[Mod_idP]->
- common_channels[0].mbsfn_SubframeConfig[i]->
- subframeAllocation.choice.oneFrame.buf[0]);
- }
+ for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
+ RC.mac[Mod_idP]->common_channels[0].mbsfn_SubframeConfig[i] =
+ mbsfn_SubframeConfigList->list.array[i];
+ LOG_I(MAC,
+ "[eNB %d][CONFIG] MBSFN_SubframeConfig[%d] pattern is %x\n",
+ Mod_idP, i,
+ RC.mac[Mod_idP]->
+ common_channels[0].mbsfn_SubframeConfig[i]->
+ subframeAllocation.choice.oneFrame.buf[0]);
+ }
#ifdef Rel10
- RC.mac[Mod_idP]->common_channels[0].MBMS_flag = MBMS_Flag;
+ RC.mac[Mod_idP]->common_channels[0].MBMS_flag = MBMS_Flag;
#endif
- }
+ }
#if defined(Rel10) || defined(Rel14)
- if (mbsfn_AreaInfoList != NULL) {
- // One eNB could be part of multiple mbsfn syc area, this could change over time so reset each time
- LOG_I(MAC, "[eNB %d][CONFIG] Received %d MBSFN Area Info\n",
- Mod_idP, mbsfn_AreaInfoList->list.count);
- RC.mac[Mod_idP]->common_channels[0].num_active_mbsfn_area =
- mbsfn_AreaInfoList->list.count;
-
- for (i = 0; i < mbsfn_AreaInfoList->list.count; i++) {
- RC.mac[Mod_idP]->common_channels[0].mbsfn_AreaInfo[i] =
- mbsfn_AreaInfoList->list.array[i];
- LOG_I(MAC,
- "[eNB %d][CONFIG] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld\n",
- Mod_idP, i,
- RC.mac[Mod_idP]->common_channels[0].
- mbsfn_AreaInfo[i]->mcch_Config_r9.
- mcch_RepetitionPeriod_r9);
- // config_sib13(Mod_idP,0,i,RC.mac[Mod_idP]->common_channels[0].mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
- }
+ if (mbsfn_AreaInfoList != NULL) {
+ // One eNB could be part of multiple mbsfn syc area, this could change over time so reset each time
+ LOG_I(MAC, "[eNB %d][CONFIG] Received %d MBSFN Area Info\n",
+ Mod_idP, mbsfn_AreaInfoList->list.count);
+ RC.mac[Mod_idP]->common_channels[0].num_active_mbsfn_area =
+ mbsfn_AreaInfoList->list.count;
+
+ for (i = 0; i < mbsfn_AreaInfoList->list.count; i++) {
+ RC.mac[Mod_idP]->common_channels[0].mbsfn_AreaInfo[i] =
+ mbsfn_AreaInfoList->list.array[i];
+ LOG_I(MAC,
+ "[eNB %d][CONFIG] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld\n",
+ Mod_idP, i,
+ RC.mac[Mod_idP]->common_channels[0].
+ mbsfn_AreaInfo[i]->mcch_Config_r9.
+ mcch_RepetitionPeriod_r9);
+ // config_sib13(Mod_idP,0,i,RC.mac[Mod_idP]->common_channels[0].mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
}
-
- if (pmch_InfoList != NULL) {
-
- // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
-
- LOG_I(MAC, "[CONFIG] Number of PMCH in this MBSFN Area %d\n",
- pmch_InfoList->list.count);
-
- for (i = 0; i < pmch_InfoList->list.count; i++) {
- RC.mac[Mod_idP]->common_channels[0].pmch_Config[i] =
- &pmch_InfoList->list.array[i]->pmch_Config_r9;
-
- LOG_I(MAC,
- "[CONFIG] PMCH[%d]: This PMCH stop (sf_AllocEnd_r9) at subframe %ldth\n",
- i,
- RC.mac[Mod_idP]->common_channels[0].
- pmch_Config[i]->sf_AllocEnd_r9);
- LOG_I(MAC, "[CONFIG] PMCH[%d]: mch_Scheduling_Period = %ld\n",
- i,
- RC.mac[Mod_idP]->common_channels[0].
- pmch_Config[i]->mch_SchedulingPeriod_r9);
- LOG_I(MAC, "[CONFIG] PMCH[%d]: dataMCS = %ld\n", i,
- RC.mac[Mod_idP]->common_channels[0].
- pmch_Config[i]->dataMCS_r9);
-
- // MBMS session info list in each MCH
- RC.mac[Mod_idP]->common_channels[0].mbms_SessionList[i] =
- &pmch_InfoList->list.array[i]->mbms_SessionInfoList_r9;
- LOG_I(MAC, "PMCH[%d] Number of session (MTCH) is: %d\n", i,
- RC.mac[Mod_idP]->common_channels[0].
- mbms_SessionList[i]->list.count);
- }
+ }
+
+ if (pmch_InfoList != NULL) {
+
+ // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
+
+ LOG_I(MAC, "[CONFIG] Number of PMCH in this MBSFN Area %d\n",
+ pmch_InfoList->list.count);
+
+ for (i = 0; i < pmch_InfoList->list.count; i++) {
+ RC.mac[Mod_idP]->common_channels[0].pmch_Config[i] =
+ &pmch_InfoList->list.array[i]->pmch_Config_r9;
+
+ LOG_I(MAC,
+ "[CONFIG] PMCH[%d]: This PMCH stop (sf_AllocEnd_r9) at subframe %ldth\n",
+ i,
+ RC.mac[Mod_idP]->common_channels[0].
+ pmch_Config[i]->sf_AllocEnd_r9);
+ LOG_I(MAC, "[CONFIG] PMCH[%d]: mch_Scheduling_Period = %ld\n",
+ i,
+ RC.mac[Mod_idP]->common_channels[0].
+ pmch_Config[i]->mch_SchedulingPeriod_r9);
+ LOG_I(MAC, "[CONFIG] PMCH[%d]: dataMCS = %ld\n", i,
+ RC.mac[Mod_idP]->common_channels[0].
+ pmch_Config[i]->dataMCS_r9);
+
+ // MBMS session info list in each MCH
+ RC.mac[Mod_idP]->common_channels[0].mbms_SessionList[i] =
+ &pmch_InfoList->list.array[i]->mbms_SessionInfoList_r9;
+ LOG_I(MAC, "PMCH[%d] Number of session (MTCH) is: %d\n", i,
+ RC.mac[Mod_idP]->common_channels[0].
+ mbms_SessionList[i]->list.count);
}
+ }
#endif
- if (radioResourceConfigCommon != NULL) {
- AssertFatal(RC.mac[Mod_idP]->if_inst->PHY_config_req != NULL,
- "if_inst->phy_config_request is null\n");
- PHY_Config_t phycfg;
- phycfg.Mod_id = Mod_idP;
- phycfg.CC_id = CC_idP;
- phycfg.cfg = &RC.mac[Mod_idP]->config[CC_idP];
-
- if (RC.mac[Mod_idP]->if_inst->PHY_config_req)
- RC.mac[Mod_idP]->if_inst->PHY_config_req(&phycfg);
- }
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
-
- return (0);
+ if (radioResourceConfigCommon != NULL) {
+ AssertFatal(RC.mac[Mod_idP]->if_inst->PHY_config_req != NULL,
+ "if_inst->phy_config_request is null\n");
+ PHY_Config_t phycfg;
+ phycfg.Mod_id = Mod_idP;
+ phycfg.CC_id = CC_idP;
+ phycfg.cfg = &RC.mac[Mod_idP]->config[CC_idP];
+
+ if (RC.mac[Mod_idP]->if_inst->PHY_config_req)
+ RC.mac[Mod_idP]->if_inst->PHY_config_req(&phycfg);
+ }
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
+
+ return (0);
}
int
@@ -901,450 +814,450 @@ rrc_mac_config_req_ue(module_id_t Mod_idP,
#ifdef CBA
, uint8_t num_active_cba_groups, uint16_t cba_rnti
#endif
- )
+ )
{
- int i;
+ int i;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
- LOG_I(MAC, "[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",
- Mod_idP, eNB_index);
+ LOG_I(MAC, "[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",
+ Mod_idP, eNB_index);
- if (tdd_Config != NULL) {
- UE_mac_inst[Mod_idP].tdd_Config = tdd_Config;
- }
+ if (tdd_Config != NULL) {
+ UE_mac_inst[Mod_idP].tdd_Config = tdd_Config;
+ }
- if (tdd_Config && SIwindowsize && SIperiod) {
- phy_config_sib1_ue(Mod_idP, 0, eNB_index, tdd_Config,
- *SIwindowsize, *SIperiod);
- }
+ if (tdd_Config && SIwindowsize && SIperiod) {
+ phy_config_sib1_ue(Mod_idP, 0, eNB_index, tdd_Config,
+ *SIwindowsize, *SIperiod);
+ }
- if (radioResourceConfigCommon != NULL) {
- UE_mac_inst[Mod_idP].radioResourceConfigCommon =
- radioResourceConfigCommon;
- phy_config_sib2_ue(Mod_idP, 0, eNB_index,
- radioResourceConfigCommon, ul_CarrierFreq,
- ul_Bandwidth, additionalSpectrumEmission,
- mbsfn_SubframeConfigList);
- }
- // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
- if (logicalChannelConfig != NULL) {
- LOG_I(MAC,
- "[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",
- Mod_idP, eNB_index);
- UE_mac_inst[Mod_idP].logicalChannelConfig[logicalChannelIdentity] =
- logicalChannelConfig;
- UE_mac_inst[Mod_idP].scheduling_info.Bj[logicalChannelIdentity] = 0; // initilize the bucket for this lcid
-
- AssertFatal(logicalChannelConfig->ul_SpecificParameters != NULL,
- "[UE %d] LCID %ld NULL ul_SpecificParameters\n",
- Mod_idP, logicalChannelIdentity);
- UE_mac_inst[Mod_idP].scheduling_info.bucket_size[logicalChannelIdentity] = logicalChannelConfig->ul_SpecificParameters->prioritisedBitRate * logicalChannelConfig->ul_SpecificParameters->bucketSizeDuration; // set the max bucket size
- if (logicalChannelConfig->ul_SpecificParameters->
- logicalChannelGroup != NULL) {
- UE_mac_inst[Mod_idP].scheduling_info.
- LCGID[logicalChannelIdentity] =
- *logicalChannelConfig->ul_SpecificParameters->
- logicalChannelGroup;
- LOG_D(MAC,
- "[CONFIG][UE %d] LCID %ld is attached to the LCGID %ld\n",
- Mod_idP, logicalChannelIdentity,
- *logicalChannelConfig->
- ul_SpecificParameters->logicalChannelGroup);
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.
- LCGID[logicalChannelIdentity] = MAX_NUM_LCGID;
- }
- UE_mac_inst[Mod_idP].
- scheduling_info.LCID_buffer_remain[logicalChannelIdentity] = 0;
+ if (radioResourceConfigCommon != NULL) {
+ UE_mac_inst[Mod_idP].radioResourceConfigCommon =
+ radioResourceConfigCommon;
+ phy_config_sib2_ue(Mod_idP, 0, eNB_index,
+ radioResourceConfigCommon, ul_CarrierFreq,
+ ul_Bandwidth, additionalSpectrumEmission,
+ mbsfn_SubframeConfigList);
+ }
+ // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
+ if (logicalChannelConfig != NULL) {
+ LOG_I(MAC,
+ "[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",
+ Mod_idP, eNB_index);
+ UE_mac_inst[Mod_idP].logicalChannelConfig[logicalChannelIdentity] =
+ logicalChannelConfig;
+ UE_mac_inst[Mod_idP].scheduling_info.Bj[logicalChannelIdentity] = 0; // initilize the bucket for this lcid
+
+ AssertFatal(logicalChannelConfig->ul_SpecificParameters != NULL,
+ "[UE %d] LCID %ld NULL ul_SpecificParameters\n",
+ Mod_idP, logicalChannelIdentity);
+ UE_mac_inst[Mod_idP].scheduling_info.bucket_size[logicalChannelIdentity] = logicalChannelConfig->ul_SpecificParameters->prioritisedBitRate * logicalChannelConfig->ul_SpecificParameters->bucketSizeDuration; // set the max bucket size
+ if (logicalChannelConfig->ul_SpecificParameters->
+ logicalChannelGroup != NULL) {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ LCGID[logicalChannelIdentity] =
+ *logicalChannelConfig->ul_SpecificParameters->
+ logicalChannelGroup;
+ LOG_D(MAC,
+ "[CONFIG][UE %d] LCID %ld is attached to the LCGID %ld\n",
+ Mod_idP, logicalChannelIdentity,
+ *logicalChannelConfig->
+ ul_SpecificParameters->logicalChannelGroup);
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ LCGID[logicalChannelIdentity] = MAX_NUM_LCGID;
}
+ UE_mac_inst[Mod_idP].
+ scheduling_info.LCID_buffer_remain[logicalChannelIdentity] = 0;
+ }
+
+ if (mac_MainConfig != NULL) {
+ LOG_I(MAC,
+ "[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",
+ Mod_idP, eNB_index);
+ UE_mac_inst[Mod_idP].macConfig = mac_MainConfig;
+ UE_mac_inst[Mod_idP].measGapConfig = measGapConfig;
+
+ if (mac_MainConfig->ul_SCH_Config) {
- if (mac_MainConfig != NULL) {
- LOG_I(MAC,
- "[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",
- Mod_idP, eNB_index);
- UE_mac_inst[Mod_idP].macConfig = mac_MainConfig;
- UE_mac_inst[Mod_idP].measGapConfig = measGapConfig;
-
- if (mac_MainConfig->ul_SCH_Config) {
-
- if (mac_MainConfig->ul_SCH_Config->periodicBSR_Timer) {
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
- (uint16_t) *
- mac_MainConfig->ul_SCH_Config->periodicBSR_Timer;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
+ if (mac_MainConfig->ul_SCH_Config->periodicBSR_Timer) {
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
+ (uint16_t) *
+ mac_MainConfig->ul_SCH_Config->periodicBSR_Timer;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_Timer =
#ifndef Rel14
- (uint16_t)
- MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_infinity
+ (uint16_t)
+ MAC_MainConfig__ul_SCH_Config__periodicBSR_Timer_infinity
#else
- (uint16_t) PeriodicBSR_Timer_r12_infinity;
+ (uint16_t) PeriodicBSR_Timer_r12_infinity;
#endif
- ;
- }
-
- if (mac_MainConfig->ul_SCH_Config->maxHARQ_Tx) {
- UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
- (uint16_t) * mac_MainConfig->ul_SCH_Config->maxHARQ_Tx;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
- (uint16_t)
- MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
- }
- phy_config_harq_ue(Mod_idP, 0, eNB_index,
- UE_mac_inst[Mod_idP].
- scheduling_info.maxHARQ_Tx);
-
- if (mac_MainConfig->ul_SCH_Config->retxBSR_Timer) {
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
- (uint16_t) mac_MainConfig->ul_SCH_Config->
- retxBSR_Timer;
- } else {
+ ;
+ }
+
+ if (mac_MainConfig->ul_SCH_Config->maxHARQ_Tx) {
+ UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
+ (uint16_t) * mac_MainConfig->ul_SCH_Config->maxHARQ_Tx;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.maxHARQ_Tx =
+ (uint16_t)
+ MAC_MainConfig__ul_SCH_Config__maxHARQ_Tx_n5;
+ }
+ phy_config_harq_ue(Mod_idP, 0, eNB_index,
+ UE_mac_inst[Mod_idP].
+ scheduling_info.maxHARQ_Tx);
+
+ if (mac_MainConfig->ul_SCH_Config->retxBSR_Timer) {
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
+ (uint16_t) mac_MainConfig->ul_SCH_Config->
+ retxBSR_Timer;
+ } else {
#ifndef Rel14
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
- (uint16_t)
- MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf2560;
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
+ (uint16_t)
+ MAC_MainConfig__ul_SCH_Config__retxBSR_Timer_sf2560;
#else
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
- (uint16_t) RetxBSR_Timer_r12_sf2560;
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_Timer =
+ (uint16_t) RetxBSR_Timer_r12_sf2560;
#endif
- }
- }
+ }
+ }
#if defined(Rel10) || defined(Rel14)
- if (mac_MainConfig->ext1
- && mac_MainConfig->ext1->sr_ProhibitTimer_r9) {
- UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer =
- (uint16_t) * mac_MainConfig->ext1->sr_ProhibitTimer_r9;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer = 0;
- }
+ if (mac_MainConfig->ext1
+ && mac_MainConfig->ext1->sr_ProhibitTimer_r9) {
+ UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer =
+ (uint16_t) * mac_MainConfig->ext1->sr_ProhibitTimer_r9;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.sr_ProhibitTimer = 0;
+ }
- if (mac_MainConfig->ext2
- && mac_MainConfig->ext2->mac_MainConfig_v1020) {
- if (mac_MainConfig->ext2->
- mac_MainConfig_v1020->extendedBSR_Sizes_r10) {
- UE_mac_inst[Mod_idP].scheduling_info.
- extendedBSR_Sizes_r10 =
- (uint16_t) *
- mac_MainConfig->ext2->
- mac_MainConfig_v1020->extendedBSR_Sizes_r10;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.
- extendedBSR_Sizes_r10 = (uint16_t) 0;
- }
- if (mac_MainConfig->ext2->mac_MainConfig_v1020->
- extendedPHR_r10) {
- UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
- (uint16_t) *
- mac_MainConfig->ext2->mac_MainConfig_v1020->
- extendedPHR_r10;
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
- (uint16_t) 0;
- }
- } else {
- UE_mac_inst[Mod_idP].scheduling_info.extendedBSR_Sizes_r10 =
- (uint16_t) 0;
- UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
- (uint16_t) 0;
- }
+ if (mac_MainConfig->ext2
+ && mac_MainConfig->ext2->mac_MainConfig_v1020) {
+ if (mac_MainConfig->ext2->
+ mac_MainConfig_v1020->extendedBSR_Sizes_r10) {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ extendedBSR_Sizes_r10 =
+ (uint16_t) *
+ mac_MainConfig->ext2->
+ mac_MainConfig_v1020->extendedBSR_Sizes_r10;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.
+ extendedBSR_Sizes_r10 = (uint16_t) 0;
+ }
+ if (mac_MainConfig->ext2->mac_MainConfig_v1020->
+ extendedPHR_r10) {
+ UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
+ (uint16_t) *
+ mac_MainConfig->ext2->mac_MainConfig_v1020->
+ extendedPHR_r10;
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
+ (uint16_t) 0;
+ }
+ } else {
+ UE_mac_inst[Mod_idP].scheduling_info.extendedBSR_Sizes_r10 =
+ (uint16_t) 0;
+ UE_mac_inst[Mod_idP].scheduling_info.extendedPHR_r10 =
+ (uint16_t) 0;
+ }
#endif
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF =
- MAC_UE_BSR_TIMER_NOT_RUNNING;
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF =
- MAC_UE_BSR_TIMER_NOT_RUNNING;
-
- UE_mac_inst[Mod_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
-
- LOG_D(MAC, "[UE %d]: periodic BSR %d (SF), retx BSR %d (SF)\n",
- Mod_idP,
- UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF,
- UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF);
-
- UE_mac_inst[Mod_idP].scheduling_info.drx_config =
- mac_MainConfig->drx_Config;
- UE_mac_inst[Mod_idP].scheduling_info.phr_config =
- mac_MainConfig->phr_Config;
-
- if (mac_MainConfig->phr_Config) {
- UE_mac_inst[Mod_idP].PHR_state =
- mac_MainConfig->phr_Config->present;
- UE_mac_inst[Mod_idP].PHR_reconfigured = 1;
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
- mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer;
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
- mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer;
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
- mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange;
- } else {
- UE_mac_inst[Mod_idP].PHR_reconfigured = 0;
- UE_mac_inst[Mod_idP].PHR_state =
- MAC_MainConfig__phr_Config_PR_setup;
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
- MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
- MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
- MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;
- }
-
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF =
- get_sf_perioidicPHR_Timer(UE_mac_inst[Mod_idP].
- scheduling_info.periodicPHR_Timer);
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF =
- get_sf_prohibitPHR_Timer(UE_mac_inst[Mod_idP].
- scheduling_info.prohibitPHR_Timer);
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db =
- get_db_dl_PathlossChange(UE_mac_inst[Mod_idP].
- scheduling_info.PathlossChange);
- UE_mac_inst[Mod_idP].PHR_reporting_active = 0;
- LOG_D(MAC,
- "[UE %d] config PHR (%d): periodic %d (SF) prohibit %d (SF) pathlosschange %d (db) \n",
- Mod_idP,
- (mac_MainConfig->phr_Config) ? mac_MainConfig->
- phr_Config->present : -1,
- UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF,
- UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF,
- UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db);
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF =
+ MAC_UE_BSR_TIMER_NOT_RUNNING;
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF =
+ MAC_UE_BSR_TIMER_NOT_RUNNING;
+
+ UE_mac_inst[Mod_idP].BSR_reporting_active = BSR_TRIGGER_NONE;
+
+ LOG_D(MAC, "[UE %d]: periodic BSR %d (SF), retx BSR %d (SF)\n",
+ Mod_idP,
+ UE_mac_inst[Mod_idP].scheduling_info.periodicBSR_SF,
+ UE_mac_inst[Mod_idP].scheduling_info.retxBSR_SF);
+
+ UE_mac_inst[Mod_idP].scheduling_info.drx_config =
+ mac_MainConfig->drx_Config;
+ UE_mac_inst[Mod_idP].scheduling_info.phr_config =
+ mac_MainConfig->phr_Config;
+
+ if (mac_MainConfig->phr_Config) {
+ UE_mac_inst[Mod_idP].PHR_state =
+ mac_MainConfig->phr_Config->present;
+ UE_mac_inst[Mod_idP].PHR_reconfigured = 1;
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
+ mac_MainConfig->phr_Config->choice.setup.periodicPHR_Timer;
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
+ mac_MainConfig->phr_Config->choice.setup.prohibitPHR_Timer;
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
+ mac_MainConfig->phr_Config->choice.setup.dl_PathlossChange;
+ } else {
+ UE_mac_inst[Mod_idP].PHR_reconfigured = 0;
+ UE_mac_inst[Mod_idP].PHR_state =
+ MAC_MainConfig__phr_Config_PR_setup;
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_Timer =
+ MAC_MainConfig__phr_Config__setup__periodicPHR_Timer_sf20;
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_Timer =
+ MAC_MainConfig__phr_Config__setup__prohibitPHR_Timer_sf20;
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange =
+ MAC_MainConfig__phr_Config__setup__dl_PathlossChange_dB1;
}
-
- if (physicalConfigDedicated != NULL) {
- phy_config_dedicated_ue(Mod_idP, 0, eNB_index,
- physicalConfigDedicated);
- UE_mac_inst[Mod_idP].physicalConfigDedicated = physicalConfigDedicated; // for SR proc
- }
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF =
+ get_sf_perioidicPHR_Timer(UE_mac_inst[Mod_idP].
+ scheduling_info.periodicPHR_Timer);
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF =
+ get_sf_prohibitPHR_Timer(UE_mac_inst[Mod_idP].
+ scheduling_info.prohibitPHR_Timer);
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db =
+ get_db_dl_PathlossChange(UE_mac_inst[Mod_idP].
+ scheduling_info.PathlossChange);
+ UE_mac_inst[Mod_idP].PHR_reporting_active = 0;
+ LOG_D(MAC,
+ "[UE %d] config PHR (%d): periodic %d (SF) prohibit %d (SF) pathlosschange %d (db) \n",
+ Mod_idP,
+ (mac_MainConfig->phr_Config) ? mac_MainConfig->
+ phr_Config->present : -1,
+ UE_mac_inst[Mod_idP].scheduling_info.periodicPHR_SF,
+ UE_mac_inst[Mod_idP].scheduling_info.prohibitPHR_SF,
+ UE_mac_inst[Mod_idP].scheduling_info.PathlossChange_db);
+ }
+
+
+ if (physicalConfigDedicated != NULL) {
+ phy_config_dedicated_ue(Mod_idP, 0, eNB_index,
+ physicalConfigDedicated);
+ UE_mac_inst[Mod_idP].physicalConfigDedicated = physicalConfigDedicated; // for SR proc
+ }
#if defined(Rel10) || defined(Rel14)
- if (sCellToAddMod_r10 != NULL) {
+ if (sCellToAddMod_r10 != NULL) {
- phy_config_dedicated_scell_ue(Mod_idP, eNB_index,
- sCellToAddMod_r10, 1);
- UE_mac_inst[Mod_idP].physicalConfigDedicatedSCell_r10 = sCellToAddMod_r10->radioResourceConfigDedicatedSCell_r10->physicalConfigDedicatedSCell_r10; // using SCell index 0
- }
+ phy_config_dedicated_scell_ue(Mod_idP, eNB_index,
+ sCellToAddMod_r10, 1);
+ UE_mac_inst[Mod_idP].physicalConfigDedicatedSCell_r10 = sCellToAddMod_r10->radioResourceConfigDedicatedSCell_r10->physicalConfigDedicatedSCell_r10; // using SCell index 0
+ }
#endif
- if (measObj != NULL) {
- if (measObj[0] != NULL) {
- UE_mac_inst[Mod_idP].n_adj_cells =
- measObj[0]->measObject.choice.
- measObjectEUTRA.cellsToAddModList->list.count;
- LOG_I(MAC, "Number of adjacent cells %d\n",
- UE_mac_inst[Mod_idP].n_adj_cells);
-
- for (i = 0; i < UE_mac_inst[Mod_idP].n_adj_cells; i++) {
- UE_mac_inst[Mod_idP].adj_cell_id[i] =
- measObj[0]->measObject.choice.
- measObjectEUTRA.cellsToAddModList->list.array[i]->
- physCellId;
- LOG_I(MAC, "Cell %d : Nid_cell %d\n", i,
- UE_mac_inst[Mod_idP].adj_cell_id[i]);
- }
-
- phy_config_meas_ue(Mod_idP, 0, eNB_index,
- UE_mac_inst[Mod_idP].n_adj_cells,
- UE_mac_inst[Mod_idP].adj_cell_id);
- }
+ if (measObj != NULL) {
+ if (measObj[0] != NULL) {
+ UE_mac_inst[Mod_idP].n_adj_cells =
+ measObj[0]->measObject.choice.
+ measObjectEUTRA.cellsToAddModList->list.count;
+ LOG_I(MAC, "Number of adjacent cells %d\n",
+ UE_mac_inst[Mod_idP].n_adj_cells);
+
+ for (i = 0; i < UE_mac_inst[Mod_idP].n_adj_cells; i++) {
+ UE_mac_inst[Mod_idP].adj_cell_id[i] =
+ measObj[0]->measObject.choice.
+ measObjectEUTRA.cellsToAddModList->list.array[i]->
+ physCellId;
+ LOG_I(MAC, "Cell %d : Nid_cell %d\n", i,
+ UE_mac_inst[Mod_idP].adj_cell_id[i]);
+ }
+
+ phy_config_meas_ue(Mod_idP, 0, eNB_index,
+ UE_mac_inst[Mod_idP].n_adj_cells,
+ UE_mac_inst[Mod_idP].adj_cell_id);
}
+ }
- if (mobilityControlInfo != NULL) {
+ if (mobilityControlInfo != NULL) {
- LOG_D(MAC, "[UE%d] MAC Reset procedure triggered by RRC eNB %d \n",
- Mod_idP, eNB_index);
- ue_mac_reset(Mod_idP, eNB_index);
-
- if (mobilityControlInfo->radioResourceConfigCommon.
- rach_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- rach_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.rach_ConfigCommon,
- sizeof(RACH_ConfigCommon_t));
- }
-
- memcpy((void *) &UE_mac_inst[Mod_idP].
- radioResourceConfigCommon->prach_Config.prach_ConfigInfo,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.prach_Config.prach_ConfigInfo,
- sizeof(PRACH_ConfigInfo_t));
- UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- prach_Config.rootSequenceIndex =
- mobilityControlInfo->radioResourceConfigCommon.
- prach_Config.rootSequenceIndex;
-
- if (mobilityControlInfo->radioResourceConfigCommon.
- pdsch_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- pdsch_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.pdsch_ConfigCommon,
- sizeof(PDSCH_ConfigCommon_t));
- }
- // not a pointer: mobilityControlInfo->radioResourceConfigCommon.pusch_ConfigCommon
- memcpy((void *) &UE_mac_inst[Mod_idP].
- radioResourceConfigCommon->pusch_ConfigCommon,
- (void *) &mobilityControlInfo->
- radioResourceConfigCommon.pusch_ConfigCommon,
- sizeof(PUSCH_ConfigCommon_t));
-
- if (mobilityControlInfo->radioResourceConfigCommon.phich_Config) {
- /* memcpy((void *)&UE_mac_inst[Mod_idP].radioResourceConfigCommon->phich_Config,
- (void *)mobilityControlInfo->radioResourceConfigCommon.phich_Config,
- sizeof(PHICH_Config_t)); */
- }
-
- if (mobilityControlInfo->radioResourceConfigCommon.
- pucch_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- pucch_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.pucch_ConfigCommon,
- sizeof(PUCCH_ConfigCommon_t));
- }
+ LOG_D(MAC, "[UE%d] MAC Reset procedure triggered by RRC eNB %d \n",
+ Mod_idP, eNB_index);
+ ue_mac_reset(Mod_idP, eNB_index);
+
+ if (mobilityControlInfo->radioResourceConfigCommon.
+ rach_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ rach_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.rach_ConfigCommon,
+ sizeof(RACH_ConfigCommon_t));
+ }
- if (mobilityControlInfo->
- radioResourceConfigCommon.soundingRS_UL_ConfigCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- soundingRS_UL_ConfigCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.soundingRS_UL_ConfigCommon,
- sizeof(SoundingRS_UL_ConfigCommon_t));
- }
+ memcpy((void *) &UE_mac_inst[Mod_idP].
+ radioResourceConfigCommon->prach_Config.prach_ConfigInfo,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.prach_Config.prach_ConfigInfo,
+ sizeof(PRACH_ConfigInfo_t));
+ UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ prach_Config.rootSequenceIndex =
+ mobilityControlInfo->radioResourceConfigCommon.
+ prach_Config.rootSequenceIndex;
+
+ if (mobilityControlInfo->radioResourceConfigCommon.
+ pdsch_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ pdsch_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.pdsch_ConfigCommon,
+ sizeof(PDSCH_ConfigCommon_t));
+ }
+ // not a pointer: mobilityControlInfo->radioResourceConfigCommon.pusch_ConfigCommon
+ memcpy((void *) &UE_mac_inst[Mod_idP].
+ radioResourceConfigCommon->pusch_ConfigCommon,
+ (void *) &mobilityControlInfo->
+ radioResourceConfigCommon.pusch_ConfigCommon,
+ sizeof(PUSCH_ConfigCommon_t));
+
+ if (mobilityControlInfo->radioResourceConfigCommon.phich_Config) {
+ /* memcpy((void *)&UE_mac_inst[Mod_idP].radioResourceConfigCommon->phich_Config,
+ (void *)mobilityControlInfo->radioResourceConfigCommon.phich_Config,
+ sizeof(PHICH_Config_t)); */
+ }
- if (mobilityControlInfo->
- radioResourceConfigCommon.uplinkPowerControlCommon) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- uplinkPowerControlCommon,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.uplinkPowerControlCommon,
- sizeof(UplinkPowerControlCommon_t));
- }
- //configure antennaInfoCommon somewhere here..
- if (mobilityControlInfo->radioResourceConfigCommon.p_Max) {
- //to be configured
- }
+ if (mobilityControlInfo->radioResourceConfigCommon.
+ pucch_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ pucch_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.pucch_ConfigCommon,
+ sizeof(PUCCH_ConfigCommon_t));
+ }
- if (mobilityControlInfo->radioResourceConfigCommon.tdd_Config) {
- UE_mac_inst[Mod_idP].tdd_Config =
- mobilityControlInfo->radioResourceConfigCommon.tdd_Config;
- }
+ if (mobilityControlInfo->
+ radioResourceConfigCommon.soundingRS_UL_ConfigCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ soundingRS_UL_ConfigCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.soundingRS_UL_ConfigCommon,
+ sizeof(SoundingRS_UL_ConfigCommon_t));
+ }
- if (mobilityControlInfo->
- radioResourceConfigCommon.ul_CyclicPrefixLength) {
- memcpy((void *)
- &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
- ul_CyclicPrefixLength,
- (void *) mobilityControlInfo->
- radioResourceConfigCommon.ul_CyclicPrefixLength,
- sizeof(UL_CyclicPrefixLength_t));
- }
- // store the previous rnti in case of failure, and set thenew rnti
- UE_mac_inst[Mod_idP].crnti_before_ho = UE_mac_inst[Mod_idP].crnti;
- UE_mac_inst[Mod_idP].crnti =
- ((mobilityControlInfo->
- newUE_Identity.buf[0]) | (mobilityControlInfo->
- newUE_Identity.buf[1] << 8));
- LOG_I(MAC, "[UE %d] Received new identity %x from %d\n", Mod_idP,
- UE_mac_inst[Mod_idP].crnti, eNB_index);
- UE_mac_inst[Mod_idP].rach_ConfigDedicated =
- malloc(sizeof(*mobilityControlInfo->rach_ConfigDedicated));
-
- if (mobilityControlInfo->rach_ConfigDedicated) {
- memcpy((void *) UE_mac_inst[Mod_idP].rach_ConfigDedicated,
- (void *) mobilityControlInfo->rach_ConfigDedicated,
- sizeof(*mobilityControlInfo->rach_ConfigDedicated));
- }
+ if (mobilityControlInfo->
+ radioResourceConfigCommon.uplinkPowerControlCommon) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ uplinkPowerControlCommon,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.uplinkPowerControlCommon,
+ sizeof(UplinkPowerControlCommon_t));
+ }
+ //configure antennaInfoCommon somewhere here..
+ if (mobilityControlInfo->radioResourceConfigCommon.p_Max) {
+ //to be configured
+ }
- phy_config_afterHO_ue(Mod_idP, 0, eNB_index, mobilityControlInfo,
- 0);
+ if (mobilityControlInfo->radioResourceConfigCommon.tdd_Config) {
+ UE_mac_inst[Mod_idP].tdd_Config =
+ mobilityControlInfo->radioResourceConfigCommon.tdd_Config;
}
+ if (mobilityControlInfo->
+ radioResourceConfigCommon.ul_CyclicPrefixLength) {
+ memcpy((void *)
+ &UE_mac_inst[Mod_idP].radioResourceConfigCommon->
+ ul_CyclicPrefixLength,
+ (void *) mobilityControlInfo->
+ radioResourceConfigCommon.ul_CyclicPrefixLength,
+ sizeof(UL_CyclicPrefixLength_t));
+ }
+ // store the previous rnti in case of failure, and set thenew rnti
+ UE_mac_inst[Mod_idP].crnti_before_ho = UE_mac_inst[Mod_idP].crnti;
+ UE_mac_inst[Mod_idP].crnti =
+ ((mobilityControlInfo->
+ newUE_Identity.buf[0]) | (mobilityControlInfo->
+ newUE_Identity.buf[1] << 8));
+ LOG_I(MAC, "[UE %d] Received new identity %x from %d\n", Mod_idP,
+ UE_mac_inst[Mod_idP].crnti, eNB_index);
+ UE_mac_inst[Mod_idP].rach_ConfigDedicated =
+ malloc(sizeof(*mobilityControlInfo->rach_ConfigDedicated));
+
+ if (mobilityControlInfo->rach_ConfigDedicated) {
+ memcpy((void *) UE_mac_inst[Mod_idP].rach_ConfigDedicated,
+ (void *) mobilityControlInfo->rach_ConfigDedicated,
+ sizeof(*mobilityControlInfo->rach_ConfigDedicated));
+ }
- if (mbsfn_SubframeConfigList != NULL) {
- LOG_I(MAC,
- "[UE %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
- Mod_idP, mbsfn_SubframeConfigList->list.count);
- UE_mac_inst[Mod_idP].num_sf_allocation_pattern =
- mbsfn_SubframeConfigList->list.count;
-
- for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
- LOG_I(MAC,
- "[UE %d] Configuring MBSFN_SubframeConfig %d from received SIB2 \n",
- Mod_idP, i);
- UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i] =
- mbsfn_SubframeConfigList->list.array[i];
- // LOG_I("[UE %d] MBSFN_SubframeConfig[%d] pattern is %ld\n", Mod_idP,
- // UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i]->subframeAllocation.choice.oneFrame.buf[0]);
- }
+ phy_config_afterHO_ue(Mod_idP, 0, eNB_index, mobilityControlInfo,
+ 0);
+ }
+
+
+ if (mbsfn_SubframeConfigList != NULL) {
+ LOG_I(MAC,
+ "[UE %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n",
+ Mod_idP, mbsfn_SubframeConfigList->list.count);
+ UE_mac_inst[Mod_idP].num_sf_allocation_pattern =
+ mbsfn_SubframeConfigList->list.count;
+
+ for (i = 0; i < mbsfn_SubframeConfigList->list.count; i++) {
+ LOG_I(MAC,
+ "[UE %d] Configuring MBSFN_SubframeConfig %d from received SIB2 \n",
+ Mod_idP, i);
+ UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i] =
+ mbsfn_SubframeConfigList->list.array[i];
+ // LOG_I("[UE %d] MBSFN_SubframeConfig[%d] pattern is %ld\n", Mod_idP,
+ // UE_mac_inst[Mod_idP].mbsfn_SubframeConfig[i]->subframeAllocation.choice.oneFrame.buf[0]);
}
+ }
#if defined(Rel10) || defined(Rel14)
- if (mbsfn_AreaInfoList != NULL) {
- LOG_I(MAC, "[UE %d][CONFIG] Received %d MBSFN Area Info\n",
- Mod_idP, mbsfn_AreaInfoList->list.count);
- UE_mac_inst[Mod_idP].num_active_mbsfn_area =
- mbsfn_AreaInfoList->list.count;
-
- for (i = 0; i < mbsfn_AreaInfoList->list.count; i++) {
- UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i] =
- mbsfn_AreaInfoList->list.array[i];
- LOG_I(MAC,
- "[UE %d] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld\n",
- Mod_idP, i,
- UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i]->
- mcch_Config_r9.mcch_RepetitionPeriod_r9);
- phy_config_sib13_ue(Mod_idP, 0, eNB_index, i,
- UE_mac_inst[Mod_idP].
- mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
- }
+ if (mbsfn_AreaInfoList != NULL) {
+ LOG_I(MAC, "[UE %d][CONFIG] Received %d MBSFN Area Info\n",
+ Mod_idP, mbsfn_AreaInfoList->list.count);
+ UE_mac_inst[Mod_idP].num_active_mbsfn_area =
+ mbsfn_AreaInfoList->list.count;
+
+ for (i = 0; i < mbsfn_AreaInfoList->list.count; i++) {
+ UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i] =
+ mbsfn_AreaInfoList->list.array[i];
+ LOG_I(MAC,
+ "[UE %d] MBSFN_AreaInfo[%d]: MCCH Repetition Period = %ld\n",
+ Mod_idP, i,
+ UE_mac_inst[Mod_idP].mbsfn_AreaInfo[i]->
+ mcch_Config_r9.mcch_RepetitionPeriod_r9);
+ phy_config_sib13_ue(Mod_idP, 0, eNB_index, i,
+ UE_mac_inst[Mod_idP].
+ mbsfn_AreaInfo[i]->mbsfn_AreaId_r9);
}
+ }
- if (pmch_InfoList != NULL) {
+ if (pmch_InfoList != NULL) {
- // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
+ // LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
- LOG_I(MAC, "[UE %d] Configuring PMCH_config from MCCH MESSAGE \n",
- Mod_idP);
+ LOG_I(MAC, "[UE %d] Configuring PMCH_config from MCCH MESSAGE \n",
+ Mod_idP);
- for (i = 0; i < pmch_InfoList->list.count; i++) {
- UE_mac_inst[Mod_idP].pmch_Config[i] =
- &pmch_InfoList->list.array[i]->pmch_Config_r9;
- LOG_I(MAC, "[UE %d] PMCH[%d]: MCH_Scheduling_Period = %ld\n",
- Mod_idP, i,
- UE_mac_inst[Mod_idP].
- pmch_Config[i]->mch_SchedulingPeriod_r9);
- }
-
- UE_mac_inst[Mod_idP].mcch_status = 1;
+ for (i = 0; i < pmch_InfoList->list.count; i++) {
+ UE_mac_inst[Mod_idP].pmch_Config[i] =
+ &pmch_InfoList->list.array[i]->pmch_Config_r9;
+ LOG_I(MAC, "[UE %d] PMCH[%d]: MCH_Scheduling_Period = %ld\n",
+ Mod_idP, i,
+ UE_mac_inst[Mod_idP].
+ pmch_Config[i]->mch_SchedulingPeriod_r9);
}
+
+ UE_mac_inst[Mod_idP].mcch_status = 1;
+ }
#endif
#ifdef CBA
- if (cba_rnti) {
- UE_mac_inst[Mod_idP].cba_rnti[num_active_cba_groups - 1] =
- cba_rnti;
- LOG_D(MAC,
- "[UE %d] configure CBA group %d RNTI %x for eNB %d (total active cba group %d)\n",
- Mod_idP, Mod_idP % num_active_cba_groups, cba_rnti,
- eNB_index, num_active_cba_groups);
- phy_config_cba_rnti(Mod_idP, CC_idP, eNB_flagP, eNB_index,
- cba_rnti, num_active_cba_groups - 1,
- num_active_cba_groups);
- }
+ if (cba_rnti) {
+ UE_mac_inst[Mod_idP].cba_rnti[num_active_cba_groups - 1] =
+ cba_rnti;
+ LOG_D(MAC,
+ "[UE %d] configure CBA group %d RNTI %x for eNB %d (total active cba group %d)\n",
+ Mod_idP, Mod_idP % num_active_cba_groups, cba_rnti,
+ eNB_index, num_active_cba_groups);
+ phy_config_cba_rnti(Mod_idP, CC_idP, eNB_flagP, eNB_index,
+ cba_rnti, num_active_cba_groups - 1,
+ num_active_cba_groups);
+ }
#endif
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
- return (0);
+ return (0);
}
--
2.26.2