From fd3c5ccecf57bc063595b95ba2098c5519e91cd7 Mon Sep 17 00:00:00 2001 From: Cedric Roux <roux@eurecom.fr> Date: Wed, 13 Jan 2016 15:38:56 +0100 Subject: [PATCH] force MAX_NUM_CCs to 2 in ff-mac-sched-sap.h/ff-mac-csched-sap.h to fit libscheduler.a --- openair2/LAYER2/MAC/ff-mac-csched-sap.h | 6 ++++-- openair2/LAYER2/MAC/ff-mac-sched-sap.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openair2/LAYER2/MAC/ff-mac-csched-sap.h b/openair2/LAYER2/MAC/ff-mac-csched-sap.h index adbc9b5249..d0808fd93b 100644 --- a/openair2/LAYER2/MAC/ff-mac-csched-sap.h +++ b/openair2/LAYER2/MAC/ff-mac-csched-sap.h @@ -58,7 +58,8 @@ extern "C" { struct CschedCellConfigReqParameters { uint8_t nr_carriers; - struct CschedCellConfigReqParametersListElement* ccConfigList[MAX_NUM_CCs]; +#warning [31;46mMAX_NUM_CCs forced to 2 in structure CschedCellConfigReqParameters!![0m + struct CschedCellConfigReqParametersListElement* ccConfigList[2 /*MAX_NUM_CCs*/]; uint8_t nr_vendorSpecificList; struct VendorSpecificListElement_s *vendorSpecificList; }; @@ -198,7 +199,8 @@ struct CschedUeConfigReqParameters bool crossCarrierSchedSupport; uint8_t pcellCarrierIndex; uint8_t nr_scells; - struct ScellConfig_s* scellConfigList[MAX_NUM_CCs-1]; +#warning [31;46mMAX_NUM_CCs forced to 2 in structure CschedUeConfigReqParameters!![0m + struct ScellConfig_s* scellConfigList[2 /* MAX_NUM_CCs */ -1]; uint8_t scellDeactivationTimer; uint8_t nr_vendorSpecificList; diff --git a/openair2/LAYER2/MAC/ff-mac-sched-sap.h b/openair2/LAYER2/MAC/ff-mac-sched-sap.h index 4c32de3cbd..5b65ddcd72 100644 --- a/openair2/LAYER2/MAC/ff-mac-sched-sap.h +++ b/openair2/LAYER2/MAC/ff-mac-sched-sap.h @@ -235,7 +235,8 @@ struct SchedDlConfigIndParameters /* mind: this is just number of elems in the next array (not actual number of PDCCH OFDM symbols) */ uint8_t nr_ofdmSymbolsCount; - struct PdcchOfdmSymbolCountListElement_s* nrOfPdcchOfdmSymbols[MAX_NUM_CCs]; +#warning [31;46mMAX_NUM_CCs forced to 2 in structure SchedDlConfigIndParameters!![0m + struct PdcchOfdmSymbolCountListElement_s* nrOfPdcchOfdmSymbols[2 /* MAX_NUM_CCs */]; uint8_t nr_vendorSpecificList; struct VendorSpecificListElement_s *vendorSpecificList; -- 2.26.2