diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
index e09e068c63fed4af59d20935eae3fb6f9b0f5155..0994acdf9de168ddf746784ad837f23dcda68001 100644
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
index 1f992daba20cdee1a33e1939db2686bb6bf95e0a..5e8cd8007ea7550c2838aac43ae21aad78b18c0d 100644
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
index bb7df8b72d654171fb088bc8ddfe95d6b9b64883..53eae1d531f80bd133b6ba5060262fa452c5145e 100644
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
index ff97827b579a4d97fe5b0a593b14247eb349c0fb..d30a57041c1818b9fb1abd96a9f630abfc10bac0 100644
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
index ebb9e417e7be717f810692a4a5ac42e564cbc58a..e90eb3fe518c751e471632f30400026d9a0ce1e3 100644
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
index 4e8910276639267344316f765e9f9f20f50e1a0c..5dbecd3813f90eabcd4568d2dc3c2116c6726d5c 100644
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
index beaf5ae0f1405da2c8647f8970c7971b3a99a2a2..1397184cc7994da3aa3d41c6d977aa3d53998a5d 100644
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
index b0efe66e14189d82f486524396309de98bd4e9fe..caebb36eb27af79b81f4d5e97775e308673f2045 100644
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
index 1b33c7b3c216e7ef2e8573806db0176461ffa93f..fe90cdb338f1796733f554999c79ff71497d357e 100644
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
index dc64a69c00cbf028ccbefc73e30b45096ed28851..5d9027ce150c8926b8bdedaf833b87cddc5536cf 100644
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
index c93ce24d0841f73f64b3cf5f0ebbbb28a98c9818..539f0bd744cf91222e11f0a3467eaa3f8f319f25 100644
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
index 57f7ef83b92e484d13eb4234982dc807ffafeccc..58b088002fb37a396183cc6a51ef455d2aee6862 100644
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/openair1/PHY/LTE_TRANSPORT/prach.c b/openair1/PHY/LTE_TRANSPORT/prach.c
index a332670a5992dd05cafd76779e90d5f6c942cfa1..b58aa91636a4d83fb9aa5d6aabfa3a476fc2e884 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach.c
+++ b/openair1/PHY/LTE_TRANSPORT/prach.c
@@ -1089,6 +1089,10 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
}
//__m128i mmtmpX0,mmtmpX1,mmtmpX2,mmtmpX3;
+#ifndef Rel14
+#define rx_prach0 rx_prach
+#endif
+
void rx_prach0(PHY_VARS_eNB *eNB,
RU_t *ru,
uint16_t *max_preamble,
@@ -1764,9 +1768,8 @@ void rx_prach0(PHY_VARS_eNB *eNB,
-#ifndef Rel14
-#define rx_prach rx_prach0
-#else
+#ifdef Rel14
+
void rx_prach(PHY_VARS_eNB *eNB,
RU_t *ru,
uint16_t *max_preamble,
@@ -1806,7 +1809,8 @@ void rx_prach(PHY_VARS_eNB *eNB,
}
}
}
-#endif
+
+#endif /* Rel14 */
void init_prach_tables(int N_ZC)
{
diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h
index f015701bee0727c496596944e85c3d8b6174f511..199427cbc2fdb21c54b061ebd7a7a8340ce09dad 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto.h
@@ -2157,11 +2157,10 @@ void rx_prach(PHY_VARS_eNB *phy_vars_eNB,RU_t *ru,
uint16_t *max_preamble,
uint16_t *max_preamble_energy,
uint16_t *max_preamble_delay,
-#ifdef Rel14
- uint16_t Nf, uint8_t tdd_mapindex,
- uint8_t br_flag
-#else
uint16_t Nf, uint8_t tdd_mapindex
+#ifdef Rel14
+ ,
+ uint8_t br_flag
#endif
);
/*!
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index 6ff729102b87da4650b1e4ac688fdbf85d8287d7..46f37e943102c0a986302f2264c91bcf9da841eb 100644
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -750,8 +750,10 @@ typedef struct RU_t_s{
int (*wakeup_rxtx)(struct PHY_VARS_eNB_s *eNB, struct RU_t_s *ru);
/// function pointer to wakeup routine in lte-enb.
void (*wakeup_prach_eNB)(struct PHY_VARS_eNB_s *eNB,struct RU_t_s *ru,int frame,int subframe);
+#ifdef Rel14
/// function pointer to wakeup routine in lte-enb.
void (*wakeup_prach_eNB_br)(struct PHY_VARS_eNB_s *eNB,struct RU_t_s *ru,int frame,int subframe);
+#endif
/// function pointer to eNB entry routine
void (*eNB_top)(struct PHY_VARS_eNB_s *eNB, int frame_rx, int subframe_rx, char *string);
/// Timing statistics
diff --git a/openair1/PHY/impl_defs_lte.h b/openair1/PHY/impl_defs_lte.h
index ac54be36fb426c104d2811d40643f4f42676c431..066dc7012c317f08da23c8b5433be624f1937f6a 100644
--- a/openair1/PHY/impl_defs_lte.h
+++ b/openair1/PHY/impl_defs_lte.h
@@ -144,8 +144,6 @@ typedef struct {
uint8_t prach_hopping_offset[4];
} PRACH_eMTC_CONFIG_INFO;
-#endif
-
/// PRACH-ConfigSIB or PRACH-Config from 36.331 RRC spec
typedef struct {
/// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). \vr{[0..837]}
@@ -158,6 +156,8 @@ typedef struct {
#endif
} PRACH_eMTC_CONFIG_COMMON;
+#endif
+
/// Enumeration for parameter \f$N_\text{ANRep}\f$ \ref PUCCH_CONFIG_DEDICATED::repetitionFactor.
typedef enum {
n2=0,
diff --git a/openair1/SCHED/fapi_l1.c b/openair1/SCHED/fapi_l1.c
index 2fa9c9c2cd2164146ab84d799a701564298dc407..b9024bdfbf94d12ebd5ff26b125b99931cff765f 100644
--- a/openair1/SCHED/fapi_l1.c
+++ b/openair1/SCHED/fapi_l1.c
@@ -63,6 +63,7 @@ void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,
}
#ifdef Rel14
+
void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,
eNB_rxtx_proc_t *proc,
nfapi_dl_config_request_pdu_t *dl_config_pdu)
@@ -76,6 +77,7 @@ void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,
// copy dci configuration into eNB structure
fill_mdci_and_dlsch(eNB,proc,&mpdcch_vars->mdci_alloc[mpdcch_vars->num_dci],pdu);
}
+
#endif
void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
@@ -265,14 +267,21 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_pr
dlsch0_harq->codeword = 0;
dlsch0_harq->pdsch_start = rel10->pdsch_start;
}
-#endif
dlsch0->i0 = rel13->initial_transmission_sf_io;
+#endif
+#ifdef Rel14
LOG_D(PHY,"dlsch->i0:%04x dlsch0_harq[pdsch_start:%d nb_rb:%d vrb_type:%d rvidx:%d Nl:%d mimo_mode:%d dl_power_off:%d round:%d status:%d TBS:%d Qm:%d codeword:%d rb_alloc:%d] rel8[length:%d]\n",
dlsch0->i0,
dlsch0_harq->pdsch_start, dlsch0_harq->nb_rb, dlsch0_harq->vrb_type, dlsch0_harq->rvidx, dlsch0_harq->Nl, dlsch0_harq->mimo_mode, dlsch0_harq->dl_power_off, dlsch0_harq->round, dlsch0_harq->status, dlsch0_harq->TBS, dlsch0_harq->Qm, dlsch0_harq->codeword, dlsch0_harq->rb_alloc[0],
rel8->length
);
+#else
+ LOG_D(PHY,"dlsch0_harq[pdsch_start:%d nb_rb:%d vrb_type:%d rvidx:%d Nl:%d mimo_mode:%d dl_power_off:%d round:%d status:%d TBS:%d Qm:%d codeword:%d rb_alloc:%d] rel8[length:%d]\n",
+ dlsch0_harq->pdsch_start, dlsch0_harq->nb_rb, dlsch0_harq->vrb_type, dlsch0_harq->rvidx, dlsch0_harq->Nl, dlsch0_harq->mimo_mode, dlsch0_harq->dl_power_off, dlsch0_harq->round, dlsch0_harq->status, dlsch0_harq->TBS, dlsch0_harq->Qm, dlsch0_harq->codeword, dlsch0_harq->rb_alloc[0],
+ rel8->length
+ );
+#endif
}
uint16_t to_beta_offset_harqack[16]={16,20,25,32,40,50,64,80,101,127,160,248,400,640,1008,8};
@@ -764,8 +773,10 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
break;
#ifdef Rel14
case NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE:
+#ifdef Rel14
handle_nfapi_mpdcch_pdu(eNB,proc,dl_config_pdu);
eNB->mpdcch_vars[subframe&1].num_dci++;
+#endif
break;
#endif
}
diff --git a/openair1/SCHED/prach_procedures.c b/openair1/SCHED/prach_procedures.c
index d8c65850744d19ae2b99ee44d4be703d81cb07e2..f3b5644b922d2f24b3aec0c43bd5624208c0a5b9 100644
--- a/openair1/SCHED/prach_procedures.c
+++ b/openair1/SCHED/prach_procedures.c
@@ -52,8 +52,9 @@
extern uint32_t nfapi_mode;
-void prach_procedures(PHY_VARS_eNB *eNB,
+void prach_procedures(PHY_VARS_eNB *eNB
#ifdef Rel14
+ ,
int br_flag
#endif
) {
diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c
index d5a09bef857e867fc3d516078e75cdce085d1f89..55585acd23e90ff745d61395ac3f2281d80c7511 100644
--- a/openair2/LAYER2/MAC/config.c
+++ b/openair2/LAYER2/MAC/config.c
@@ -193,8 +193,12 @@ void config_mib(int Mod_idP,
int NcpP,
int p_eNBP,
uint32_t dl_CarrierFreqP,
- uint32_t ul_CarrierFreqP,
- uint32_t pbch_repetitionP) {
+ uint32_t ul_CarrierFreqP
+#ifdef Rel14
+ ,
+ uint32_t pbch_repetitionP
+#endif
+ ) {
nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
@@ -215,7 +219,7 @@ void config_mib(int Mod_idP,
cfg->rf_config.dl_channel_bandwidth.value = to_prb(dl_BandwidthP);
cfg->rf_config.dl_channel_bandwidth.tl.tag = NFAPI_RF_CONFIG_DL_CHANNEL_BANDWIDTH_TAG;
cfg->num_tlv++;
-LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
+ LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
cfg->rf_config.ul_channel_bandwidth.value = to_prb(dl_BandwidthP);
cfg->rf_config.ul_channel_bandwidth.tl.tag = NFAPI_RF_CONFIG_UL_CHANNEL_BANDWIDTH_TAG;
@@ -267,36 +271,37 @@ LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
cfg->emtc_config.pbch_repetitions_enable_r13.tl.tag = NFAPI_EMTC_CONFIG_PBCH_REPETITIONS_ENABLE_R13_TAG;
cfg->num_tlv++;
#endif
-
LOG_I(MAC,
- "%s() NFAPI_CONFIG_REQUEST(num_tlv:%u) DL_BW:%u UL_BW:%u Ncp %d,p_eNB %d,earfcn %d,band %d,phich_resource %u phich_duration %u phich_power_offset %u PSS %d SSS %d PCI %d"
+ "%s() NFAPI_CONFIG_REQUEST(num_tlv:%u) DL_BW:%u UL_BW:%u Ncp %d,p_eNB %d,earfcn %d,band %d,phich_resource %u phich_duration %u phich_power_offset %u PSS %d SSS %d PCI %d"
#ifdef Rel14
- " PBCH repetition %d"
+
+ " PBCH repetition %d"
#endif
- "\n"
- ,__FUNCTION__
- ,cfg->num_tlv
- ,cfg->rf_config.dl_channel_bandwidth.value
- ,cfg->rf_config.ul_channel_bandwidth.value
- ,NcpP,p_eNBP
- ,cfg->nfapi_config.earfcn.value
- ,cfg->nfapi_config.rf_bands.rf_band[0]
- ,cfg->phich_config.phich_resource.value
- ,cfg->phich_config.phich_duration.value
- ,cfg->phich_config.phich_power_offset.value
- ,cfg->sch_config.primary_synchronization_signal_epre_eprers.value
- ,cfg->sch_config.secondary_synchronization_signal_epre_eprers.value
- ,cfg->sch_config.physical_cell_id.value
+ "\n"
+ ,__FUNCTION__
+ ,cfg->num_tlv
+ ,cfg->rf_config.dl_channel_bandwidth.value
+ ,cfg->rf_config.ul_channel_bandwidth.value
+ ,NcpP,p_eNBP
+ ,cfg->nfapi_config.earfcn.value
+ ,cfg->nfapi_config.rf_bands.rf_band[0]
+ ,cfg->phich_config.phich_resource.value
+ ,cfg->phich_config.phich_duration.value
+ ,cfg->phich_config.phich_power_offset.value
+ ,cfg->sch_config.primary_synchronization_signal_epre_eprers.value
+ ,cfg->sch_config.secondary_synchronization_signal_epre_eprers.value
+ ,cfg->sch_config.physical_cell_id.value
#ifdef Rel14
- ,cfg->emtc_config.pbch_repetitions_enable_r13.value
+ ,cfg->emtc_config.pbch_repetitions_enable_r13.value
#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];
+
+ nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
if (tdd_ConfigP) { //TDD
cfg->subframe_config.duplex_mode.value = 0;
@@ -396,16 +401,13 @@ config_sib2(int Mod_idP,
cfg->pucch_config.n1_pucch_an.tl.tag = NFAPI_PUCCH_CONFIG_N1_PUCCH_AN_TAG;
cfg->num_tlv++;
- if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled == true)
- {
+ 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)
- {
+ else if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled == true) {
cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 2;
}
- else // No hopping
- {
+ else {
cfg->uplink_reference_signal_config.uplink_rs_hopping.value = 0;
}
cfg->uplink_reference_signal_config.uplink_rs_hopping.tl.tag = NFAPI_UPLINK_REFERENCE_SIGNAL_CONFIG_UPLINK_RS_HOPPING_TAG;
@@ -433,7 +435,7 @@ config_sib2(int Mod_idP,
cfg->srs_config.srs_acknack_srs_simultaneous_transmission.value = radioResourceConfigCommonP->soundingRS_UL_ConfigCommon.choice.setup.ackNackSRS_SimultaneousTransmission;
cfg->srs_config.srs_acknack_srs_simultaneous_transmission.tl.tag = NFAPI_SRS_CONFIG_SRS_ACKNACK_SRS_SIMULTANEOUS_TRANSMISSION_TAG;
cfg->num_tlv++;
-
+
nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
@@ -704,7 +706,6 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
#endif
);
-
mac_init_cell_params(Mod_idP,CC_idP);
if (schedulingInfoList!=NULL) {
@@ -717,65 +718,66 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
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;
+ 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,
+ config_sib2(Mod_idP, CC_idP, radioResourceConfigCommon,
#ifdef Rel14
- radioResourceConfigCommon_BR,
+ radioResourceConfigCommon_BR,
#endif
- NULL, ul_Bandwidth, additionalSpectrumEmission,
- mbsfn_SubframeConfigList);
+ NULL, ul_Bandwidth, additionalSpectrumEmission,
+ mbsfn_SubframeConfigList);
+
}
} // mib != NULL
@@ -786,14 +788,14 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
if (UE_id == -1) {
LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
- __LINE__, __FUNCTION__);
+ __LINE__, __FUNCTION__);
} else {
if (logicalChannelConfig)
UE_list->
UE_template[CC_idP][UE_id].lcgidmap
[logicalChannelIdentity] =
*logicalChannelConfig->
- ul_SpecificParameters->logicalChannelGroup;
+ ul_SpecificParameters->logicalChannelGroup;
else
UE_list->
UE_template[CC_idP][UE_id].lcgidmap
@@ -818,9 +820,9 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
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__);
+ __LINE__, __FUNCTION__);
else
- config_dedicated_scell(Mod_idP, rntiP, sCellToAddMod_r10);
+ config_dedicated_scell(Mod_idP, rntiP, sCellToAddMod_r10);
}
#endif
@@ -852,7 +854,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
#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
+ // 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;
@@ -893,10 +895,10 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
&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);
+ mbms_SessionList[i]->list.count);
}
}
-
+
#endif
LOG_E(MAC, "%s() %s:%d RC.mac[Mod_idP]->if_inst->PHY_config_req:%p\n", __FUNCTION__, __FILE__, __LINE__, RC.mac[Mod_idP]->if_inst->PHY_config_req);
@@ -918,11 +920,13 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
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);
}
+
+
diff --git a/openair2/LAYER2/MAC/defs.h b/openair2/LAYER2/MAC/defs.h
index f4e2ec8997f1e548be724b340479cd2d5fb24928..8d99433eb0a8a4d4d3fd6226c4dfc99616b5593f 100644
--- a/openair2/LAYER2/MAC/defs.h
+++ b/openair2/LAYER2/MAC/defs.h
@@ -665,7 +665,7 @@ typedef struct {
/// mcs from last UL scheduling
uint8_t mcs_UL[8];
/// TBS from last UL scheduling
- uint8_t TBS_UL[8];
+ int TBS_UL[8];
/// Flag to indicate UL has been scheduled at least once
boolean_t ul_active;
/// Flag to indicate UE has been configured (ACK from RRCConnectionSetup received)
@@ -720,9 +720,6 @@ typedef struct {
// Logical channel info for link with RLC
- /// Last received UE BSR info for each logical channel group id
- uint8_t bsr_info[MAX_NUM_LCGID];
-
/// LCGID mapping
long lcgidmap[11];
@@ -749,8 +746,6 @@ typedef struct {
/// size of remaining size to send for the downlink head SDU
uint32_t dl_buffer_head_sdu_remaining_size_to_send[MAX_NUM_LCID];
- /// total uplink buffer size
- uint32_t ul_total_buffer;
/// uplink buffer creation time for each LCID
uint32_t ul_buffer_creation_time[MAX_NUM_LCGID];
/// maximum uplink buffer creation time across all the LCIDs
@@ -758,6 +753,11 @@ typedef struct {
/// uplink buffer size per LCID
uint32_t ul_buffer_info[MAX_NUM_LCGID];
+ /// uplink bytes that are currently scheduled
+ int scheduled_ul_bytes;
+ /// estimation of the UL buffer size
+ int estimated_ul_buffer;
+
/// UE tx power
int32_t ue_tx_power;
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index 96ffa63725b3353f49d0afc432084b90524672d8..cf7f84eed228462b50d96d6ed918483faaee9025 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -73,409 +73,282 @@ uint16_t pdcch_order_table[6] = { 31, 31, 511, 2047, 2047, 8191 };
void
schedule_SRS(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- UE_list_t *UE_list = &eNB->UE_list;
- nfapi_ul_config_request_body_t *ul_req;
- int CC_id, UE_id;
- COMMON_channels_t *cc = RC.mac[module_idP]->common_channels;
- SoundingRS_UL_ConfigCommon_t *soundingRS_UL_ConfigCommon;
- struct SoundingRS_UL_ConfigDedicated *soundingRS_UL_ConfigDedicated;
- uint8_t TSFC;
- uint16_t deltaTSFC; // bitmap
- uint8_t srs_SubframeConfig;
-
- // table for TSFC (Period) and deltaSFC (offset)
- const uint16_t deltaTSFCTabType1[15][2] = { {1, 1}, {1, 2}, {2, 2}, {1, 5}, {2, 5}, {4, 5}, {8, 5}, {3, 5}, {12, 5}, {1, 10}, {2, 10}, {4, 10}, {8, 10}, {351, 10}, {383, 10} }; // Table 5.5.3.3-2 3GPP 36.211 FDD
- const uint16_t deltaTSFCTabType2[14][2] = { {2, 5}, {6, 5}, {10, 5}, {18, 5}, {14, 5}, {22, 5}, {26, 5}, {30, 5}, {70, 10}, {74, 10}, {194, 10}, {326, 10}, {586, 10}, {210, 10} }; // Table 5.5.3.3-2 3GPP 36.211 TDD
-
- uint16_t srsPeriodicity, srsOffset;
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- soundingRS_UL_ConfigCommon =
- &cc[CC_id].radioResourceConfigCommon->
- soundingRS_UL_ConfigCommon;
- // check if SRS is enabled in this frame/subframe
- if (soundingRS_UL_ConfigCommon) {
- srs_SubframeConfig =
- soundingRS_UL_ConfigCommon->choice.setup.
- srs_SubframeConfig;
- if (cc[CC_id].tdd_Config == NULL) { // FDD
- deltaTSFC = deltaTSFCTabType1[srs_SubframeConfig][0];
- TSFC = deltaTSFCTabType1[srs_SubframeConfig][1];
- } else { // TDD
- deltaTSFC = deltaTSFCTabType2[srs_SubframeConfig][0];
- TSFC = deltaTSFCTabType2[srs_SubframeConfig][1];
- }
- // Sounding reference signal subframes are the subframes satisfying ns/2 mod TSFC (- deltaTSFC
- uint16_t tmp = (subframeP % TSFC);
-
- if ((1 << tmp) & deltaTSFC) {
- // This is an SRS subframe, loop over UEs
- for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
- if (RC.mac[module_idP]->UE_list.active[UE_id] != TRUE)
- continue;
- ul_req =
- &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->UE_template[CC_id]
- [UE_id].physicalConfigDedicated != NULL,
- "physicalConfigDedicated is null for UE %d\n",
- UE_id);
-
- if ((soundingRS_UL_ConfigDedicated =
- UE_list->UE_template[CC_id]
- [UE_id].
- physicalConfigDedicated->soundingRS_UL_ConfigDedicated)
- != NULL) {
- if (soundingRS_UL_ConfigDedicated->present ==
- SoundingRS_UL_ConfigDedicated_PR_setup) {
- get_srs_pos(&cc[CC_id],
- soundingRS_UL_ConfigDedicated->choice.
- setup.srs_ConfigIndex,
- &srsPeriodicity, &srsOffset);
- if (((10 * frameP +
- subframeP) % srsPeriodicity) ==
- srsOffset) {
- // Program SRS
- ul_req->srs_present = 1;
- nfapi_ul_config_request_pdu_t
- * ul_config_pdu =
- &ul_req->
- ul_config_pdu_list
- [ul_req->number_of_pdus];
- memset((void *) ul_config_pdu, 0,
- sizeof
- (nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_SRS_PDU_TYPE;
- ul_config_pdu->pdu_size =
- 2 + (uint8_t) (2 +
- sizeof
- (nfapi_ul_config_srs_pdu));
- ul_config_pdu->srs_pdu.srs_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_SRS_PDU_REL8_TAG;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.size =
- (uint8_t)
- sizeof(nfapi_ul_config_srs_pdu);
- ul_config_pdu->srs_pdu.srs_pdu_rel8.rnti =
- UE_list->UE_template[CC_id][UE_id].
- rnti;
- ul_config_pdu->srs_pdu.
- srs_pdu_rel8.srs_bandwidth =
- soundingRS_UL_ConfigDedicated->
- choice.setup.srs_Bandwidth;
- ul_config_pdu->srs_pdu.
- srs_pdu_rel8.frequency_domain_position
- =
- soundingRS_UL_ConfigDedicated->
- choice.setup.freqDomainPosition;
- ul_config_pdu->srs_pdu.
- srs_pdu_rel8.srs_hopping_bandwidth =
- soundingRS_UL_ConfigDedicated->
- choice.setup.srs_HoppingBandwidth;;
- ul_config_pdu->srs_pdu.
- srs_pdu_rel8.transmission_comb =
- soundingRS_UL_ConfigDedicated->
- choice.setup.transmissionComb;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.i_srs =
- soundingRS_UL_ConfigDedicated->
- choice.setup.srs_ConfigIndex;
- ul_config_pdu->srs_pdu.
- srs_pdu_rel8.sounding_reference_cyclic_shift
- =
- soundingRS_UL_ConfigDedicated->
- choice.setup.cyclicShift;
- // ul_config_pdu->srs_pdu.srs_pdu_rel10.antenna_port = ;//
- // ul_config_pdu->srs_pdu.srs_pdu_rel13.number_of_combs = ;//
- RC.mac[module_idP]->UL_req[CC_id].sfn_sf =
- (frameP << 4) + subframeP;
- RC.mac[module_idP]->UL_req[CC_id].header.message_id = NFAPI_UL_CONFIG_REQUEST;
- ul_req->number_of_pdus++;
- } // if (((10*frameP+subframeP) % srsPeriodicity) == srsOffset)
- } // if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup)
- } // if ((soundingRS_UL_ConfigDedicated = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated)!=NULL)
- } // for (UE_id ...
- } // if((1<<tmp) & deltaTSFC)
-
- } // SRS config
- }
+
+
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+ nfapi_ul_config_request_body_t *ul_req;
+ int CC_id, UE_id;
+ COMMON_channels_t *cc = RC.mac[module_idP]->common_channels;
+ SoundingRS_UL_ConfigCommon_t *soundingRS_UL_ConfigCommon;
+ struct SoundingRS_UL_ConfigDedicated *soundingRS_UL_ConfigDedicated;
+ uint8_t TSFC;
+ uint16_t deltaTSFC; // bitmap
+ uint8_t srs_SubframeConfig;
+
+ // table for TSFC (Period) and deltaSFC (offset)
+ const uint16_t deltaTSFCTabType1[15][2] = { {1, 1}, {1, 2}, {2, 2}, {1, 5}, {2, 5}, {4, 5}, {8, 5}, {3, 5}, {12, 5}, {1, 10}, {2, 10}, {4, 10}, {8, 10}, {351, 10}, {383, 10} }; // Table 5.5.3.3-2 3GPP 36.211 FDD
+ const uint16_t deltaTSFCTabType2[14][2] = { {2, 5}, {6, 5}, {10, 5}, {18, 5}, {14, 5}, {22, 5}, {26, 5}, {30, 5}, {70, 10}, {74, 10}, {194, 10}, {326, 10}, {586, 10}, {210, 10} }; // Table 5.5.3.3-2 3GPP 36.211 TDD
+
+ uint16_t srsPeriodicity, srsOffset;
+
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ soundingRS_UL_ConfigCommon = &cc[CC_id].radioResourceConfigCommon->soundingRS_UL_ConfigCommon;
+ // check if SRS is enabled in this frame/subframe
+ if (soundingRS_UL_ConfigCommon) {
+ srs_SubframeConfig = soundingRS_UL_ConfigCommon->choice.setup.srs_SubframeConfig;
+ if (cc[CC_id].tdd_Config == NULL) { // FDD
+ deltaTSFC = deltaTSFCTabType1[srs_SubframeConfig][0];
+ TSFC = deltaTSFCTabType1[srs_SubframeConfig][1];
+ } else { // TDD
+ deltaTSFC = deltaTSFCTabType2[srs_SubframeConfig][0];
+ TSFC = deltaTSFCTabType2[srs_SubframeConfig][1];
+ }
+ // Sounding reference signal subframes are the subframes satisfying ns/2 mod TSFC (- deltaTSFC
+ uint16_t tmp = (subframeP % TSFC);
+
+ if ((1 << tmp) & deltaTSFC) {
+ // This is an SRS subframe, loop over UEs
+ for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
+ if (RC.mac[module_idP]->UE_list.active[UE_id] != TRUE)
+ continue;
+ ul_req = &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->UE_template[CC_id][UE_id].physicalConfigDedicated != NULL,
+ "physicalConfigDedicated is null for UE %d\n",
+ UE_id);
+
+ if ((soundingRS_UL_ConfigDedicated = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated) != NULL) {
+ if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup) {
+ get_srs_pos(&cc[CC_id],
+ soundingRS_UL_ConfigDedicated->choice.
+ setup.srs_ConfigIndex,
+ &srsPeriodicity, &srsOffset);
+ if (((10 * frameP + subframeP) % srsPeriodicity) == srsOffset) {
+ // Program SRS
+ ul_req->srs_present = 1;
+ nfapi_ul_config_request_pdu_t * ul_config_pdu = &ul_req->ul_config_pdu_list[ul_req->number_of_pdus];
+ memset((void *) ul_config_pdu, 0, sizeof(nfapi_ul_config_request_pdu_t));
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_SRS_PDU_TYPE;
+ ul_config_pdu->pdu_size = 2 + (uint8_t) (2 + sizeof(nfapi_ul_config_srs_pdu));
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_SRS_PDU_REL8_TAG;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.size = (uint8_t)sizeof(nfapi_ul_config_srs_pdu);
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.rnti = UE_list->UE_template[CC_id][UE_id].rnti;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.srs_bandwidth = soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.frequency_domain_position = soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.srs_hopping_bandwidth = soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth;;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.transmission_comb = soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.i_srs = soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex;
+ ul_config_pdu->srs_pdu.srs_pdu_rel8.sounding_reference_cyclic_shift = soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift; // ul_config_pdu->srs_pdu.srs_pdu_rel10.antenna_port = ;//
+ // ul_config_pdu->srs_pdu.srs_pdu_rel13.number_of_combs = ;//
+ RC.mac[module_idP]->UL_req[CC_id].sfn_sf = (frameP << 4) + subframeP;
+ RC.mac[module_idP]->UL_req[CC_id].header.message_id = NFAPI_UL_CONFIG_REQUEST;
+ ul_req->number_of_pdus++;
+ } // if (((10*frameP+subframeP) % srsPeriodicity) == srsOffset)
+ } // if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup)
+ } // if ((soundingRS_UL_ConfigDedicated = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated)!=NULL)
+ } // for (UE_id ...
+ } // if((1<<tmp) & deltaTSFC)
+
+ } // SRS config
+ }
}
void
schedule_CSI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- UE_list_t *UE_list = &eNB->UE_list;
- COMMON_channels_t *cc;
- nfapi_ul_config_request_body_t *ul_req;
- int CC_id, UE_id;
- struct CQI_ReportPeriodic *cqi_ReportPeriodic;
- uint16_t Npd, N_OFFSET_CQI;
- int H;
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
-
- cc = &eNB->common_channels[CC_id];
- for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
- if (UE_list->active[UE_id] != TRUE)
- continue;
-
- ul_req =
- &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->
- UE_template[CC_id][UE_id].physicalConfigDedicated
- != NULL,
- "physicalConfigDedicated is null for UE %d\n",
- UE_id);
-
- if (UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- cqi_ReportConfig) {
- if ((cqi_ReportPeriodic =
- UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- cqi_ReportConfig->cqi_ReportPeriodic) != NULL
- && (cqi_ReportPeriodic->present !=
- CQI_ReportPeriodic_PR_release)) {
- //Rel8 Periodic CQI/PMI/RI reporting
-
- get_csi_params(cc, cqi_ReportPeriodic, &Npd,
- &N_OFFSET_CQI, &H);
-
- if ((((frameP * 10) + subframeP) % Npd) == N_OFFSET_CQI) { // CQI opportunity
- UE_list->UE_sched_ctrl[UE_id].feedback_cnt[CC_id] =
- (((frameP * 10) + subframeP) / Npd) % H;
- // Program CQI
- nfapi_ul_config_request_pdu_t *ul_config_pdu =
- &ul_req->ul_config_pdu_list[ul_req->
- number_of_pdus];
- memset((void *) ul_config_pdu, 0,
- sizeof(nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE;
- ul_config_pdu->pdu_size =
- 2 + (uint8_t) (2 +
- sizeof
- (nfapi_ul_config_uci_cqi_pdu));
- ul_config_pdu->uci_cqi_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
- ul_config_pdu->uci_cqi_pdu.
- ue_information.ue_information_rel8.rnti =
- UE_list->UE_template[CC_id][UE_id].rnti;
- ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_CQI_INFORMATION_REL8_TAG;
- ul_config_pdu->uci_cqi_pdu.
- cqi_information.cqi_information_rel8.
- pucch_index =
- cqi_ReportPeriodic->choice.
- setup.cqi_PUCCH_ResourceIndex;
- ul_config_pdu->uci_cqi_pdu.
- cqi_information.cqi_information_rel8.
- dl_cqi_pmi_size =
- get_rel8_dl_cqi_pmi_size
- (&UE_list->UE_sched_ctrl[UE_id], CC_id, cc,
- get_tmode(module_idP, CC_id, UE_id),
- cqi_ReportPeriodic);
- ul_req->number_of_pdus++;
- ul_req->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+ COMMON_channels_t *cc;
+ nfapi_ul_config_request_body_t *ul_req;
+ int CC_id, UE_id;
+ struct CQI_ReportPeriodic *cqi_ReportPeriodic;
+ uint16_t Npd, N_OFFSET_CQI;
+ int H;
+
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+
+ cc = &eNB->common_channels[CC_id];
+ for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
+ if (UE_list->active[UE_id] != TRUE)
+ continue;
+
+ ul_req = &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->
+ UE_template[CC_id][UE_id].physicalConfigDedicated
+ != NULL,
+ "physicalConfigDedicated is null for UE %d\n",
+ UE_id);
+
+ if (UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->cqi_ReportConfig) {
+ if ((cqi_ReportPeriodic = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic) != NULL
+ && (cqi_ReportPeriodic->present != CQI_ReportPeriodic_PR_release)) {
+ //Rel8 Periodic CQI/PMI/RI reporting
+
+ get_csi_params(cc, cqi_ReportPeriodic, &Npd,
+ &N_OFFSET_CQI, &H);
+
+ if ((((frameP * 10) + subframeP) % Npd) == N_OFFSET_CQI) { // CQI opportunity
+ UE_list->UE_sched_ctrl[UE_id].feedback_cnt[CC_id] = (((frameP * 10) + subframeP) / Npd) % H;
+ // Program CQI
+ nfapi_ul_config_request_pdu_t *ul_config_pdu = &ul_req->ul_config_pdu_list[ul_req->number_of_pdus];
+ memset((void *) ul_config_pdu, 0,
+ sizeof(nfapi_ul_config_request_pdu_t));
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE;
+ ul_config_pdu->pdu_size = 2 + (uint8_t) (2 + sizeof(nfapi_ul_config_uci_cqi_pdu));
+ ul_config_pdu->uci_cqi_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
+ ul_config_pdu->uci_cqi_pdu.ue_information.ue_information_rel8.rnti = UE_list->UE_template[CC_id][UE_id].rnti;
+ ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_CQI_INFORMATION_REL8_TAG;
+ ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.pucch_index = cqi_ReportPeriodic->choice.setup.cqi_PUCCH_ResourceIndex;
+ ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.dl_cqi_pmi_size = get_rel8_dl_cqi_pmi_size(&UE_list->UE_sched_ctrl[UE_id], CC_id, cc,
+ get_tmode(module_idP, CC_id, UE_id),
+ cqi_ReportPeriodic);
+ ul_req->number_of_pdus++;
+ ul_req->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
#if defined(Rel10) || defined(Rel14)
- // PUT rel10-13 UCI options here
+ // PUT rel10-13 UCI options here
#endif
- } else
- if ((cqi_ReportPeriodic->choice.setup.
- ri_ConfigIndex)
- && ((((frameP * 10) + subframeP) % ((H * Npd) << (*cqi_ReportPeriodic->choice.setup.ri_ConfigIndex / 161))) == N_OFFSET_CQI + (*cqi_ReportPeriodic->choice.setup.ri_ConfigIndex % 161))) { // RI opportunity
- // Program RI
- nfapi_ul_config_request_pdu_t *ul_config_pdu =
- &ul_req->ul_config_pdu_list[ul_req->
- number_of_pdus];
- memset((void *) ul_config_pdu, 0,
- sizeof(nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE;
- ul_config_pdu->pdu_size =
- 2 + (uint8_t) (2 +
- sizeof
- (nfapi_ul_config_uci_cqi_pdu));
- ul_config_pdu->uci_cqi_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
- ul_config_pdu->uci_cqi_pdu.
- ue_information.ue_information_rel8.rnti =
- UE_list->UE_template[CC_id][UE_id].rnti;
- ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_CQI_INFORMATION_REL8_TAG;
- ul_config_pdu->uci_cqi_pdu.
- cqi_information.cqi_information_rel8.
- pucch_index =
- cqi_ReportPeriodic->choice.
- setup.cqi_PUCCH_ResourceIndex;
- ul_config_pdu->uci_cqi_pdu.
- cqi_information.cqi_information_rel8.
- dl_cqi_pmi_size = (cc->p_eNB == 2) ? 1 : 2;
- RC.mac[module_idP]->UL_req[CC_id].sfn_sf =
- (frameP << 4) + subframeP;
- ul_req->number_of_pdus++;
- ul_req->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
- }
-
- } // if ((cqi_ReportPeriodic = cqi_ReportConfig->cqi_ReportPeriodic)!=NULL) {
- } // if (UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->cqi_ReportConfig)
- } // for (UE_id=UE_list->head; UE_id>=0; UE_id=UE_list->next[UE_id]) {
- } // for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
+ } else
+ if ((cqi_ReportPeriodic->choice.setup.ri_ConfigIndex)
+ && ((((frameP * 10) + subframeP) % ((H * Npd) << (*cqi_ReportPeriodic->choice.setup.ri_ConfigIndex / 161))) == N_OFFSET_CQI + (*cqi_ReportPeriodic->choice.setup.ri_ConfigIndex % 161))) { // RI opportunity
+ // Program RI
+ nfapi_ul_config_request_pdu_t *ul_config_pdu = &ul_req->ul_config_pdu_list[ul_req->number_of_pdus];
+ memset((void *) ul_config_pdu, 0,
+ sizeof(nfapi_ul_config_request_pdu_t));
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE;
+ ul_config_pdu->pdu_size = 2 + (uint8_t) (2 + sizeof(nfapi_ul_config_uci_cqi_pdu));
+ ul_config_pdu->uci_cqi_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
+ ul_config_pdu->uci_cqi_pdu.ue_information.ue_information_rel8.rnti = UE_list->UE_template[CC_id][UE_id].rnti;
+ ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_CQI_INFORMATION_REL8_TAG;
+ ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.pucch_index = cqi_ReportPeriodic->choice.setup.cqi_PUCCH_ResourceIndex;
+ ul_config_pdu->uci_cqi_pdu.cqi_information.cqi_information_rel8.dl_cqi_pmi_size = (cc->p_eNB == 2) ? 1 : 2;
+ RC.mac[module_idP]->UL_req[CC_id].sfn_sf = (frameP << 4) + subframeP;
+ ul_req->number_of_pdus++;
+ ul_req->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ }
+ } // if ((cqi_ReportPeriodic = cqi_ReportConfig->cqi_ReportPeriodic)!=NULL) {
+ } // if (UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->cqi_ReportConfig)
+ } // for (UE_id=UE_list->head; UE_id>=0; UE_id=UE_list->next[UE_id]) {
+ } // for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
}
void
schedule_SR(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- UE_list_t *UE_list = &eNB->UE_list;
- nfapi_ul_config_request_t *ul_req;
- nfapi_ul_config_request_body_t *ul_req_body;
- int CC_id;
- int UE_id;
- SchedulingRequestConfig_t *SRconfig;
- int skip_ue;
- int is_harq;
- nfapi_ul_config_sr_information sr;
- int i;
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- RC.mac[module_idP]->UL_req[CC_id].sfn_sf =
- (frameP << 4) + subframeP;
-
- for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
- if (RC.mac[module_idP]->UE_list.active[UE_id] != TRUE)
- continue;
-
- ul_req = &RC.mac[module_idP]->UL_req[CC_id];
- ul_req_body = &ul_req->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->
- UE_template[CC_id][UE_id].physicalConfigDedicated
- != NULL,
- "physicalConfigDedicated is null for UE %d\n",
- UE_id);
-
- if ((SRconfig =
- UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- schedulingRequestConfig) != NULL) {
- if (SRconfig->present == SchedulingRequestConfig_PR_setup) {
- if (SRconfig->choice.setup.sr_ConfigIndex <= 4) { // 5 ms SR period
- if ((subframeP % 5) !=
- SRconfig->choice.setup.sr_ConfigIndex)
- continue;
- } else if (SRconfig->choice.setup.sr_ConfigIndex <= 14) { // 10 ms SR period
- if (subframeP !=
- (SRconfig->choice.setup.sr_ConfigIndex - 5))
- continue;
- } else if (SRconfig->choice.setup.sr_ConfigIndex <= 34) { // 20 ms SR period
- if ((10 * (frameP & 1) + subframeP) !=
- (SRconfig->choice.setup.sr_ConfigIndex - 15))
- continue;
- } else if (SRconfig->choice.setup.sr_ConfigIndex <= 74) { // 40 ms SR period
- if ((10 * (frameP & 3) + subframeP) !=
- (SRconfig->choice.setup.sr_ConfigIndex - 35))
- continue;
- } else if (SRconfig->choice.setup.sr_ConfigIndex <= 154) { // 80 ms SR period
- if ((10 * (frameP & 7) + subframeP) !=
- (SRconfig->choice.setup.sr_ConfigIndex - 75))
- continue;
- }
- } // SRconfig->present == SchedulingRequestConfig_PR_setup)
- } // SRconfig = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->schedulingRequestConfig)!=NULL)
-
- // if we get here there is some PUCCH1 reception to schedule for SR
-
- skip_ue = 0;
- is_harq = 0;
- // check that there is no existing UL grant for ULSCH which overrides the SR
- for (i = 0; i < ul_req_body->number_of_pdus; i++) {
- if (((ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_PDU_TYPE) ||
- (ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE) ||
- (ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE) ||
- (ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE)) &&
- (ul_req_body->ul_config_pdu_list[i].ulsch_pdu.ulsch_pdu_rel8.rnti == UE_list->UE_template[CC_id][UE_id].rnti)) {
- skip_ue = 1;
- break;
- }
- /* if there is already an HARQ pdu, convert to SR_HARQ */
- else if ((ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE) &&
- (ul_req_body->ul_config_pdu_list[i].uci_harq_pdu.ue_information.ue_information_rel8.rnti == UE_list->UE_template[CC_id][UE_id].rnti)) {
- is_harq = 1;
- break;
- }
- }
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+ nfapi_ul_config_request_t *ul_req;
+ nfapi_ul_config_request_body_t *ul_req_body;
+ int CC_id;
+ int UE_id;
+ SchedulingRequestConfig_t *SRconfig;
+ int skip_ue;
+ int is_harq;
+ nfapi_ul_config_sr_information sr;
+ int i;
+
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ RC.mac[module_idP]->UL_req[CC_id].sfn_sf = (frameP << 4) + subframeP;
+
+ for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
+ if (RC.mac[module_idP]->UE_list.active[UE_id] != TRUE) continue;
+
+ ul_req = &RC.mac[module_idP]->UL_req[CC_id];
+ ul_req_body = &ul_req->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->
+ UE_template[CC_id][UE_id].physicalConfigDedicated!= NULL,
+ "physicalConfigDedicated is null for UE %d\n",
+ UE_id);
+
+ if ((SRconfig = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->schedulingRequestConfig) != NULL) {
+ if (SRconfig->present == SchedulingRequestConfig_PR_setup) {
+ if (SRconfig->choice.setup.sr_ConfigIndex <= 4) { // 5 ms SR period
+ if ((subframeP % 5) != SRconfig->choice.setup.sr_ConfigIndex) continue;
+ } else if (SRconfig->choice.setup.sr_ConfigIndex <= 14) { // 10 ms SR period
+ if (subframeP != (SRconfig->choice.setup.sr_ConfigIndex - 5)) continue;
+ } else if (SRconfig->choice.setup.sr_ConfigIndex <= 34) { // 20 ms SR period
+ if ((10 * (frameP & 1) + subframeP) != (SRconfig->choice.setup.sr_ConfigIndex - 15)) continue;
+ } else if (SRconfig->choice.setup.sr_ConfigIndex <= 74) { // 40 ms SR period
+ if ((10 * (frameP & 3) + subframeP) != (SRconfig->choice.setup.sr_ConfigIndex - 35)) continue;
+ } else if (SRconfig->choice.setup.sr_ConfigIndex <= 154) { // 80 ms SR period
+ if ((10 * (frameP & 7) + subframeP) != (SRconfig->choice.setup.sr_ConfigIndex - 75)) continue;
+ }
+ } // SRconfig->present == SchedulingRequestConfig_PR_setup)
+ } // SRconfig = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->schedulingRequestConfig)!=NULL)
+
+ // if we get here there is some PUCCH1 reception to schedule for SR
+
+ skip_ue = 0;
+ is_harq = 0;
+ // check that there is no existing UL grant for ULSCH which overrides the SR
+ for (i = 0; i < ul_req_body->number_of_pdus; i++) {
+ if (((ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_PDU_TYPE) ||
+ (ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE) ||
+ (ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE) ||
+ (ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE)) &&
+ (ul_req_body->ul_config_pdu_list[i].ulsch_pdu.ulsch_pdu_rel8.rnti == UE_list->UE_template[CC_id][UE_id].rnti)) {
+ skip_ue = 1;
+ break;
+ }
+ /* if there is already an HARQ pdu, convert to SR_HARQ */
+ else if ((ul_req_body->ul_config_pdu_list[i].pdu_type == NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE) &&
+ (ul_req_body->ul_config_pdu_list[i].uci_harq_pdu.ue_information.ue_information_rel8.rnti == UE_list->UE_template[CC_id][UE_id].rnti)) {
+ is_harq = 1;
+ break;
+ }
+ }
- // drop the allocation because ULSCH with handle it with BSR
- if (skip_ue == 1)
- continue;
+ // drop the allocation because ULSCH with handle it with BSR
+ if (skip_ue == 1) continue;
- LOG_D(MAC,"Frame %d, Subframe %d : Scheduling SR for UE %d/%x is_harq:%d\n",frameP,subframeP,UE_id,UE_list->UE_template[CC_id][UE_id].rnti, is_harq);
+ LOG_D(MAC,"Frame %d, Subframe %d : Scheduling SR for UE %d/%x is_harq:%d\n",frameP,subframeP,UE_id,UE_list->UE_template[CC_id][UE_id].rnti, is_harq);
- // check Rel10 or Rel8 SR
+ // check Rel10 or Rel8 SR
#if defined(Rel10) || defined(Rel14)
- if ((UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->ext2)
- && (UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- ext2->schedulingRequestConfig_v1020)
- && (UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- ext2->schedulingRequestConfig_v1020)) {
- sr.sr_information_rel10.tl.tag = NFAPI_UL_CONFIG_REQUEST_SR_INFORMATION_REL10_TAG;
- sr.sr_information_rel10.number_of_pucch_resources = 1;
- sr.sr_information_rel10.pucch_index_p1 =
- *UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- ext2->
- schedulingRequestConfig_v1020->sr_PUCCH_ResourceIndexP1_r10;
- LOG_D(MAC,"REL10 PUCCH INDEX P1:%d\n", sr.sr_information_rel10.pucch_index_p1);
- } else
+ if ((UE_list-> UE_template[CC_id][UE_id].physicalConfigDedicated->ext2)
+ && (UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->ext2->schedulingRequestConfig_v1020)
+ && (UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->ext2->schedulingRequestConfig_v1020)) {
+ sr.sr_information_rel10.tl.tag = NFAPI_UL_CONFIG_REQUEST_SR_INFORMATION_REL10_TAG;
+ sr.sr_information_rel10.number_of_pucch_resources = 1;
+ sr.sr_information_rel10.pucch_index_p1 = *UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->ext2->schedulingRequestConfig_v1020->sr_PUCCH_ResourceIndexP1_r10;
+ LOG_D(MAC,"REL10 PUCCH INDEX P1:%d\n", sr.sr_information_rel10.pucch_index_p1);
+ } else
#endif
- {
- sr.sr_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_SR_INFORMATION_REL8_TAG;
- sr.sr_information_rel8.pucch_index =
- UE_list->
- UE_template[CC_id][UE_id].physicalConfigDedicated->
- schedulingRequestConfig->choice.setup.
- sr_PUCCH_ResourceIndex;
- LOG_D(MAC,"REL8 PUCCH INDEX:%d\n", sr.sr_information_rel8.pucch_index);
- }
+ {
+ sr.sr_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_SR_INFORMATION_REL8_TAG;
+ sr.sr_information_rel8.pucch_index = UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex;
+ LOG_D(MAC,"REL8 PUCCH INDEX:%d\n", sr.sr_information_rel8.pucch_index);
+ }
- /* if there is already an HARQ pdu, convert to SR_HARQ */
- if (is_harq) {
- nfapi_ul_config_harq_information h = ul_req_body->ul_config_pdu_list[i].uci_harq_pdu.harq_information;
- ul_req_body->ul_config_pdu_list[i].pdu_type = NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE;
- ul_req_body->ul_config_pdu_list[i].uci_sr_harq_pdu.sr_information = sr;
- ul_req_body->ul_config_pdu_list[i].uci_sr_harq_pdu.harq_information = h;
- } else {
- ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].pdu_type = NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE;
- ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
- ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel8.rnti = UE_list->UE_template[CC_id][UE_id].rnti;
- ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel11.tl.tag = 0;
- ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel13.tl.tag = 0;
- ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.sr_information = sr;
- ul_req_body->number_of_pdus++;
- } /* if (is_harq) */
- ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
- } // for (UE_id=UE_list->head; UE_id>=0; UE_id=UE_list->next[UE_id])
- } // for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++)
+ /* if there is already an HARQ pdu, convert to SR_HARQ */
+ if (is_harq) {
+ nfapi_ul_config_harq_information h = ul_req_body->ul_config_pdu_list[i].uci_harq_pdu.harq_information;
+ ul_req_body->ul_config_pdu_list[i].pdu_type = NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE;
+ ul_req_body->ul_config_pdu_list[i].uci_sr_harq_pdu.sr_information = sr;
+ ul_req_body->ul_config_pdu_list[i].uci_sr_harq_pdu.harq_information = h;
+ } else {
+ ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].pdu_type = NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE;
+ ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
+ ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel8.rnti = UE_list->UE_template[CC_id][UE_id].rnti;
+ ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel11.tl.tag = 0;
+ ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.ue_information.ue_information_rel13.tl.tag = 0;
+ ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus].uci_sr_pdu.sr_information = sr;
+ ul_req_body->number_of_pdus++;
+ } /* if (is_harq) */
+ ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ } // for (UE_id=UE_list->head; UE_id>=0; UE_id=UE_list->next[UE_id])
+ } // for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++)
}
extern uint8_t nfapi_mode;
@@ -484,156 +357,142 @@ void
check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
frame_t frameP, sub_frame_t subframeP)
{
- UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
- nfapi_dl_config_request_t *DL_req = &RC.mac[module_idP]->DL_req[0];
- uint16_t rnti = UE_RNTI(module_idP, UE_id);
- COMMON_channels_t *cc = RC.mac[module_idP]->common_channels;
-
- // check uplink failure
- if ((UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 0) &&
- (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 0)) {
- LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d \n", UE_id, rnti,
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
- if (UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent == 0) {
- UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 1;
-
- // add a format 1A dci for this UE to request an RA procedure (only one UE per subframe)
- nfapi_dl_config_request_pdu_t *dl_config_pdu =
- &DL_req[CC_id].
- dl_config_request_body.dl_config_pdu_list[DL_req[CC_id].
- dl_config_request_body.number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format =
- NFAPI_DL_DCI_FORMAT_1A;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level =
- get_aggregation(get_bw_index(module_idP, CC_id),
- UE_list->UE_sched_ctrl[UE_id].
- dl_cqi[CC_id], format1A);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
-
- AssertFatal((cc[CC_id].mib->message.dl_Bandwidth >= 0)
- && (cc[CC_id].mib->message.dl_Bandwidth < 6),
- "illegal dl_Bandwidth %d\n",
- (int) cc[CC_id].mib->message.dl_Bandwidth);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- resource_block_coding =
- pdcch_order_table[cc[CC_id].mib->message.dl_Bandwidth];
- DL_req[CC_id].dl_config_request_body.number_dci++;
- DL_req[CC_id].dl_config_request_body.number_pdu++;
- DL_req[CC_id].dl_config_request_body.tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
- LOG_I(MAC,
- "UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d \n",
- UE_id, rnti,
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer,
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.resource_block_coding);
- } else { // ra_pdcch_sent==1
- LOG_I(MAC,
- "UE %d rnti %x: sent PDCCH order for RAPROC waiting (failure timer %d) \n",
- UE_id, rnti,
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
- if ((UE_list->UE_sched_ctrl[UE_id].ul_failure_timer % 40) == 0)
- UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 0; // resend every 4 frames
- }
+ UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
+ nfapi_dl_config_request_t *DL_req = &RC.mac[module_idP]->DL_req[0];
+ uint16_t rnti = UE_RNTI(module_idP, UE_id);
+ COMMON_channels_t *cc = RC.mac[module_idP]->common_channels;
+
+ // check uplink failure
+ if ((UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 0) &&
+ (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 0)) {
+ LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d \n", UE_id, rnti,
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
+ if (UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent == 0) {
+ UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 1;
+
+ // add a format 1A dci for this UE to request an RA procedure (only one UE per subframe)
+ nfapi_dl_config_request_pdu_t *dl_config_pdu = &DL_req[CC_id].dl_config_request_body.dl_config_pdu_list[DL_req[CC_id].dl_config_request_body.number_pdu];
+ memset((void *) dl_config_pdu, 0,sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = get_aggregation(get_bw_index(module_idP, CC_id),
+ UE_list->UE_sched_ctrl[UE_id].
+ dl_cqi[CC_id], format1A);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
+
+ AssertFatal((cc[CC_id].mib->message.dl_Bandwidth >= 0) && (cc[CC_id].mib->message.dl_Bandwidth < 6),
+ "illegal dl_Bandwidth %d\n",
+ (int) cc[CC_id].mib->message.dl_Bandwidth);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = pdcch_order_table[cc[CC_id].mib->message.dl_Bandwidth];
+ DL_req[CC_id].dl_config_request_body.number_dci++;
+ DL_req[CC_id].dl_config_request_body.number_pdu++;
+ DL_req[CC_id].dl_config_request_body.tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
+ LOG_I(MAC,
+ "UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d \n",
+ UE_id, rnti,
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer,
+ dl_config_pdu->dci_dl_pdu.
+ dci_dl_pdu_rel8.resource_block_coding);
+ } else { // ra_pdcch_sent==1
+ LOG_I(MAC,
+ "UE %d rnti %x: sent PDCCH order for RAPROC waiting (failure timer %d) \n",
+ UE_id, rnti,
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
+ if ((UE_list->UE_sched_ctrl[UE_id].ul_failure_timer % 40) == 0) UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 0; // resend every 4 frames
+ }
+
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer++;
+ // check threshold
+ if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 20000) {
+ // inform RRC of failure and clear timer
+ LOG_I(MAC,
+ "UE %d rnti %x: UL Failure after repeated PDCCH orders: Triggering RRC \n",
+ UE_id, rnti);
+ mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP, subframeP,rnti);
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
+ UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 1;
+ }
+ } // ul_failure_timer>0
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer++;
- // check threshold
- if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 20000) {
- // inform RRC of failure and clear timer
- LOG_I(MAC,
- "UE %d rnti %x: UL Failure after repeated PDCCH orders: Triggering RRC \n",
- UE_id, rnti);
- mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP, subframeP,
- rnti);
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
- UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 1;
-//Inform the controller about the UE deactivation. Should be moved to RRC agent in the future
+ //Inform the controller about the UE deactivation. Should be moved to RRC agent in the future
#if defined(FLEXRAN_AGENT_SB_IF)
- if (rrc_agent_registered[module_idP]) {
- agent_rrc_xface[module_idP]->flexran_agent_notify_ue_state_change(module_idP,
- rnti,
- PROTOCOL__FLEX_UE_STATE_CHANGE_TYPE__FLUESC_DEACTIVATED);
- }
+ if (rrc_agent_registered[module_idP]) {
+ agent_rrc_xface[module_idP]->flexran_agent_notify_ue_state_change(module_idP,
+ rnti, PROTOCOL__FLEX_UE_STATE_CHANGE_TYPE__FLUESC_DEACTIVATED);
+ }
#endif
- }
- } // ul_failure_timer>0
-
- UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer++;
- if(UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer > (U_PLANE_INACTIVITY_VALUE*subframe_num(&RC.eNB[module_idP][CC_id]->frame_parms))){
- LOG_D(MAC,"UE %d rnti %x: U-Plane Failure after repeated PDCCH orders: Triggering RRC \n",UE_id,rnti);
- mac_eNB_rrc_uplane_failure(module_idP,CC_id,frameP,subframeP,rnti);
- UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
- }// time > 60s
+
+ UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer++;
+ if(UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer > (U_PLANE_INACTIVITY_VALUE*subframe_num(&RC.eNB[module_idP][CC_id]->frame_parms))){
+ LOG_D(MAC,"UE %d rnti %x: U-Plane Failure after repeated PDCCH orders: Triggering RRC \n",UE_id,rnti);
+ mac_eNB_rrc_uplane_failure(module_idP,CC_id,frameP,subframeP,rnti);
+ UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
+ }// time > 60s
}
void
clear_nfapi_information(eNB_MAC_INST * eNB, int CC_idP,
frame_t frameP, sub_frame_t subframeP)
{
- nfapi_dl_config_request_t *DL_req = &eNB->DL_req[0];
- nfapi_ul_config_request_t *UL_req = &eNB->UL_req[0];
- nfapi_hi_dci0_request_t *HI_DCI0_req = &eNB->HI_DCI0_req[0];
- nfapi_tx_request_t *TX_req = &eNB->TX_req[0];
+ nfapi_dl_config_request_t *DL_req = &eNB->DL_req[0];
+ nfapi_ul_config_request_t *UL_req = &eNB->UL_req[0];
+ nfapi_hi_dci0_request_t *HI_DCI0_req = &eNB->HI_DCI0_req[0];
+ nfapi_tx_request_t *TX_req = &eNB->TX_req[0];
- eNB->pdu_index[CC_idP] = 0;
+ eNB->pdu_index[CC_idP] = 0;
- if (nfapi_mode==0 || nfapi_mode == 1) { // monolithic or PNF
+ if (nfapi_mode==0 || nfapi_mode == 1) { // monolithic or PNF
- DL_req[CC_idP].dl_config_request_body.number_pdcch_ofdm_symbols = 1;
- DL_req[CC_idP].dl_config_request_body.number_dci = 0;
- DL_req[CC_idP].dl_config_request_body.number_pdu = 0;
- DL_req[CC_idP].dl_config_request_body.number_pdsch_rnti = 0;
- DL_req[CC_idP].dl_config_request_body.transmission_power_pcfich = 6000;
+ DL_req[CC_idP].dl_config_request_body.number_pdcch_ofdm_symbols = 1;
+ DL_req[CC_idP].dl_config_request_body.number_dci = 0;
+ DL_req[CC_idP].dl_config_request_body.number_pdu = 0;
+ DL_req[CC_idP].dl_config_request_body.number_pdsch_rnti = 0;
+ DL_req[CC_idP].dl_config_request_body.transmission_power_pcfich = 6000;
- HI_DCI0_req[CC_idP].hi_dci0_request_body.sfnsf = subframeP + (frameP<<4);
- HI_DCI0_req[CC_idP].hi_dci0_request_body.number_of_dci = 0;
+ HI_DCI0_req[CC_idP].hi_dci0_request_body.sfnsf = subframeP + (frameP<<4);
+ HI_DCI0_req[CC_idP].hi_dci0_request_body.number_of_dci = 0;
- UL_req[CC_idP].ul_config_request_body.number_of_pdus = 0;
- UL_req[CC_idP].ul_config_request_body.rach_prach_frequency_resources = 0; // ignored, handled by PHY for now
- UL_req[CC_idP].ul_config_request_body.srs_present = 0; // ignored, handled by PHY for now
+ UL_req[CC_idP].ul_config_request_body.number_of_pdus = 0;
+ UL_req[CC_idP].ul_config_request_body.rach_prach_frequency_resources = 0; // ignored, handled by PHY for now
+ UL_req[CC_idP].ul_config_request_body.srs_present = 0; // ignored, handled by PHY for now
- TX_req[CC_idP].tx_request_body.number_of_pdus = 0;
+ TX_req[CC_idP].tx_request_body.number_of_pdus = 0;
- }
+ }
}
void
copy_ulreq(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
{
- int CC_id;
- eNB_MAC_INST *mac = RC.mac[module_idP];
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ int CC_id;
+ eNB_MAC_INST *mac = RC.mac[module_idP];
- nfapi_ul_config_request_t *ul_req_tmp = &mac->UL_req_tmp[CC_id][subframeP];
- nfapi_ul_config_request_t *ul_req = &mac->UL_req[CC_id];
- nfapi_ul_config_request_pdu_t *ul_req_pdu = ul_req->ul_config_request_body.ul_config_pdu_list;
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- *ul_req = *ul_req_tmp;
+ nfapi_ul_config_request_t *ul_req_tmp = &mac->UL_req_tmp[CC_id][subframeP];
+ nfapi_ul_config_request_t *ul_req = &mac->UL_req[CC_id];
+ nfapi_ul_config_request_pdu_t *ul_req_pdu = ul_req->ul_config_request_body.ul_config_pdu_list;
- // Restore the pointer
- ul_req->ul_config_request_body.ul_config_pdu_list = ul_req_pdu;
+ *ul_req = *ul_req_tmp;
- ul_req->sfn_sf = (frameP<<4) + subframeP;
+ // Restore the pointer
+ ul_req->ul_config_request_body.ul_config_pdu_list = ul_req_pdu;
+ ul_req->sfn_sf = (frameP<<4) + subframeP;
+ ul_req_tmp->ul_config_request_body.number_of_pdus = 0;
- ul_req_tmp->ul_config_request_body.number_of_pdus = 0;
-
- if (ul_req->ul_config_request_body.number_of_pdus>0)
+ if (ul_req->ul_config_request_body.number_of_pdus>0)
{
LOG_D(PHY, "%s() active NOW (frameP:%d subframeP:%d) pdus:%d\n", __FUNCTION__, frameP, subframeP, ul_req->ul_config_request_body.number_of_pdus);
}
- memcpy((void*)ul_req->ul_config_request_body.ul_config_pdu_list,
- (void*)ul_req_tmp->ul_config_request_body.ul_config_pdu_list,
- ul_req->ul_config_request_body.number_of_pdus*sizeof(nfapi_ul_config_request_pdu_t));
+ memcpy((void*)ul_req->ul_config_request_body.ul_config_pdu_list,
+ (void*)ul_req_tmp->ul_config_request_body.ul_config_pdu_list,
+ ul_req->ul_config_request_body.number_of_pdus*sizeof(nfapi_ul_config_request_pdu_t));
}
}
@@ -642,184 +501,196 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP,
sub_frame_t subframeP)
{
- int mbsfn_status[MAX_NUM_CCs];
- protocol_ctxt_t ctxt;
+ int mbsfn_status[MAX_NUM_CCs];
+ protocol_ctxt_t ctxt;
- int CC_id, i; //,next_i;
- UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
- rnti_t rnti;
+ int CC_id, i;
+ UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
+ rnti_t rnti;
- COMMON_channels_t *cc = RC.mac[module_idP]->common_channels;
+ COMMON_channels_t *cc = RC.mac[module_idP]->common_channels;
#if defined(FLEXRAN_AGENT_SB_IF)
- Protocol__FlexranMessage *msg;
+ Protocol__FlexranMessage *msg;
#endif
- start_meas(&RC.mac[module_idP]->eNB_scheduler);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ULSCH_SCHEDULER,
- VCD_FUNCTION_IN);
+ start_meas(&RC.mac[module_idP]->eNB_scheduler);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ULSCH_SCHEDULER,
+ VCD_FUNCTION_IN);
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- mbsfn_status[CC_id] = 0;
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ mbsfn_status[CC_id] = 0;
- // clear vrb_maps
- memset(cc[CC_id].vrb_map, 0, 100);
- memset(cc[CC_id].vrb_map_UL, 0, 100);
+ // clear vrb_maps
+ memset(cc[CC_id].vrb_map, 0, 100);
+ memset(cc[CC_id].vrb_map_UL, 0, 100);
#if defined(Rel10) || defined(Rel14)
- cc[CC_id].mcch_active = 0;
+ cc[CC_id].mcch_active = 0;
#endif
- RC.mac[module_idP]->frame = frameP;
- RC.mac[module_idP]->subframe = subframeP;
-
- clear_nfapi_information(RC.mac[module_idP], CC_id, frameP,
- subframeP);
+ RC.mac[module_idP]->frame = frameP;
+ RC.mac[module_idP]->subframe = subframeP;
+
+
+ RC.eNB[module_idP][CC_id]->pusch_stats_bsr[i][(frameP * 10) +
+ subframeP] = -63;
+ if (i == UE_list->head)
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
+ (VCD_SIGNAL_DUMPER_VARIABLES_UE0_BSR,
+ RC.eNB[module_idP][CC_id]->
+ pusch_stats_bsr[i][(frameP * 10) + subframeP]);
+ // increment this, it is cleared when we receive an sdu
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ul_inactivity_timer++;
+
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].cqi_req_timer++;
+ LOG_D(MAC, "UE %d/%x : ul_inactivity %d, cqi_req %d\n", i, rnti,
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].
+ ul_inactivity_timer,
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].cqi_req_timer);
+ check_ul_failure(module_idP, CC_id, i, frameP, subframeP);
+
+ if (RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer > 0) {
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer++;
+ if(RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer >=
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer_thres) {
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer = 0;
+ for (int ue_id_l = 0; ue_id_l < NUMBER_OF_UE_MAX; ue_id_l++) {
+ if (reestablish_rnti_map[ue_id_l][0] == rnti) {
+ // clear currentC-RNTI from map
+ reestablish_rnti_map[ue_id_l][0] = 0;
+ reestablish_rnti_map[ue_id_l][1] = 0;
+ break;
+ }
+ }
+ for (int ii=0; ii<NUMBER_OF_UE_MAX; ii++) {
+ LTE_eNB_ULSCH_t *ulsch = RC.eNB[module_idP][CC_id]->ulsch[ii];
+ if((ulsch != NULL) && (ulsch->rnti == rnti)){
+ LOG_I(MAC, "clean_eNb_ulsch UE %x \n", rnti);
+ clean_eNb_ulsch(ulsch);
+ }
+ }
+ for (int ii=0; ii<NUMBER_OF_UE_MAX; ii++) {
+ LTE_eNB_DLSCH_t *dlsch = RC.eNB[module_idP][CC_id]->dlsch[ii][0];
+ if((dlsch != NULL) && (dlsch->rnti == rnti)){
+ LOG_I(MAC, "clean_eNb_dlsch UE %x \n", rnti);
+ clean_eNb_dlsch(dlsch);
+ }
+ }
+
+ for(int j = 0; j < 10; j++){
+ nfapi_ul_config_request_body_t *ul_req_tmp = NULL;
+ ul_req_tmp = &RC.mac[module_idP]->UL_req_tmp[CC_id][j].ul_config_request_body;
+ if(ul_req_tmp){
+ int pdu_number = ul_req_tmp->number_of_pdus;
+ for(int pdu_index = pdu_number-1; pdu_index >= 0; pdu_index--){
+ if(ul_req_tmp->ul_config_pdu_list[pdu_index].ulsch_pdu.ulsch_pdu_rel8.rnti == rnti){
+ LOG_I(MAC, "remove UE %x from ul_config_pdu_list %d/%d\n", rnti, pdu_index, pdu_number);
+ if(pdu_index < pdu_number -1){
+ memcpy(&ul_req_tmp->ul_config_pdu_list[pdu_index], &ul_req_tmp->ul_config_pdu_list[pdu_index+1], (pdu_number-1-pdu_index) * sizeof(nfapi_ul_config_request_pdu_t));
+ }
+ ul_req_tmp->number_of_pdus--;
+ }
+ }
+ }
+ }
+ rrc_mac_remove_ue(module_idP,rnti);
+ }
}
+ }
// refresh UE list based on UEs dropped by PHY in previous subframe
- for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
- if (UE_list->active[i] != TRUE)
- continue;
-
- rnti = UE_RNTI(module_idP, i);
- CC_id = UE_PCCID(module_idP, i);
-
- if ((frameP == 0) && (subframeP == 0)) {
- LOG_I(MAC,
- "UE rnti %x : %s, PHR %d dB DL CQI %d PUSCH SNR %d PUCCH SNR %d\n",
- rnti,
- UE_list->UE_sched_ctrl[i].ul_out_of_sync ==
- 0 ? "in synch" : "out of sync",
- UE_list->UE_template[CC_id][i].phr_info,
- UE_list->UE_sched_ctrl[i].dl_cqi[CC_id],
- (UE_list->UE_sched_ctrl[i].pusch_snr[CC_id] - 128) / 2,
- (UE_list->UE_sched_ctrl[i].pucch1_snr[CC_id] - 128) / 2);
- }
+ for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
+ if (UE_list->active[i] != TRUE) continue;
+
+ rnti = UE_RNTI(module_idP, i);
+ CC_id = UE_PCCID(module_idP, i);
+
+ if ((frameP == 0) && (subframeP == 0)) {
+ LOG_I(MAC,
+ "UE rnti %x : %s, PHR %d dB DL CQI %d PUSCH SNR %d PUCCH SNR %d\n",
+ rnti,
+ UE_list->UE_sched_ctrl[i].ul_out_of_sync ==
+ 0 ? "in synch" : "out of sync",
+ UE_list->UE_template[CC_id][i].phr_info,
+ UE_list->UE_sched_ctrl[i].dl_cqi[CC_id],
+ (UE_list->UE_sched_ctrl[i].pusch_snr[CC_id] - 128) / 2,
+ (UE_list->UE_sched_ctrl[i].pucch1_snr[CC_id] - 128) / 2);
+ }
- RC.eNB[module_idP][CC_id]->pusch_stats_bsr[i][(frameP * 10) +
- subframeP] = -63;
- if (i == UE_list->head)
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
- (VCD_SIGNAL_DUMPER_VARIABLES_UE0_BSR,
- RC.eNB[module_idP][CC_id]->
- pusch_stats_bsr[i][(frameP * 10) + subframeP]);
- // increment this, it is cleared when we receive an sdu
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ul_inactivity_timer++;
-
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].cqi_req_timer++;
- LOG_D(MAC, "UE %d/%x : ul_inactivity %d, cqi_req %d\n", i, rnti,
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].
- ul_inactivity_timer,
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].cqi_req_timer);
- check_ul_failure(module_idP, CC_id, i, frameP, subframeP);
-
- if (RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer > 0) {
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer++;
- if(RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer >=
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer_thres) {
- RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ue_reestablishment_reject_timer = 0;
- for (int ue_id_l = 0; ue_id_l < NUMBER_OF_UE_MAX; ue_id_l++) {
- if (reestablish_rnti_map[ue_id_l][0] == rnti) {
- // clear currentC-RNTI from map
- reestablish_rnti_map[ue_id_l][0] = 0;
- reestablish_rnti_map[ue_id_l][1] = 0;
- break;
- }
- }
- for (int ii=0; ii<NUMBER_OF_UE_MAX; ii++) {
- LTE_eNB_ULSCH_t *ulsch = RC.eNB[module_idP][CC_id]->ulsch[ii];
- if((ulsch != NULL) && (ulsch->rnti == rnti)){
- LOG_I(MAC, "clean_eNb_ulsch UE %x \n", rnti);
- clean_eNb_ulsch(ulsch);
- }
- }
- for (int ii=0; ii<NUMBER_OF_UE_MAX; ii++) {
- LTE_eNB_DLSCH_t *dlsch = RC.eNB[module_idP][CC_id]->dlsch[ii][0];
- if((dlsch != NULL) && (dlsch->rnti == rnti)){
- LOG_I(MAC, "clean_eNb_dlsch UE %x \n", rnti);
- clean_eNb_dlsch(dlsch);
- }
- }
-
- for(int j = 0; j < 10; j++){
- nfapi_ul_config_request_body_t *ul_req_tmp = NULL;
- ul_req_tmp = &RC.mac[module_idP]->UL_req_tmp[CC_id][j].ul_config_request_body;
- if(ul_req_tmp){
- int pdu_number = ul_req_tmp->number_of_pdus;
- for(int pdu_index = pdu_number-1; pdu_index >= 0; pdu_index--){
- if(ul_req_tmp->ul_config_pdu_list[pdu_index].ulsch_pdu.ulsch_pdu_rel8.rnti == rnti){
- LOG_I(MAC, "remove UE %x from ul_config_pdu_list %d/%d\n", rnti, pdu_index, pdu_number);
- if(pdu_index < pdu_number -1){
- memcpy(&ul_req_tmp->ul_config_pdu_list[pdu_index], &ul_req_tmp->ul_config_pdu_list[pdu_index+1], (pdu_number-1-pdu_index) * sizeof(nfapi_ul_config_request_pdu_t));
- }
- ul_req_tmp->number_of_pdus--;
- }
- }
- }
- }
- rrc_mac_remove_ue(module_idP,rnti);
- }
- }
+ RC.eNB[module_idP][CC_id]->pusch_stats_bsr[i][(frameP * 10) + subframeP] = -63;
+ if (i == UE_list->head)
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
+ (VCD_SIGNAL_DUMPER_VARIABLES_UE0_BSR,
+ RC.eNB[module_idP][CC_id]->
+ pusch_stats_bsr[i][(frameP * 10) + subframeP]);
+ // increment this, it is cleared when we receive an sdu
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].ul_inactivity_timer++;
+
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].cqi_req_timer++;
+ LOG_D(MAC, "UE %d/%x : ul_inactivity %d, cqi_req %d\n", i, rnti,
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].
+ ul_inactivity_timer,
+ RC.mac[module_idP]->UE_list.UE_sched_ctrl[i].cqi_req_timer);
+ check_ul_failure(module_idP, CC_id, i, frameP, subframeP);
+ }
- }
+ PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, ENB_FLAG_YES,
+ NOT_A_RNTI, frameP, subframeP,
+ module_idP);
+ pdcp_run(&ctxt);
- PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, ENB_FLAG_YES,
- NOT_A_RNTI, frameP, subframeP,
- module_idP);
- pdcp_run(&ctxt);
- rrc_rx_tx(&ctxt, CC_id);
+ rrc_rx_tx(&ctxt, CC_id);
#if defined(Rel10) || defined(Rel14)
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- if (cc[CC_id].MBMS_flag > 0) {
- start_meas(&RC.mac[module_idP]->schedule_mch);
- mbsfn_status[CC_id] =
- schedule_MBMS(module_idP, CC_id, frameP, subframeP);
- stop_meas(&RC.mac[module_idP]->schedule_mch);
- }
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ if (cc[CC_id].MBMS_flag > 0) {
+ start_meas(&RC.mac[module_idP]->schedule_mch);
+ mbsfn_status[CC_id] = schedule_MBMS(module_idP, CC_id, frameP, subframeP);
+ stop_meas(&RC.mac[module_idP]->schedule_mch);
}
+ }
#endif
- // This schedules MIB
- if ((subframeP == 0) && (frameP & 3) == 0)
- schedule_mib(module_idP, frameP, subframeP);
- // This schedules SI for legacy LTE and eMTC starting in subframeP
- schedule_SI(module_idP, frameP, subframeP);
- // This schedules Paging in subframeP
- schedule_PCH(module_idP,frameP,subframeP);
- // This schedules Random-Access for legacy LTE and eMTC starting in subframeP
- schedule_RA(module_idP, frameP, subframeP);
- // copy previously scheduled UL resources (ULSCH + HARQ)
- copy_ulreq(module_idP, frameP, subframeP);
- // This schedules SRS in subframeP
- schedule_SRS(module_idP, frameP, subframeP);
- // This schedules ULSCH in subframeP (dci0)
- schedule_ulsch(module_idP, frameP, subframeP);
- // This schedules UCI_SR in subframeP
- schedule_SR(module_idP, frameP, subframeP);
- // This schedules UCI_CSI in subframeP
- schedule_CSI(module_idP, frameP, subframeP);
- // This schedules DLSCH in subframeP
- schedule_dlsch(module_idP, frameP, subframeP, mbsfn_status);
+ // This schedules MIB
+ if ((subframeP == 0) && (frameP & 3) == 0)
+ schedule_mib(module_idP, frameP, subframeP);
+ // This schedules SI for legacy LTE and eMTC starting in subframeP
+ schedule_SI(module_idP, frameP, subframeP);
+ // This schedules Paging in subframeP
+ schedule_PCH(module_idP,frameP,subframeP);
+ // This schedules Random-Access for legacy LTE and eMTC starting in subframeP
+ schedule_RA(module_idP, frameP, subframeP);
+ // copy previously scheduled UL resources (ULSCH + HARQ)
+ copy_ulreq(module_idP, frameP, subframeP);
+ // This schedules SRS in subframeP
+ schedule_SRS(module_idP, frameP, subframeP);
+ // This schedules ULSCH in subframeP (dci0)
+ schedule_ulsch(module_idP, frameP, subframeP);
+ // This schedules UCI_SR in subframeP
+ schedule_SR(module_idP, frameP, subframeP);
+ // This schedules UCI_CSI in subframeP
+ schedule_CSI(module_idP, frameP, subframeP);
+ // This schedules DLSCH in subframeP
+ schedule_dlsch(module_idP, frameP, subframeP, mbsfn_status);
#if defined(FLEXRAN_AGENT_SB_IF)
- flexran_agent_send_update_stats(module_idP);
+ flexran_agent_send_update_stats(module_idP);
#endif
-
- // Allocate CCEs for good after scheduling is done
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++)
- allocate_CCEs(module_idP, CC_id, subframeP, 0);
+
+ // Allocate CCEs for good after scheduling is done
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++)
+ allocate_CCEs(module_idP, CC_id, subframeP, 0);
- stop_meas(&RC.mac[module_idP]->eNB_scheduler);
+ stop_meas(&RC.mac[module_idP]->eNB_scheduler);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ULSCH_SCHEDULER,
- VCD_FUNCTION_OUT);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ULSCH_SCHEDULER,
+ VCD_FUNCTION_OUT);
}
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index 4bf96d3bce0afb5a8fa23ec555c9a4f3ca1f835b..3005ecf464233f379d856c22441608f6ea1ca182 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -135,48 +135,35 @@ add_msg3(module_id_t module_idP, int CC_id, RA_t * ra, frame_t frameP,
memset((void *) ul_config_pdu, 0,
sizeof(nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_PDU_TYPE;
- ul_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_pdu));
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.handle = mac->ul_handle++;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL8_TAG;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti = ra->rnti;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.resource_block_start =
- narrowband_to_first_rb(cc,
- ra->msg34_narrowband) +
- ra->msg3_first_rb;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks =
- ra->msg3_nb_rb;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 2;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.cyclic_shift_2_for_drms =
- 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.
- frequency_hopping_enabled_flag = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version =
- rvseq[ra->msg3_round];
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number =
- ((10 * ra->Msg3_frame) + ra->Msg3_subframe) & 7;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = 1;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.size =
- get_TBS_UL(ra->msg3_mcs, ra->msg3_nb_rb);
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_PDU_TYPE;
+ ul_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_pdu));
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.handle = mac->ul_handle++;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL8_TAG;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti = ra->rnti;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.resource_block_start = narrowband_to_first_rb(cc,
+ ra->msg34_narrowband) + ra->msg3_first_rb;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks = ra->msg3_nb_rb;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 2;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.cyclic_shift_2_for_drms = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_enabled_flag = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version = rvseq[ra->msg3_round];
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number = ((10 * ra->Msg3_frame) + ra->Msg3_subframe) & 7;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = 1;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.size = get_TBS_UL(ra->msg3_mcs, ra->msg3_nb_rb);
// Re13 fields
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL13_TAG;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.ue_type =
- ra->rach_resource_type > 2 ? 2 : 1;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.
- total_number_of_repetitions = 1;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.repetition_number = 1;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.
- initial_transmission_sf_io =
- (ra->Msg3_frame * 10) + ra->Msg3_subframe;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL13_TAG;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.ue_type = ra->rach_resource_type > 2 ? 2 : 1;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.total_number_of_repetitions = 1;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.repetition_number = 1;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.initial_transmission_sf_io = (ra->Msg3_frame * 10) + ra->Msg3_subframe;
ul_req_body->number_of_pdus++;
- ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
- ul_req->sfn_sf = ra->Msg3_frame<<4|ra->Msg3_subframe;
- ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
+ ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ ul_req->sfn_sf = ra->Msg3_frame<<4|ra->Msg3_subframe;
+ ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
} // if (ra->rach_resource_type>0) {
else
#endif
@@ -191,42 +178,32 @@ add_msg3(module_id_t module_idP, int CC_id, RA_t * ra, frame_t frameP,
frameP, subframeP, ra->Msg3_frame, ra->Msg3_subframe,
ra->msg3_nb_rb, ra->msg3_first_rb, ra->msg3_round);
- ul_config_pdu =
- &ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus];
+ ul_config_pdu = &ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus];
- memset((void *) ul_config_pdu, 0,
- sizeof(nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_PDU_TYPE;
- ul_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_pdu));
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL8_TAG;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.handle = mac->ul_handle++;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti = ra->rnti;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.resource_block_start =
- ra->msg3_first_rb;
+ memset((void *) ul_config_pdu, 0, sizeof(nfapi_ul_config_request_pdu_t));
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_PDU_TYPE;
+ ul_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_pdu));
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL8_TAG;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.handle = mac->ul_handle++;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti = ra->rnti;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.resource_block_start = ra->msg3_first_rb;
AssertFatal(ra->msg3_nb_rb > 0, "nb_rb = 0\n");
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks =
- ra->msg3_nb_rb;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 2;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.cyclic_shift_2_for_drms =
- 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.
- frequency_hopping_enabled_flag = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version =
- rvseq[ra->msg3_round];
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number =
- subframe2harqpid(cc, ra->Msg3_frame, ra->Msg3_subframe);
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = 0;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = 1;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.size =
- get_TBS_UL(10, ra->msg3_nb_rb);
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks = ra->msg3_nb_rb;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 2;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.cyclic_shift_2_for_drms = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_enabled_flag = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version = rvseq[ra->msg3_round];
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number = subframe2harqpid(cc, ra->Msg3_frame, ra->Msg3_subframe);
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = 0;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = 1;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.size = get_TBS_UL(10, ra->msg3_nb_rb);
ul_req_body->number_of_pdus++;
- ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
- ul_req->sfn_sf = ra->Msg3_frame<<4|ra->Msg3_subframe;
- ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
+ ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ ul_req->sfn_sf = ra->Msg3_frame<<4|ra->Msg3_subframe;
+ ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
// save UL scheduling information for preprocessor
for (j = 0; j < ra->msg3_nb_rb; j++)
cc->vrb_map_UL[ra->msg3_first_rb + j] = 1;
@@ -237,20 +214,19 @@ add_msg3(module_id_t module_idP, int CC_id, RA_t * ra, frame_t frameP,
hi_dci0_pdu = &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
memset((void *) hi_dci0_pdu, 0,
sizeof(nfapi_hi_dci0_request_pdu_t));
- hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_HI_PDU_TYPE;
- hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_hi_pdu);
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_HI_PDU_REL8_TAG;
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.resource_block_start =
- ra->msg3_first_rb;
+ hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_HI_PDU_TYPE;
+ hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_hi_pdu);
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_HI_PDU_REL8_TAG;
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.resource_block_start = ra->msg3_first_rb;
hi_dci0_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms = 0;
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.hi_value = 0;
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.hi_value = 0;
hi_dci0_req_body->number_of_hi++;
- hi_dci0_req_body->sfnsf = sfnsf_add_subframe(ra->Msg3_frame, ra->Msg3_subframe, 0);
- hi_dci0_req_body->tl.tag = NFAPI_HI_DCI0_REQUEST_BODY_TAG;
+ hi_dci0_req_body->sfnsf = sfnsf_add_subframe(ra->Msg3_frame, ra->Msg3_subframe, 0);
+ hi_dci0_req_body->tl.tag = NFAPI_HI_DCI0_REQUEST_BODY_TAG;
- hi_dci0_req->sfn_sf = sfnsf_add_subframe(ra->Msg3_frame, ra->Msg3_subframe, 4);
- hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
+ hi_dci0_req->sfn_sf = sfnsf_add_subframe(ra->Msg3_frame, ra->Msg3_subframe, 4);
+ hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
if (nfapi_mode) {
oai_nfapi_hi_dci0_req(hi_dci0_req);
@@ -312,11 +288,8 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
if (cc[CC_idP].radioResourceConfigCommon_BR) {
- ext4_prach =
- cc[CC_idP].radioResourceConfigCommon_BR->ext4->
- prach_ConfigCommon_v1310;
- prach_ParametersListCE_r13 =
- &ext4_prach->prach_ParametersListCE_r13;
+ ext4_prach = cc[CC_idP].radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
+ prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
switch (prach_ParametersListCE_r13->list.count) {
case 4:
@@ -348,110 +321,71 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
// rmax from SIB2 information
AssertFatal(rmax < 9, "rmax>8!\n");
- rmax =
- 1 << p[ra->rach_resource_type -
- 1]->mpdcch_NumRepetition_RA_r13;
+ rmax = 1 << p[ra->rach_resource_type-1]->mpdcch_NumRepetition_RA_r13;
// choose r1 by default for RAR (Table 9.1.5-5)
rep = 0;
// get actual repetition count from Table 9.1.5-3
reps = (rmax <= 8) ? (1 << rep) : (rmax >> (3 - rep));
// get narrowband according to higher-layer config
- num_nb =
- p[ra->rach_resource_type -
- 1]->mpdcch_NarrowbandsToMonitor_r13.list.count;
- ra->msg2_narrowband =
- *p[ra->rach_resource_type -
- 1]->mpdcch_NarrowbandsToMonitor_r13.list.array[ra->
- preamble_index
- % num_nb];
- first_rb =
- narrowband_to_first_rb(&cc[CC_idP], ra->msg2_narrowband);
+ num_nb = p[ra->rach_resource_type-1]->mpdcch_NarrowbandsToMonitor_r13.list.count;
+ ra->msg2_narrowband = *p[ra->rach_resource_type - 1]->mpdcch_NarrowbandsToMonitor_r13.list.array[ra->preamble_index % num_nb];
+ first_rb = narrowband_to_first_rb(&cc[CC_idP], ra->msg2_narrowband);
if ((ra->msg2_mpdcch_repetition_cnt == 0) &&
- (mpdcch_sf_condition
- (mac, CC_idP, frameP, subframeP, rmax, TYPE2, -1) > 0)) {
+ (mpdcch_sf_condition(mac, CC_idP, frameP, subframeP, rmax, TYPE2, -1) > 0)) {
// MPDCCH configuration for RAR
LOG_D(MAC,
"[eNB %d][RAPROC] Frame %d, Subframe %d : In generate_Msg2, Programming MPDCCH %d repetitions\n",
module_idP, frameP, subframeP, reps);
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_mpdcch_pdu));
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_MPDCCH_PDU_REL13_TAG;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_format =
- (ra->rach_resource_type > 1) ? 11 : 10;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_narrow_band =
- ra->msg2_narrowband;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- number_of_prb_pairs = 6;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_assignment = 0; // Note: this can be dynamic
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_tansmission_type = 1; // imposed (9.1.5 in 213) for Type 2 Common search space
- AssertFatal(cc[CC_idP].
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13
- != NULL,
+ memset((void *) dl_config_pdu, 0,sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_mpdcch_pdu));
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_MPDCCH_PDU_REL13_TAG;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_format = (ra->rach_resource_type > 1) ? 11 : 10;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_narrow_band = ra->msg2_narrowband;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_prb_pairs = 6;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_assignment = 0; // Note: this can be dynamic
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_tansmission_type = 1; // imposed (9.1.5 in 213) for Type 2 Common search space
+ AssertFatal(cc[CC_idP].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13!= NULL,
"cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13 is null\n");
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.start_symbol =
- cc[CC_idP].sib1_v13ext->
- bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ecce_index = 0; // Note: this should be dynamic
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.aggregation_level = 16; // OK for CEModeA r1-3 (9.1.5-1b) or CEModeB r1-4
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti_type = 2; // RA-RNTI
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti = ra->RA_rnti;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ce_mode =
- (ra->rach_resource_type < 3) ? 1 : 2;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- drms_scrambling_init = cc[CC_idP].physCellId;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- initial_transmission_sf_io = (frameP * 10) + subframeP;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.transmission_power = 6000; // 0dB
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_coding = getRIV(6, 0, 6); // Note: still to be checked if it should not be (getRIV(N_RB_DL,first_rb,6)) : Check nFAPI specifications and what is done L1 with this parameter
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.start_symbol = cc[CC_idP].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ecce_index = 0; // Note: this should be dynamic
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.aggregation_level = 16; // OK for CEModeA r1-3 (9.1.5-1b) or CEModeB r1-4
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti_type = 2; // RA-RNTI
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti = ra->RA_rnti;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ce_mode = (ra->rach_resource_type < 3) ? 1 : 2;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.drms_scrambling_init = cc[CC_idP].physCellId;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.initial_transmission_sf_io = (frameP * 10) + subframeP;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.transmission_power = 6000; // 0dB
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_coding = getRIV(6, 0, 6); // Note: still to be checked if it should not be (getRIV(N_RB_DL,first_rb,6)) : Check nFAPI specifications and what is done L1 with this parameter
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mcs = 4; // adjust according to size of RAR, 208 bits with N1A_PRB=3
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pdsch_reptition_levels = 4; // fix to 4 for now
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.redundancy_version =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.new_data_indicator =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_process = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi_length = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi_flag = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- harq_resource_offset = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.dci_subframe_repetition_number = rep;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpc = 1; // N1A_PRB=3 (36.212); => 208 bits for mcs=4, choose mcs according t message size TBD
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.downlink_assignment_index_length = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- downlink_assignment_index = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- allocate_prach_flag = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.preamble_index = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.prach_mask_index =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.starting_ce_level =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.srs_request = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity_flag
- = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.frequency_hopping_enabled_flag = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.paging_direct_indication_differentiation_flag
- = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.direct_indication =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.total_dci_length_including_padding = 0; // this is not needed by OAI L1, but should be filled in
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- number_of_tx_antenna_ports = 1;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pdsch_reptition_levels = 4; // fix to 4 for now
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.redundancy_version = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.new_data_indicator = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_process = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi_length = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_resource_offset = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_subframe_repetition_number = rep;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpc = 1; // N1A_PRB=3 (36.212); => 208 bits for mcs=4, choose mcs according t message size TBD
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index_length = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.allocate_prach_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.preamble_index = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.prach_mask_index = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.starting_ce_level = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.srs_request = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.frequency_hopping_enabled_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.paging_direct_indication_differentiation_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.direct_indication = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.total_dci_length_including_padding = 0; // this is not needed by OAI L1, but should be filled in
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_tx_antenna_ports = 1;
ra->msg2_mpdcch_repetition_cnt++;
dl_req->number_pdu++;
dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
@@ -489,65 +423,43 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
ra->state = WAITMSG3;
LOG_D(MAC,"[eNB %d][RAPROC] Frame %d, Subframe %d: state:WAITMSG3\n", module_idP, frameP, subframeP);
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index =
- mac->pdu_index[CC_idP];
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = ra->RA_rnti;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- resource_allocation_type = 2;
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void *) dl_config_pdu, 0,sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = mac->pdu_index[CC_idP];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = ra->RA_rnti;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- resource_block_coding = getRIV(N_RB_DL, first_rb, 6);
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- redundancy_version = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag =
- 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers =
- 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- number_of_subbands = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 6);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- ue_category_capacity = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- delta_power_offset_index = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode =
- (cc->p_eNB == 1) ? 1 : 2;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- num_bf_prb_per_subband = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
// Rel10 fields
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start =
- cc[CC_idP].
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->
- startSymbolBR_r13;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = cc[CC_idP].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
// Rel13 fields
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type =
- (ra->rach_resource_type < 3) ? 1 : 2;;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not SI message
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.
- initial_transmission_sf_io = (10 * frameP) + subframeP;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.drms_table_flag =
- 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = (ra->rach_resource_type < 3) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not SI message
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = (10 * frameP) + subframeP;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.drms_table_flag = 0;
dl_req->number_pdu++;
mac->DL_req[CC_idP].sfn_sf = (frameP<<4)+subframeP;
@@ -567,16 +479,12 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
mac->TX_req[CC_idP].header.message_id = NFAPI_TX_REQUEST;
mac->TX_req[CC_idP].sfn_sf = (frameP << 4) + subframeP;
TX_req =
- &mac->TX_req[CC_idP].tx_request_body.tx_pdu_list[mac->
- TX_req
- [CC_idP].
- tx_request_body.number_of_pdus];
+ &mac->TX_req[CC_idP].tx_request_body.tx_pdu_list[mac->TX_req[CC_idP].tx_request_body.number_of_pdus];
TX_req->pdu_length = 7; // This should be changed if we have more than 1 preamble
TX_req->pdu_index = mac->pdu_index[CC_idP]++;
TX_req->num_segments = 1;
TX_req->segments[0].segment_length = 7;
- TX_req->segments[0].segment_data =
- cc[CC_idP].RAR_pdu.payload;
+ TX_req->segments[0].segment_data = cc[CC_idP].RAR_pdu.payload;
mac->TX_req[CC_idP].tx_request_body.number_of_pdus++;
}
}
@@ -597,100 +505,73 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
vrb_map[first_rb + 2] = 1;
vrb_map[first_rb + 3] = 1;
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
+ memset((void *) dl_config_pdu, 0, sizeof(nfapi_dl_config_request_pdu_t));
dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format =
- NFAPI_DL_DCI_FORMAT_1A;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level =
- 4;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = 4;
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = ra->RA_rnti;
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 2; // RA-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = 0;
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // no TPC
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- new_data_indicator_1 = 1;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = 1;
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = 0;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- redundancy_version_1 = 0;
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- resource_block_coding = getRIV(N_RB_DL, first_rb, 4);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 4);
// This checks if the above DCI allocation is feasible in current subframe
- if (!CCE_allocation_infeasible
- (module_idP, CC_idP, 0, subframeP,
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level, ra->RA_rnti)) {
+ if (!CCE_allocation_infeasible(module_idP, CC_idP, 0, subframeP,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, ra->RA_rnti)) {
LOG_D(MAC,
"Frame %d: Subframe %d : Adding common DCI for RA_RNTI %x\n",
frameP, subframeP, ra->RA_rnti);
dl_req->number_dci++;
dl_req->number_pdu++;
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index =
- mac->pdu_index[CC_idP];
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = ra->RA_rnti;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void *) dl_config_pdu, 0, sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = mac->pdu_index[CC_idP];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = ra->RA_rnti;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- resource_block_coding = getRIV(N_RB_DL, first_rb, 4);
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- redundancy_version = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag =
- 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers =
- 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- number_of_subbands = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 4);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- ue_category_capacity = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- delta_power_offset_index = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode =
- (cc->p_eNB == 1) ? 1 : 2;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- num_bf_prb_per_subband = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
dl_req->number_pdu++;
mac->DL_req[CC_idP].sfn_sf = frameP<<4 | subframeP;
// Program UL processing for Msg3
- get_Msg3alloc(&cc[CC_idP], subframeP, frameP,
- &ra->Msg3_frame, &ra->Msg3_subframe);
+ get_Msg3alloc(&cc[CC_idP], subframeP, frameP,&ra->Msg3_frame, &ra->Msg3_subframe);
LOG_D(MAC,
"Frame %d, Subframe %d: Setting Msg3 reception for Frame %d Subframe %d\n",
frameP, subframeP, ra->Msg3_frame,
ra->Msg3_subframe);
- fill_rar(module_idP, CC_idP, ra, frameP,
- cc[CC_idP].RAR_pdu.payload, N_RB_DL, 7);
+ fill_rar(module_idP, CC_idP, ra, frameP, cc[CC_idP].RAR_pdu.payload, N_RB_DL, 7);
add_msg3(module_idP, CC_idP, ra, frameP, subframeP);
ra->state = WAITMSG3;
LOG_D(MAC,"[eNB %d][RAPROC] Frame %d, Subframe %d: state:WAITMSG3\n", module_idP, frameP, subframeP);
@@ -698,10 +579,7 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
// DL request
mac->TX_req[CC_idP].sfn_sf = (frameP << 4) + subframeP;
TX_req =
- &mac->TX_req[CC_idP].tx_request_body.tx_pdu_list[mac->
- TX_req
- [CC_idP].
- tx_request_body.number_of_pdus];
+ &mac->TX_req[CC_idP].tx_request_body.tx_pdu_list[mac->TX_req[CC_idP].tx_request_body.number_of_pdus];
TX_req->pdu_length = 7; // This should be changed if we have more than 1 preamble
TX_req->pdu_index = mac->pdu_index[CC_idP]++;
TX_req->num_segments = 1;
@@ -759,63 +637,42 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
if (cc[CC_idP].radioResourceConfigCommon_BR) {
- ext4_prach =
- cc[CC_idP].radioResourceConfigCommon_BR->ext4->
- prach_ConfigCommon_v1310;
- ext4_pucch =
- cc[CC_idP].radioResourceConfigCommon_BR->ext4->
- pucch_ConfigCommon_v1310;
- prach_ParametersListCE_r13 =
- &ext4_prach->prach_ParametersListCE_r13;
- pucch_N1PUCCH_AN_InfoList_r13 =
- ext4_pucch->n1PUCCH_AN_InfoList_r13;
- AssertFatal(prach_ParametersListCE_r13 != NULL,
- "prach_ParametersListCE_r13 is null\n");
- AssertFatal(pucch_N1PUCCH_AN_InfoList_r13 != NULL,
- "pucch_N1PUCCH_AN_InfoList_r13 is null\n");
+ ext4_prach = cc[CC_idP].radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
+ ext4_pucch = cc[CC_idP].radioResourceConfigCommon_BR->ext4->pucch_ConfigCommon_v1310;
+ prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
+ pucch_N1PUCCH_AN_InfoList_r13 = ext4_pucch->n1PUCCH_AN_InfoList_r13;
+ AssertFatal(prach_ParametersListCE_r13 != NULL,"prach_ParametersListCE_r13 is null\n");
+ AssertFatal(pucch_N1PUCCH_AN_InfoList_r13 != NULL,"pucch_N1PUCCH_AN_InfoList_r13 is null\n");
// check to verify CE-Level compatibility in SIB2_BR
- AssertFatal(prach_ParametersListCE_r13->list.count ==
- pucch_N1PUCCH_AN_InfoList_r13->list.count,
+ AssertFatal(prach_ParametersListCE_r13->list.count == pucch_N1PUCCH_AN_InfoList_r13->list.count,
"prach_ParametersListCE_r13->list.count!= pucch_N1PUCCH_AN_InfoList_r13->list.count\n");
switch (prach_ParametersListCE_r13->list.count) {
case 4:
p[3] = prach_ParametersListCE_r13->list.array[3];
n1pucchan[3] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[3];
- AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level3_r13
- != NULL,
+ AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level3_r13 != NULL,
"pucch_NumRepetitionCE_Msg4_Level3 shouldn't be NULL\n");
- pucchreps[3] =
- (int) (4 << *ext4_pucch->
- pucch_NumRepetitionCE_Msg4_Level3_r13);
+ pucchreps[3] = (int) (4 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level3_r13);
case 3:
p[2] = prach_ParametersListCE_r13->list.array[2];
n1pucchan[2] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[2];
- AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13
- != NULL,
+ AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13!= NULL,
"pucch_NumRepetitionCE_Msg4_Level2 shouldn't be NULL\n");
- pucchreps[2] =
- (int) (4 << *ext4_pucch->
- pucch_NumRepetitionCE_Msg4_Level2_r13);
+ pucchreps[2] =(int) (4 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13);
case 2:
p[1] = prach_ParametersListCE_r13->list.array[1];
n1pucchan[1] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[1];
- AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13
- != NULL,
+ AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13 != NULL,
"pucch_NumRepetitionCE_Msg4_Level1 shouldn't be NULL\n");
- pucchreps[1] =
- (int) (1 << *ext4_pucch->
- pucch_NumRepetitionCE_Msg4_Level1_r13);
+ pucchreps[1] = (int) (1 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level1_r13);
case 1:
p[0] = prach_ParametersListCE_r13->list.array[0];
n1pucchan[0] = *pucch_N1PUCCH_AN_InfoList_r13->list.array[0];
- AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13
- != NULL,
+ AssertFatal(ext4_pucch->pucch_NumRepetitionCE_Msg4_Level2_r13 != NULL,
"pucch_NumRepetitionCE_Msg4_Level0 shouldn't be NULL\n");
- pucchreps[0] =
- (int) (1 << *ext4_pucch->
- pucch_NumRepetitionCE_Msg4_Level0_r13);
+ pucchreps[0] =(int) (1 << *ext4_pucch->pucch_NumRepetitionCE_Msg4_Level0_r13);
default:
AssertFatal(1 == 0,
"Illegal count for prach_ParametersListCE_r13 %d\n",
@@ -887,80 +744,53 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
memset((void *) dl_config_pdu, 0,
sizeof(nfapi_dl_config_request_pdu_t));
dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_mpdcch_pdu));
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_mpdcch_pdu));
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_MPDCCH_PDU_REL13_TAG;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_format =
- (ra->rach_resource_type > 1) ? 11 : 10;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_narrow_band =
- ra->msg34_narrowband;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- number_of_prb_pairs = 6;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_format = (ra->rach_resource_type > 1) ? 11 : 10;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_narrow_band = ra->msg34_narrowband;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_prb_pairs = 6;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_assignment = 0; // Note: this can be dynamic
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- mpdcch_tansmission_type = 1;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_tansmission_type = 1;
AssertFatal(cc[CC_idP].
sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13
!= NULL,
"cc[CC_idP].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13 is null\n");
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.start_symbol =
- cc[CC_idP].sib1_v13ext->
- bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.start_symbol = cc[CC_idP].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ecce_index = 0; // Note: this should be dynamic
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.aggregation_level = 16; // OK for CEModeA r1-3 (9.1.5-1b) or CEModeB r1-4
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti_type = 0; // t-C-RNTI
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti = ra->RA_rnti;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ce_mode =
- (ra->rach_resource_type < 3) ? 1 : 2;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ce_mode = (ra->rach_resource_type < 3) ? 1 : 2;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.drms_scrambling_init = cc[CC_idP].physCellId; /// Check this is still N_id_cell for type2 common
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- initial_transmission_sf_io = (frameP * 10) + subframeP;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.initial_transmission_sf_io = (frameP * 10) + subframeP;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.transmission_power = 6000; // 0dB
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_coding = getRIV(6, 0, 6); // check if not getRIV(N_RB_DL,first_rb,6);
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mcs = 4; // adjust according to size of Msg4, 208 bits with N1A_PRB=3
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pdsch_reptition_levels = 4; // fix to 4 for now
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.redundancy_version =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.new_data_indicator =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_process =
- ra->harq_pid;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.redundancy_version = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.new_data_indicator = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_process = ra->harq_pid;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi_length = 0;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi = 0;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi_flag = 0;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- harq_resource_offset = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.dci_subframe_repetition_number = rep;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_resource_offset = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_subframe_repetition_number = rep;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpc = 1; // N1A_PRB=3; => 208 bits
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.downlink_assignment_index_length = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- downlink_assignment_index = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- allocate_prach_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index_length = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.allocate_prach_flag = 0;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.preamble_index = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.prach_mask_index =
- 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.starting_ce_level =
- 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.prach_mask_index = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.starting_ce_level = 0;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.srs_request = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity_flag
- = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.frequency_hopping_enabled_flag = 0;
- dl_config_pdu->mpdcch_pdu.
- mpdcch_pdu_rel13.paging_direct_indication_differentiation_flag
- = 0;
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.direct_indication =
- 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.frequency_hopping_enabled_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.paging_direct_indication_differentiation_flag = 0;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.direct_indication = 0;
dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.total_dci_length_including_padding = 0; // this is not needed by OAI L1, but should be filled in
- dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.
- number_of_tx_antenna_ports = 1;
+ dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_tx_antenna_ports = 1;
ra->msg4_mpdcch_repetition_cnt++;
dl_req_body->number_pdu++;
dl_req_body->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
@@ -983,8 +813,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
AssertFatal(1 == 0, "TDD case not done yet\n");
}
} // mpdcch_repetition_count == reps
- if ((ra->Msg4_frame == frameP)
- && (ra->Msg4_subframe == subframeP)) {
+ if ((ra->Msg4_frame == frameP) && (ra->Msg4_subframe == subframeP)) {
// Program PDSCH
@@ -995,62 +824,42 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
AssertFatal(1 == 0,
"Msg4 generation not finished for BL/CE UE\n");
- dl_config_pdu =
- &dl_req_body->dl_config_pdu_list[dl_req_body->number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu = &dl_req_body->dl_config_pdu_list[dl_req_body->number_pdu];
+ memset((void *) dl_config_pdu, 0, sizeof(nfapi_dl_config_request_pdu_t));
dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index =
- mac->pdu_index[CC_idP];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = mac->pdu_index[CC_idP];
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = ra->rnti;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 6); // check that this isn't getRIV(6,0,6)
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- redundancy_version = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag =
- 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers =
- 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- number_of_subbands = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- ue_category_capacity = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- delta_power_offset_index = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode =
- (cc->p_eNB == 1) ? 1 : 2;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- num_bf_prb_per_subband = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start =
- cc[CC_idP].
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->
- startSymbolBR_r13;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = cc[CC_idP].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type =
- (ra->rach_resource_type < 3) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = (ra->rach_resource_type < 3) ? 1 : 2;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not SI message
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.
- initial_transmission_sf_io = (10 * frameP) + subframeP;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.drms_table_flag =
- 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = (10 * frameP) + subframeP;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.drms_table_flag = 0;
dl_req_body->number_pdu++;
dl_req_body->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
@@ -1062,18 +871,15 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
lcid = 0;
- UE_list->UE_sched_ctrl[UE_id].round[CC_idP][ra->harq_pid] =
- 0;
+ UE_list->UE_sched_ctrl[UE_id].round[CC_idP][ra->harq_pid] = 0;
msg4_header = 1 + 6 + 1; // CR header, CR CE, SDU header
if ((ra->msg4_TBsize - rrc_sdu_length - msg4_header) <= 2) {
- msg4_padding =
- ra->msg4_TBsize - rrc_sdu_length - msg4_header;
+ msg4_padding = ra->msg4_TBsize - rrc_sdu_length - msg4_header;
msg4_post_padding = 0;
} else {
msg4_padding = 0;
- msg4_post_padding =
- ra->msg4_TBsize - rrc_sdu_length - msg4_header - 1;
+ msg4_post_padding = ra->msg4_TBsize - rrc_sdu_length - msg4_header - 1;
}
LOG_D(MAC,
@@ -1093,10 +899,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
msg4_post_padding);
memcpy((void *) &mac->UE_list.
- DLSCH_pdu[CC_idP][0][(unsigned char)
- UE_id].payload[0][(unsigned
- char)
- offset],
+ DLSCH_pdu[CC_idP][0][(unsigned char)UE_id].payload[0][(unsigned char)offset],
&cc[CC_idP].CCCH_pdu.payload[0], rrc_sdu_length);
// DL request
@@ -1105,17 +908,12 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
mac->TX_req[CC_idP].header.message_id = NFAPI_TX_REQUEST;
TX_req =
- &mac->TX_req[CC_idP].tx_request_body.tx_pdu_list[mac->
- TX_req
- [CC_idP].
- tx_request_body.number_of_pdus];
+ &mac->TX_req[CC_idP].tx_request_body.tx_pdu_list[mac->TX_req[CC_idP].tx_request_body.number_of_pdus];
TX_req->pdu_length = rrc_sdu_length;
TX_req->pdu_index = mac->pdu_index[CC_idP]++;
TX_req->num_segments = 1;
TX_req->segments[0].segment_length = rrc_sdu_length;
- TX_req->segments[0].segment_data =
- mac->UE_list.
- DLSCH_pdu[CC_idP][0][(unsigned char) UE_id].payload[0];
+ TX_req->segments[0].segment_data = mac->UE_list.DLSCH_pdu[CC_idP][0][(unsigned char) UE_id].payload[0];
mac->TX_req[CC_idP].tx_request_body.number_of_pdus++;
// Program ACK/NAK for Msg4 PDSCH
@@ -1128,41 +926,26 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
ul_req_body = &ul_req->ul_config_request_body;
ul_config_pdu = &ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus];
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE;
- ul_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_ul_config_uci_harq_pdu));
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE;
+ ul_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_ul_config_uci_harq_pdu));
ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.handle = 0; // don't know how to use this
- ul_config_pdu->uci_harq_pdu.
- ue_information.ue_information_rel8.rnti = ra->rnti;
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.rnti = ra->rnti;
ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel13.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL13_TAG;
- ul_config_pdu->uci_harq_pdu.
- ue_information.ue_information_rel13.ue_type =
- (ra->rach_resource_type < 3) ? 1 : 2;
- ul_config_pdu->uci_harq_pdu.
- ue_information.ue_information_rel13.empty_symbols = 0;
- ul_config_pdu->uci_harq_pdu.ue_information.
- ue_information_rel13.total_number_of_repetitions =
- pucchreps[ra->rach_resource_type - 1];
- ul_config_pdu->uci_harq_pdu.
- ue_information.ue_information_rel13.repetition_number =
- 0;
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel13.ue_type = (ra->rach_resource_type < 3) ? 1 : 2;
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel13.empty_symbols = 0;
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel13.total_number_of_repetitions = pucchreps[ra->rach_resource_type - 1];
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel13.repetition_number = 0;
ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
-
ul_req->sfn_sf = sfnsf_add_subframe(ra->Msg3_frame, ra->Msg3_subframe, 4);
ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
-
LOG_D(MAC,"UL_req_tmp[CC_idP:%d][ackNAK_absSF mod 10:%d] ra->Msg3_frame:%d ra->Msg3_subframe:%d + 4 sfn_sf:%d\n", CC_idP, ackNAK_absSF%10, ra->Msg3_frame, ra->Msg3_subframe, NFAPI_SFNSF2DEC(ul_req->sfn_sf));
// Note need to keep sending this across reptitions!!!! Not really for PUCCH, to ask small-cell forum, we'll see for the other messages, maybe parameters change across repetitions and FAPI has to provide for that
if (cc[CC_idP].tdd_Config == NULL) { // FDD case
ul_config_pdu->uci_harq_pdu.harq_information.harq_information_rel8_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL8_FDD_TAG;
- ul_config_pdu->uci_harq_pdu.
- harq_information.harq_information_rel8_fdd.
- n_pucch_1_0 =
- n1pucchan[ra->rach_resource_type - 1];
+ ul_config_pdu->uci_harq_pdu.harq_information.harq_information_rel8_fdd.n_pucch_1_0 = n1pucchan[ra->rach_resource_type - 1];
// NOTE: How to fill in the rest of the n_pucch_1_0 information 213 Section 10.1.2.1 in the general case
// = N_ECCE_q + Delta_ARO + n1pucchan[ce_level]
// higher in the MPDCCH configuration, N_ECCE_q is hard-coded to 0, and harq resource offset to 0 =>
@@ -1182,15 +965,12 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
if (opt_enabled == 1) {
trace_pdu(1,
(uint8_t *) mac->
- UE_list.DLSCH_pdu[CC_idP][0][(unsigned char)
- UE_id].payload
- [0], rrc_sdu_length, UE_id, 3,
+ UE_list.DLSCH_pdu[CC_idP][0][(unsigned char)UE_id].payload[0], rrc_sdu_length, UE_id, 3,
UE_RNTI(module_idP, UE_id), mac->frame,
mac->subframe, 0, 0);
LOG_D(OPT,
"[eNB %d][DLSCH] CC_id %d Frame %d trace pdu for rnti %x with size %d\n",
- module_idP, CC_idP, frameP, UE_RNTI(module_idP,
- UE_id),
+ module_idP, CC_idP, frameP, UE_RNTI(module_idP,UE_id),
rrc_sdu_length);
}
} // Msg4 frame/subframe
@@ -1253,19 +1033,15 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti,
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type,
dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process,
- &dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- resource_block_coding,
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- resource_block_coding);
+ &dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding);
AssertFatal(dl_config_pdu->dci_dl_pdu.
dci_dl_pdu_rel8.resource_block_coding < 8192,
"resource_block_coding %u < 8192\n",
dl_config_pdu->dci_dl_pdu.
dci_dl_pdu_rel8.resource_block_coding);
- if (!CCE_allocation_infeasible
- (module_idP, CC_idP, 1, subframeP,
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level, ra->rnti)) {
+ if (!CCE_allocation_infeasible(module_idP, CC_idP, 1, subframeP,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, ra->rnti)) {
dl_req_body->number_dci++;
dl_req_body->number_pdu++;
@@ -1288,21 +1064,17 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
lcid = 0;
// put HARQ process round to 0
- if (cc->tdd_Config)
- ra->harq_pid = ((frameP * 10) + subframeP) % 10;
+ if (cc->tdd_Config) ra->harq_pid = ((frameP * 10) + subframeP) % 10;
else
- ra->harq_pid = ((frameP * 10) + subframeP) & 7;
- UE_list->UE_sched_ctrl[UE_id].round[CC_idP][ra->harq_pid] =
- 0;
+ ra->harq_pid = ((frameP * 10) + subframeP) & 7;
+ UE_list->UE_sched_ctrl[UE_id].round[CC_idP][ra->harq_pid] = 0;
if ((ra->msg4_TBsize - rrc_sdu_length - msg4_header) <= 2) {
- msg4_padding =
- ra->msg4_TBsize - rrc_sdu_length - msg4_header;
+ msg4_padding = ra->msg4_TBsize - rrc_sdu_length - msg4_header;
msg4_post_padding = 0;
} else {
msg4_padding = 0;
- msg4_post_padding =
- ra->msg4_TBsize - rrc_sdu_length - msg4_header - 1;
+ msg4_post_padding = ra->msg4_TBsize - rrc_sdu_length - msg4_header - 1;
}
LOG_D(MAC,
@@ -1321,11 +1093,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
msg4_padding, // no padding
msg4_post_padding);
- memcpy((void *) &mac->UE_list.
- DLSCH_pdu[CC_idP][0][(unsigned char)
- UE_id].payload[0][(unsigned
- char)
- offset],
+ memcpy((void *) &mac->UE_list.DLSCH_pdu[CC_idP][0][(unsigned char)UE_id].payload[0][(unsigned char)offset],
&cc[CC_idP].CCCH_pdu.payload[0], rrc_sdu_length);
// DLSCH Config
@@ -1359,9 +1127,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
rrc_sdu_length,
mac->pdu_index[CC_idP],
mac->UE_list.
- DLSCH_pdu[CC_idP][0][(unsigned char)
- UE_id].payload
- [0]);
+ DLSCH_pdu[CC_idP][0][(unsigned char)UE_id].payload[0]);
mac->pdu_index[CC_idP]++;
dl_req->sfn_sf = mac->TX_req[CC_idP].sfn_sf;
@@ -1374,8 +1140,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
CC_idP,
ra->rnti,
(frameP * 10) + subframeP,
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.cce_idx);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.cce_idx);
T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP),
@@ -1387,9 +1152,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
if (opt_enabled == 1) {
trace_pdu(1,
(uint8_t *) mac->
- UE_list.DLSCH_pdu[CC_idP][0][(unsigned char)
- UE_id].payload
- [0], rrc_sdu_length, UE_id, 3,
+ UE_list.DLSCH_pdu[CC_idP][0][(unsigned char)UE_id].payload[0], rrc_sdu_length, UE_id, 3,
UE_RNTI(module_idP, UE_id), mac->frame,
mac->subframe, 0, 0);
LOG_D(OPT,
@@ -1578,8 +1341,7 @@ check_Msg4_retransmission(module_id_t module_idP, int CC_idP,
LOG_D(MAC,"[eNB %d][RAPROC] Frame %d, Subframe %d: state:IDLE\n", module_idP, frameP, subframeP);
UE_id = find_UE_id(module_idP, ra->rnti);
DevAssert(UE_id != -1);
- mac->UE_list.UE_template[UE_PCCID(module_idP, UE_id)][UE_id].
- configured = TRUE;
+ mac->UE_list.UE_template[UE_PCCID(module_idP, UE_id)][UE_id].configured = TRUE;
}
}
@@ -1642,17 +1404,19 @@ initiate_ra_proc(module_id_t module_idP,
COMMON_channels_t *cc = &RC.mac[module_idP]->common_channels[CC_id];
RA_t *ra = &cc->ra[0];
+#ifdef Rel14
+
struct PRACH_ConfigSIB_v1310 *ext4_prach = NULL;
PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 = NULL;
if (cc->radioResourceConfigCommon_BR
&& cc->radioResourceConfigCommon_BR->ext4) {
- ext4_prach =
- cc->radioResourceConfigCommon_BR->ext4->
- prach_ConfigCommon_v1310;
- prach_ParametersListCE_r13 =
- &ext4_prach->prach_ParametersListCE_r13;
+ ext4_prach = cc->radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
+ prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
}
+
+#endif /* Rel14 */
+
LOG_D(MAC,
"[eNB %d][RAPROC] CC_id %d Frame %d, Subframe %d Initiating RA procedure for preamble index %d\n",
module_idP, CC_id, frameP, subframeP, preamble_index);
@@ -1666,6 +1430,8 @@ initiate_ra_proc(module_id_t module_idP,
uint16_t msg2_subframe = subframeP;
int offset;
+#ifdef Rel14
+
if (prach_ParametersListCE_r13 &&
prach_ParametersListCE_r13->list.count < rach_resource_type) {
LOG_E(MAC,
@@ -1675,10 +1441,10 @@ initiate_ra_proc(module_id_t module_idP,
return;
}
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC, 1);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC, 0);
+#endif /* Rel14 */
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC, 1);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC, 0);
for (i = 0; i < NB_RA_PROC_MAX; i++) {
if (ra[i].state == IDLE) {
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_bch.c b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
index 9a1046ff26a160e08da9e0fd7252476ebb0b1c12..de4641fac6dc499dd54cf9b77ca8fc121e76a451 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_bch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
@@ -235,35 +235,28 @@ schedule_SIB1_BR(module_id_t module_idP,
memset((void *) dl_config_pdu, 0,
sizeof(nfapi_dl_config_request_pdu_t));
dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length = TBS;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index =
- eNB->pdu_index[CC_id];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = eNB->pdu_index[CC_id];
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = 0xFFFF;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding =
- getRIV(N_RB_DL, first_rb, 6);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 6);
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = rvidx;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme =
- (cc->p_eNB == 1) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index =
- 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode =
- (cc->p_eNB == 1) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
// Rel10 fields
@@ -280,10 +273,7 @@ schedule_SIB1_BR(module_id_t module_idP,
dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
// Program TX Request
- TX_req =
- &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->
- TX_req
- [CC_id].tx_request_body.number_of_pdus];
+ TX_req = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus];
TX_req->pdu_length = bcch_sdu_length;
TX_req->pdu_index = eNB->pdu_index[CC_id]++;
TX_req->num_segments = 1;
@@ -315,11 +305,8 @@ schedule_SIB1_BR(module_id_t module_idP,
}
}
-int si_WindowLength_BR_r13tab
- [SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_WindowLength_BR_r13_spare]
-= { 20, 40, 60, 80, 120, 160, 200 };
-int si_TBS_r13tab[SchedulingInfo_BR_r13__si_TBS_r13_b936 + 1] =
- { 152, 208, 256, 328, 408, 504, 600, 712, 808, 936 };
+int si_WindowLength_BR_r13tab[SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_WindowLength_BR_r13_spare] = { 20, 40, 60, 80, 120, 160, 200 };
+int si_TBS_r13tab[SchedulingInfo_BR_r13__si_TBS_r13_b936 + 1] = { 152, 208, 256, 328, 408, 504, 600, 712, 808, 936 };
//------------------------------------------------------------------------------
void
@@ -354,65 +341,40 @@ schedule_SI_BR(module_id_t module_idP, frame_t frameP,
if (cc->mib->message.schedulingInfoSIB1_BR_r13 == 0)
continue;
else {
-
-
- AssertFatal(cc->
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13
- != NULL,
+ AssertFatal(cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13 != NULL,
"sib_v13ext->bandwidthReducedAccessRelatedInfo_r13 is null\n");
- SchedulingInfoList_BR_r13_t *schedulingInfoList_BR_r13 =
- cc->sib1_v13ext->
- bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13;
+ SchedulingInfoList_BR_r13_t *schedulingInfoList_BR_r13 = cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13;
AssertFatal(schedulingInfoList_BR_r13 != NULL,
"sib_v13ext->schedulingInfoList_BR_r13 is null\n");
- SchedulingInfoList_t *schedulingInfoList =
- cc->schedulingInfoList;
- AssertFatal(schedulingInfoList_BR_r13->list.count ==
- schedulingInfoList->list.count,
+ SchedulingInfoList_t *schedulingInfoList = cc->schedulingInfoList;
+ AssertFatal(schedulingInfoList_BR_r13->list.count == schedulingInfoList->list.count,
"schedulingInfolist_BR.r13->list.count %d != schedulingInfoList.list.count %d\n",
schedulingInfoList_BR_r13->list.count,
schedulingInfoList->list.count);
- AssertFatal(cc->
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13
- <=
- SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_WindowLength_BR_r13_ms200,
+ AssertFatal(cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13<=SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_WindowLength_BR_r13_ms200,
"si_WindowLength_BR_r13 %d > %d\n",
- (int) cc->
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13,
+ (int) cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13,
SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_WindowLength_BR_r13_ms200);
// check that SI frequency-hopping is disabled
- AssertFatal(cc->
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_HoppingConfigCommon_r13
- ==
- SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_HoppingConfigCommon_r13_off,
+ AssertFatal(cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_HoppingConfigCommon_r13 == SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_HoppingConfigCommon_r13_off,
"Deactivate SI_HoppingConfigCommon_r13 in configuration file, not supported for now\n");
- long si_WindowLength_BR_r13 =
- si_WindowLength_BR_r13tab[cc->
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13];
-
- long si_RepetitionPattern_r13 =
- cc->sib1_v13ext->
- bandwidthReducedAccessRelatedInfo_r13->si_RepetitionPattern_r13;
- AssertFatal(si_RepetitionPattern_r13 <=
- SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_RepetitionPattern_r13_every8thRF,
+ long si_WindowLength_BR_r13 = si_WindowLength_BR_r13tab[cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13];
+
+ long si_RepetitionPattern_r13 = cc->sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->si_RepetitionPattern_r13;
+ AssertFatal(si_RepetitionPattern_r13<=SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_RepetitionPattern_r13_every8thRF,
"si_RepetitionPattern_r13 %d > %d\n",
(int) si_RepetitionPattern_r13,
SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__si_RepetitionPattern_r13_every8thRF);
// cycle through SIB list
for (i = 0; i < schedulingInfoList_BR_r13->list.count; i++) {
- long si_Periodicity =
- schedulingInfoList->list.array[i]->si_Periodicity;
- long si_Narrowband_r13 =
- schedulingInfoList_BR_r13->list.array[i]->
- si_Narrowband_r13;
- long si_TBS_r13 =
- si_TBS_r13tab[schedulingInfoList_BR_r13->
- list.array[i]->si_TBS_r13];
+ long si_Periodicity = schedulingInfoList->list.array[i]->si_Periodicity;
+ long si_Narrowband_r13 = schedulingInfoList_BR_r13->list.array[i]->si_Narrowband_r13;
+ long si_TBS_r13 = si_TBS_r13tab[schedulingInfoList_BR_r13->list.array[i]->si_TBS_r13];
// check if the SI is to be scheduled now
int period_in_sf = 80 << si_Periodicity; // 2^i * 80 subframes, note: si_Periodicity is 2^i * 80ms
@@ -434,18 +396,14 @@ schedule_SI_BR(module_id_t module_idP, frame_t frameP,
"RRC provided bcch with length %d > %d (si_TBS_r13 %d)\n",
bcch_sdu_length,
(int) (si_TBS_r13 >> 3),
- (int) schedulingInfoList_BR_r13->
- list.array[i]->si_TBS_r13);
+ (int) schedulingInfoList_BR_r13->list.array[i]->si_TBS_r13);
// allocate all 6 PRBs in narrowband for SIB1_BR
// check that SIB1 didn't take this narrowband
- if (vrb_map[first_rb] > 0)
- continue;
+ if (vrb_map[first_rb] > 0) continue;
- first_rb =
- narrowband_to_first_rb(cc,
- si_Narrowband_r13 - 1);
+ first_rb = narrowband_to_first_rb(cc,si_Narrowband_r13 - 1);
vrb_map[first_rb] = 1;
vrb_map[first_rb + 1] = 1;
vrb_map[first_rb + 2] = 1;
@@ -465,89 +423,54 @@ schedule_SI_BR(module_id_t module_idP, frame_t frameP,
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->
- number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type =
- NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 +
- sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void *) dl_config_pdu, 0, sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length =
- si_TBS_r13 >> 3;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index =
- eNB->pdu_index[CC_id];
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti =
- 0xFFFF;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length = si_TBS_r13 >> 3;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = eNB->pdu_index[CC_id];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = 0xFFFF;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.resource_block_coding =
- getRIV(N_RB_DL, first_rb, 6);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 6);
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.redundancy_version = rvidx;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = rvidx;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag
- = 0;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transmission_scheme =
- (cc->p_eNB == 1) ? 0 : 1;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.number_of_layers = 1;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.number_of_subbands = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.ue_category_capacity = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.delta_power_offset_index = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transmission_mode =
- (cc->p_eNB == 1) ? 1 : 2;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- num_bf_vector = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
// Rel10 fields (for PDSCH starting symbol)
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.
- pdsch_start =
- cc[CC_id].
- sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
// Rel13 fields
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = 1; // CEModeA UE
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 1; // SI-BR
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel13.initial_transmission_sf_io =
- absSF - sf_mod_period;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = absSF - sf_mod_period;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
dl_req->number_pdu++;
dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
// Program TX Request
- TX_req =
- &eNB->TX_req[CC_id].
- tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].
- tx_request_body.number_of_pdus];
+ TX_req = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus];
TX_req->pdu_length = bcch_sdu_length;
TX_req->pdu_index = eNB->pdu_index[CC_id]++;
TX_req->num_segments = 1;
- TX_req->segments[0].segment_length =
- bcch_sdu_length;
- TX_req->segments[0].segment_data =
- cc->BCCH_BR_pdu[i + 1].payload;
- eNB->TX_req[CC_id].tx_request_body.
- number_of_pdus++;
+ TX_req->segments[0].segment_length = bcch_sdu_length;
+ TX_req->segments[0].segment_data = cc->BCCH_BR_pdu[i + 1].payload;
+ eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
eNB->TX_req[CC_id].sfn_sf = sfn_sf;
eNB->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
eNB->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
@@ -615,24 +538,27 @@ schedule_mib(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
LOG_D(MAC, "Frame %d, subframe %d: Adding BCH PDU in position %d (length %d)\n", frameP, subframeP, dl_req->number_pdu, mib_sdu_length);
if ((frameP & 1023) < 40)
+#ifdef Rel14
LOG_D(MAC,
"[eNB %d] Frame %d : MIB->BCH CC_id %d, Received %d bytes (cc->mib->message.schedulingInfoSIB1_BR_r13 %d)\n",
module_idP, frameP, CC_id, mib_sdu_length,
(int) cc->mib->message.schedulingInfoSIB1_BR_r13);
+#else
+ LOG_D(MAC,
+ "[eNB %d] Frame %d : MIB->BCH CC_id %d, Received %d bytes\n",
+ module_idP, frameP, CC_id, mib_sdu_length);
+#endif
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
memset((void *) dl_config_pdu, 0,
sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type =
- NFAPI_DL_CONFIG_BCH_PDU_TYPE, dl_config_pdu->pdu_size =
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_BCH_PDU_TYPE, dl_config_pdu->pdu_size =
2 + sizeof(nfapi_dl_config_bch_pdu);
- dl_config_pdu->bch_pdu.bch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_BCH_PDU_REL8_TAG;
- dl_config_pdu->bch_pdu.bch_pdu_rel8.length = mib_sdu_length;
- dl_config_pdu->bch_pdu.bch_pdu_rel8.pdu_index =
- eNB->pdu_index[CC_id];
+ dl_config_pdu->bch_pdu.bch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_BCH_PDU_REL8_TAG;
+ dl_config_pdu->bch_pdu.bch_pdu_rel8.length = mib_sdu_length;
+ dl_config_pdu->bch_pdu.bch_pdu_rel8.pdu_index = eNB->pdu_index[CC_id];
dl_config_pdu->bch_pdu.bch_pdu_rel8.transmission_power = 6000;
- dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
+ dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
dl_req->number_pdu++;
dl_config_request->header.message_id = NFAPI_DL_CONFIG_REQUEST;
@@ -641,9 +567,7 @@ schedule_mib(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
LOG_D(MAC, "eNB->DL_req[0].number_pdu %d (%p)\n", dl_req->number_pdu, &dl_req->number_pdu);
// DL request
- TX_req =
- &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req
- [CC_id].tx_request_body.number_of_pdus];
+ TX_req = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus];
TX_req->pdu_length = 3;
TX_req->pdu_index = eNB->pdu_index[CC_id]++;
TX_req->num_segments = 1;
@@ -753,114 +677,81 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
}
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
memset((void *) dl_config_pdu, 0,
sizeof(nfapi_dl_config_request_pdu_t));
dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format =
- NFAPI_DL_DCI_FORMAT_1A;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level = 4;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = 0xFFFF;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 2; // S-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
-
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = 0;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // no TPC
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- new_data_indicator_1 = 0;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- redundancy_version_1 = 0;
-
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.resource_block_coding =
- getRIV(N_RB_DL, first_rb, 4);
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = 4;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = 0xFFFF;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 2; // S-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
+
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // no TPC
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = 0;
+
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 4);
dl_config_request->sfn_sf = sfn_sf;
- if (!CCE_allocation_infeasible
- (module_idP, CC_id, 0, subframeP,
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level, SI_RNTI)) {
+ if (!CCE_allocation_infeasible(module_idP, CC_id, 0, subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, SI_RNTI)) {
LOG_D(MAC, "Frame %d: Subframe %d : Adding common DCI for S_RNTI\n", frameP, subframeP);
dl_req->number_dci++;
dl_req->number_pdu++;
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
memset((void *) dl_config_pdu, 0,
sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type =
- NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index =
- eNB->pdu_index[CC_id];
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length = bcch_sdu_length;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = 0xFFFF;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = eNB->pdu_index[CC_id];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length = bcch_sdu_length;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = 0xFFFF;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.resource_block_coding =
- getRIV(N_RB_DL, first_rb, 4);
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- redundancy_version = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag
- = 0;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transmission_scheme =
- (cc->p_eNB == 1) ? 0 : 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- number_of_layers = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- number_of_subbands = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(N_RB_DL, first_rb, 4);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1; // first block
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB == 1) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.ue_category_capacity = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.delta_power_offset_index = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector =
- 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB == 1) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
// dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
dl_req->number_pdu++;
// Rel10 fields
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = 3;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL10_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = 3;
// Rel13 fields
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = 0; // regular UE
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not BR
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = 0xFFFF; // absolute SF
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL13_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = 0; // regular UE
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not BR
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = 0xFFFF; // absolute SF
- dl_config_request->header.message_id = NFAPI_DL_CONFIG_REQUEST;
- dl_config_request->sfn_sf = sfn_sf;
+ dl_config_request->header.message_id = NFAPI_DL_CONFIG_REQUEST;
+ dl_config_request->sfn_sf = sfn_sf;
// Program TX Request
- TX_req =
- &eNB->TX_req[CC_id].
- tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].
- tx_request_body.number_of_pdus];
+ TX_req = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus];
TX_req->pdu_length = bcch_sdu_length;
TX_req->pdu_index = eNB->pdu_index[CC_id]++;
TX_req->num_segments = 1;
TX_req->segments[0].segment_length = bcch_sdu_length;
- TX_req->segments[0].segment_data =
- cc->BCCH_pdu.payload;
+ TX_req->segments[0].segment_data = cc->BCCH_pdu.payload;
eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
eNB->TX_req[CC_id].sfn_sf = sfn_sf;
eNB->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index be206c7c5c363ad0d1d77483b178c1448ed107d2..7c836c9e725152e0054364cbdee3a6b980488b53 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -112,13 +112,13 @@ add_ue_dlsch_info(module_id_t module_idP,
{
//LOG_D(MAC, "%s(module_idP:%d, CC_id:%d, UE_id:%d, subframeP:%d, status:%d) serving_num:%d rnti:%x\n", __FUNCTION__, module_idP, CC_id, UE_id, subframeP, status, eNB_dlsch_info[module_idP][CC_id][UE_id].serving_num, UE_RNTI(module_idP,UE_id));
- eNB_dlsch_info[module_idP][CC_id][UE_id].rnti =
- UE_RNTI(module_idP, UE_id);
- // eNB_dlsch_info[module_idP][CC_id][ue_mod_idP].weight = weight;
- eNB_dlsch_info[module_idP][CC_id][UE_id].subframe = subframeP;
- eNB_dlsch_info[module_idP][CC_id][UE_id].status = status;
+ eNB_dlsch_info[module_idP][CC_id][UE_id].rnti =
+ UE_RNTI(module_idP, UE_id);
+ // eNB_dlsch_info[module_idP][CC_id][ue_mod_idP].weight = weight;
+ eNB_dlsch_info[module_idP][CC_id][UE_id].subframe = subframeP;
+ eNB_dlsch_info[module_idP][CC_id][UE_id].status = status;
- eNB_dlsch_info[module_idP][CC_id][UE_id].serving_num++;
+ eNB_dlsch_info[module_idP][CC_id][UE_id].serving_num++;
}
@@ -129,27 +129,25 @@ schedule_next_dlue(module_id_t module_idP, int CC_id,
//------------------------------------------------------------------------------
{
- int next_ue;
- UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
+ int next_ue;
+ UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
- for (next_ue = UE_list->head; next_ue >= 0;
- next_ue = UE_list->next[next_ue]) {
- if (eNB_dlsch_info[module_idP][CC_id][next_ue].status ==
- S_DL_WAITING) {
- return next_ue;
- }
+ for (next_ue = UE_list->head; next_ue >= 0;
+ next_ue = UE_list->next[next_ue]) {
+ if (eNB_dlsch_info[module_idP][CC_id][next_ue].status ==
+ S_DL_WAITING) {
+ return next_ue;
}
+ }
- for (next_ue = UE_list->head; next_ue >= 0;
- next_ue = UE_list->next[next_ue]) {
- if (eNB_dlsch_info[module_idP][CC_id][next_ue].status ==
- S_DL_BUFFERED) {
- eNB_dlsch_info[module_idP][CC_id][next_ue].status =
- S_DL_WAITING;
- }
+ for (next_ue = UE_list->head; next_ue >= 0;
+ next_ue = UE_list->next[next_ue]) {
+ if (eNB_dlsch_info[module_idP][CC_id][next_ue].status == S_DL_BUFFERED) {
+ eNB_dlsch_info[module_idP][CC_id][next_ue].status = S_DL_WAITING;
}
+ }
- return (-1); //next_ue;
+ return (-1); //next_ue;
}
@@ -167,187 +165,183 @@ generate_dlsch_header(unsigned char *mac_header,
//------------------------------------------------------------------------------
{
- SCH_SUBHEADER_FIXED *mac_header_ptr =
- (SCH_SUBHEADER_FIXED *) mac_header;
- uint8_t first_element = 0, last_size = 0, i;
- uint8_t mac_header_control_elements[16], *ce_ptr;
+ SCH_SUBHEADER_FIXED *mac_header_ptr = (SCH_SUBHEADER_FIXED *) mac_header;
+ uint8_t first_element = 0, last_size = 0, i;
+ uint8_t mac_header_control_elements[16], *ce_ptr;
- ce_ptr = &mac_header_control_elements[0];
+ ce_ptr = &mac_header_control_elements[0];
- // compute header components
+ // compute header components
- if ((short_padding == 1) || (short_padding == 2)) {
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = SHORT_PADDING;
- first_element = 1;
- last_size = 1;
- }
+ if ((short_padding == 1) || (short_padding == 2)) {
+ mac_header_ptr->R = 0;
+ mac_header_ptr->E = 0;
+ mac_header_ptr->LCID = SHORT_PADDING;
+ first_element = 1;
+ last_size = 1;
+ }
+
+ if (short_padding == 2) {
+ mac_header_ptr->E = 1;
+ mac_header_ptr++;
+ mac_header_ptr->R = 0;
+ mac_header_ptr->E = 0;
+ mac_header_ptr->LCID = SHORT_PADDING;
+ last_size = 1;
+ }
- if (short_padding == 2) {
- mac_header_ptr->E = 1;
- mac_header_ptr++;
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = SHORT_PADDING;
- last_size = 1;
+ if (drx_cmd != 255) {
+ if (first_element > 0) {
+ mac_header_ptr->E = 1;
+ mac_header_ptr++;
+ } else {
+ first_element = 1;
}
- if (drx_cmd != 255) {
- if (first_element > 0) {
- mac_header_ptr->E = 1;
- mac_header_ptr++;
- } else {
- first_element = 1;
- }
+ mac_header_ptr->R = 0;
+ mac_header_ptr->E = 0;
+ mac_header_ptr->LCID = DRX_CMD;
+ last_size = 1;
+ }
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = DRX_CMD;
- last_size = 1;
+ if (timing_advance_cmd != 31) {
+ if (first_element > 0) {
+ mac_header_ptr->E = 1;
+ mac_header_ptr++;
+ } else {
+ first_element = 1;
}
- if (timing_advance_cmd != 31) {
- if (first_element > 0) {
- mac_header_ptr->E = 1;
- mac_header_ptr++;
- } else {
- first_element = 1;
- }
+ mac_header_ptr->R = 0;
+ mac_header_ptr->E = 0;
+ mac_header_ptr->LCID = TIMING_ADV_CMD;
+ last_size = 1;
+ // msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
+ ((TIMING_ADVANCE_CMD *) ce_ptr)->R = 0;
+ AssertFatal(timing_advance_cmd < 64,
+ "timing_advance_cmd %d > 63\n", timing_advance_cmd);
+ ((TIMING_ADVANCE_CMD *) ce_ptr)->TA = timing_advance_cmd; //(timing_advance_cmd+31)&0x3f;
+ LOG_D(MAC, "timing advance =%d (%d)\n", timing_advance_cmd,
+ ((TIMING_ADVANCE_CMD *) ce_ptr)->TA);
+ ce_ptr += sizeof(TIMING_ADVANCE_CMD);
+ //msg("offset %d\n",ce_ptr-mac_header_control_elements);
+ }
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = TIMING_ADV_CMD;
- last_size = 1;
- // msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
- ((TIMING_ADVANCE_CMD *) ce_ptr)->R = 0;
- AssertFatal(timing_advance_cmd < 64,
- "timing_advance_cmd %d > 63\n", timing_advance_cmd);
- ((TIMING_ADVANCE_CMD *) ce_ptr)->TA = timing_advance_cmd; //(timing_advance_cmd+31)&0x3f;
- LOG_D(MAC, "timing advance =%d (%d)\n", timing_advance_cmd,
- ((TIMING_ADVANCE_CMD *) ce_ptr)->TA);
- ce_ptr += sizeof(TIMING_ADVANCE_CMD);
- //msg("offset %d\n",ce_ptr-mac_header_control_elements);
+ if (ue_cont_res_id) {
+ if (first_element > 0) {
+ mac_header_ptr->E = 1;
+ /*
+ printf("[eNB][MAC] last subheader : %x (R%d,E%d,LCID%d)\n",*(unsigned char*)mac_header_ptr,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->R,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID);
+ */
+ mac_header_ptr++;
+ } else {
+ first_element = 1;
}
- if (ue_cont_res_id) {
- if (first_element > 0) {
- mac_header_ptr->E = 1;
- /*
- printf("[eNB][MAC] last subheader : %x (R%d,E%d,LCID%d)\n",*(unsigned char*)mac_header_ptr,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->R,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID);
- */
- mac_header_ptr++;
- } else {
- first_element = 1;
- }
-
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = UE_CONT_RES;
- last_size = 1;
+ mac_header_ptr->R = 0;
+ mac_header_ptr->E = 0;
+ mac_header_ptr->LCID = UE_CONT_RES;
+ last_size = 1;
- LOG_T(MAC,
- "[eNB ][RAPROC] Generate contention resolution msg: %x.%x.%x.%x.%x.%x\n",
- ue_cont_res_id[0], ue_cont_res_id[1], ue_cont_res_id[2],
- ue_cont_res_id[3], ue_cont_res_id[4], ue_cont_res_id[5]);
+ LOG_T(MAC,
+ "[eNB ][RAPROC] Generate contention resolution msg: %x.%x.%x.%x.%x.%x\n",
+ ue_cont_res_id[0], ue_cont_res_id[1], ue_cont_res_id[2],
+ ue_cont_res_id[3], ue_cont_res_id[4], ue_cont_res_id[5]);
- memcpy(ce_ptr, ue_cont_res_id, 6);
- ce_ptr += 6;
- // msg("(cont_res) : offset %d\n",ce_ptr-mac_header_control_elements);
+ memcpy(ce_ptr, ue_cont_res_id, 6);
+ ce_ptr += 6;
+ // msg("(cont_res) : offset %d\n",ce_ptr-mac_header_control_elements);
+ }
+ //msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
+
+ for (i = 0; i < num_sdus; i++) {
+ LOG_T(MAC, "[eNB] Generate DLSCH header num sdu %d len sdu %d\n",
+ num_sdus, sdu_lengths[i]);
+
+ if (first_element > 0) {
+ mac_header_ptr->E = 1;
+ /*msg("last subheader : %x (R%d,E%d,LCID%d)\n",*(unsigned char*)mac_header_ptr,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->R,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID);
+ */
+ mac_header_ptr += last_size;
+ //msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
+ } else {
+ first_element = 1;
}
- //msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
-
- for (i = 0; i < num_sdus; i++) {
- LOG_T(MAC, "[eNB] Generate DLSCH header num sdu %d len sdu %d\n",
- num_sdus, sdu_lengths[i]);
-
- if (first_element > 0) {
- mac_header_ptr->E = 1;
- /*msg("last subheader : %x (R%d,E%d,LCID%d)\n",*(unsigned char*)mac_header_ptr,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->R,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID);
- */
- mac_header_ptr += last_size;
- //msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
- } else {
- first_element = 1;
- }
- if (sdu_lengths[i] < 128) {
- ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->R = 0;
- ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->E = 0;
- ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->F = 0;
- ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->LCID = sdu_lcids[i];
- ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->L =
- (unsigned char) sdu_lengths[i];
- last_size = 2;
- } else {
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->R = 0;
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->E = 0;
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->F = 1;
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->LCID = sdu_lcids[i];
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_MSB =
- ((unsigned short) sdu_lengths[i] >> 8) & 0x7f;
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_LSB =
- (unsigned short) sdu_lengths[i] & 0xff;
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->padding = 0x00;
- last_size = 3;
+ if (sdu_lengths[i] < 128) {
+ ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->R = 0;
+ ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->E = 0;
+ ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->F = 0;
+ ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->LCID = sdu_lcids[i];
+ ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->L = (unsigned char) sdu_lengths[i];
+ last_size = 2;
+ } else {
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->R = 0;
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->E = 0;
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->F = 1;
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->LCID = sdu_lcids[i];
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_MSB = ((unsigned short) sdu_lengths[i] >> 8) & 0x7f;
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_LSB = (unsigned short) sdu_lengths[i] & 0xff;
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->padding = 0x00;
+ last_size = 3;
#ifdef DEBUG_HEADER_PARSING
- LOG_D(MAC,
- "[eNB] generate long sdu, size %x (MSB %x, LSB %x)\n",
- sdu_lengths[i],
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_MSB,
- ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_LSB);
+ LOG_D(MAC,
+ "[eNB] generate long sdu, size %x (MSB %x, LSB %x)\n",
+ sdu_lengths[i],
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_MSB,
+ ((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_LSB);
#endif
- }
}
+ }
- /*
-
- printf("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
-
- printf("last subheader : %x (R%d,E%d,LCID%d)\n",*(unsigned char*)mac_header_ptr,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->R,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E,
- ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID);
-
-
- if (((SCH_SUBHEADER_FIXED*)mac_header_ptr)->LCID < UE_CONT_RES) {
- if (((SCH_SUBHEADER_SHORT*)mac_header_ptr)->F == 0)
- printf("F = 0, sdu len (L field) %d\n",(((SCH_SUBHEADER_SHORT*)mac_header_ptr)->L));
- else
- printf("F = 1, sdu len (L field) %d\n",(((SCH_SUBHEADER_LONG*)mac_header_ptr)->L));
- }
- */
- if (post_padding > 0) { // we have lots of padding at the end of the packet
- mac_header_ptr->E = 1;
- mac_header_ptr += last_size;
- // add a padding element
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = SHORT_PADDING;
- mac_header_ptr++;
- } else { // no end of packet padding
- // last SDU subhead is of fixed type (sdu length implicitly to be computed at UE)
- mac_header_ptr++;
- }
+ /*
- //msg("After subheaders %d\n",(uint8_t*)mac_header_ptr - mac_header);
+ printf("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
- if ((ce_ptr - mac_header_control_elements) > 0) {
- // printf("Copying %d bytes for control elements\n",ce_ptr-mac_header_control_elements);
- memcpy((void *) mac_header_ptr, mac_header_control_elements,
- ce_ptr - mac_header_control_elements);
- mac_header_ptr +=
- (unsigned char) (ce_ptr - mac_header_control_elements);
+ printf("last subheader : %x (R%d,E%d,LCID%d)\n",*(unsigned char*)mac_header_ptr,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->R,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E,
+ ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID);
+
+
+ if (((SCH_SUBHEADER_FIXED*)mac_header_ptr)->LCID < UE_CONT_RES) {
+ if (((SCH_SUBHEADER_SHORT*)mac_header_ptr)->F == 0)
+ printf("F = 0, sdu len (L field) %d\n",(((SCH_SUBHEADER_SHORT*)mac_header_ptr)->L));
+ else
+ printf("F = 1, sdu len (L field) %d\n",(((SCH_SUBHEADER_LONG*)mac_header_ptr)->L));
}
- //msg("After CEs %d\n",(uint8_t*)mac_header_ptr - mac_header);
+ */
+ if (post_padding > 0) { // we have lots of padding at the end of the packet
+ mac_header_ptr->E = 1;
+ mac_header_ptr += last_size;
+ // add a padding element
+ mac_header_ptr->R = 0;
+ mac_header_ptr->E = 0;
+ mac_header_ptr->LCID = SHORT_PADDING;
+ mac_header_ptr++;
+ } else { // no end of packet padding
+ // last SDU subhead is of fixed type (sdu length implicitly to be computed at UE)
+ mac_header_ptr++;
+ }
- return ((unsigned char *) mac_header_ptr - mac_header);
+ //msg("After subheaders %d\n",(uint8_t*)mac_header_ptr - mac_header);
+
+ if ((ce_ptr - mac_header_control_elements) > 0) {
+ // printf("Copying %d bytes for control elements\n",ce_ptr-mac_header_control_elements);
+ memcpy((void *) mac_header_ptr, mac_header_control_elements,
+ ce_ptr - mac_header_control_elements);
+ mac_header_ptr +=
+ (unsigned char) (ce_ptr - mac_header_control_elements);
+ }
+ //msg("After CEs %d\n",(uint8_t*)mac_header_ptr - mac_header);
+
+ return ((unsigned char *) mac_header_ptr - mac_header);
}
@@ -358,94 +352,94 @@ set_ul_DAI(int module_idP, int UE_idP, int CC_idP, int frameP,
//------------------------------------------------------------------------------
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- UE_list_t *UE_list = &eNB->UE_list;
- unsigned char DAI;
- COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
- if (cc->tdd_Config != NULL) { //TDD
- DAI = (UE_list->UE_template[CC_idP][UE_idP].DAI - 1) & 3;
- LOG_D(MAC,
- "[eNB %d] CC_id %d Frame %d, subframe %d: DAI %d for UE %d\n",
- module_idP, CC_idP, frameP, subframeP, DAI, UE_idP);
- // Save DAI for Format 0 DCI
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+ unsigned char DAI;
+ COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
+ if (cc->tdd_Config != NULL) { //TDD
+ DAI = (UE_list->UE_template[CC_idP][UE_idP].DAI - 1) & 3;
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d Frame %d, subframe %d: DAI %d for UE %d\n",
+ module_idP, CC_idP, frameP, subframeP, DAI, UE_idP);
+ // Save DAI for Format 0 DCI
+
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 0:
+ // if ((subframeP==0)||(subframeP==1)||(subframeP==5)||(subframeP==6))
+ break;
- switch (cc->tdd_Config->subframeAssignment) {
- case 0:
- // if ((subframeP==0)||(subframeP==1)||(subframeP==5)||(subframeP==6))
- break;
+ case 1:
+ switch (subframeP) {
+ case 1:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[7] = DAI;
+ break;
- case 1:
- switch (subframeP) {
- case 1:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[7] = DAI;
- break;
-
- case 4:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[8] = DAI;
- break;
-
- case 6:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[2] = DAI;
- break;
-
- case 9:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[3] = DAI;
- break;
- }
+ case 4:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[8] = DAI;
+ break;
- case 2:
- // if ((subframeP==3)||(subframeP==8))
- // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
- break;
+ case 6:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[2] = DAI;
+ break;
- case 3:
+ case 9:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[3] = DAI;
+ break;
+ }
- //if ((subframeP==6)||(subframeP==8)||(subframeP==0)) {
- // LOG_D(MAC,"schedule_ue_spec: setting UL DAI to %d for subframeP %d => %d\n",DAI,subframeP, ((subframeP+8)%10)>>1);
- // UE_list->UE_template[CC_idP][UE_idP].DAI_ul[((subframeP+8)%10)>>1] = DAI;
- //}
- switch (subframeP) {
- case 5:
- case 6:
- case 1:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[2] = DAI;
- break;
-
- case 7:
- case 8:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[3] = DAI;
- break;
-
- case 9:
- case 0:
- UE_list->UE_template[CC_idP][UE_idP].DAI_ul[4] = DAI;
- break;
-
- default:
- break;
- }
+ case 2:
+ // if ((subframeP==3)||(subframeP==8))
+ // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+ break;
- break;
+ case 3:
- case 4:
- // if ((subframeP==8)||(subframeP==9))
- // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
- break;
+ //if ((subframeP==6)||(subframeP==8)||(subframeP==0)) {
+ // LOG_D(MAC,"schedule_ue_spec: setting UL DAI to %d for subframeP %d => %d\n",DAI,subframeP, ((subframeP+8)%10)>>1);
+ // UE_list->UE_template[CC_idP][UE_idP].DAI_ul[((subframeP+8)%10)>>1] = DAI;
+ //}
+ switch (subframeP) {
+ case 5:
+ case 6:
+ case 1:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[2] = DAI;
+ break;
- case 5:
- // if (subframeP==8)
- // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
- break;
+ case 7:
+ case 8:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[3] = DAI;
+ break;
- case 6:
- // if ((subframeP==1)||(subframeP==4)||(subframeP==6)||(subframeP==9))
- // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
- break;
+ case 9:
+ case 0:
+ UE_list->UE_template[CC_idP][UE_idP].DAI_ul[4] = DAI;
+ break;
- default:
- break;
- }
+ default:
+ break;
+ }
+
+ break;
+
+ case 4:
+ // if ((subframeP==8)||(subframeP==9))
+ // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+ break;
+
+ case 5:
+ // if (subframeP==8)
+ // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+ break;
+
+ case 6:
+ // if ((subframeP==1)||(subframeP==4)||(subframeP==6)||(subframeP==9))
+ // UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+ break;
+
+ default:
+ break;
}
+ }
}
//------------------------------------------------------------------------------
@@ -563,1112 +557,984 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
{
- uint8_t CC_id;
- int UE_id;
- unsigned char aggregation;
- mac_rlc_status_resp_t rlc_status;
- unsigned char header_len_dcch = 0, header_len_dcch_tmp = 0;
- unsigned char header_len_dtch = 0, header_len_dtch_tmp =
- 0, header_len_dtch_last = 0;
- unsigned char ta_len = 0;
- unsigned char sdu_lcids[NB_RB_MAX], lcid, offset, num_sdus = 0;
- uint16_t nb_rb, nb_rb_temp, nb_available_rb;
- uint16_t TBS, j, sdu_lengths[NB_RB_MAX], rnti, padding =
- 0, post_padding = 0;
- unsigned char dlsch_buffer[MAX_DLSCH_PAYLOAD_BYTES];
- unsigned char round = 0;
- unsigned char harq_pid = 0;
- eNB_UE_STATS *eNB_UE_stats = NULL;
- uint16_t sdu_length_total = 0;
-
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = eNB->common_channels;
- UE_list_t *UE_list = &eNB->UE_list;
- int continue_flag = 0;
- int32_t normalized_rx_power, target_rx_power;
- int32_t tpc = 1;
- static int32_t tpc_accumulated = 0;
- UE_sched_ctrl *ue_sched_ctl;
- int mcs;
- int i;
- int min_rb_unit[MAX_NUM_CCs];
- int N_RB_DL[MAX_NUM_CCs];
- int total_nb_available_rb[MAX_NUM_CCs];
- int N_RBG[MAX_NUM_CCs];
- nfapi_dl_config_request_body_t *dl_req;
- nfapi_dl_config_request_pdu_t *dl_config_pdu;
- int tdd_sfa;
- int ta_update;
+ uint8_t CC_id;
+ int UE_id;
+ unsigned char aggregation;
+ mac_rlc_status_resp_t rlc_status;
+ unsigned char header_len_dcch = 0, header_len_dcch_tmp = 0;
+ unsigned char header_len_dtch = 0, header_len_dtch_tmp =
+ 0, header_len_dtch_last = 0;
+ unsigned char ta_len = 0;
+ unsigned char sdu_lcids[NB_RB_MAX], lcid, offset, num_sdus = 0;
+ uint16_t nb_rb, nb_rb_temp, nb_available_rb;
+ uint16_t TBS, j, sdu_lengths[NB_RB_MAX], rnti, padding =
+ 0, post_padding = 0;
+ unsigned char dlsch_buffer[MAX_DLSCH_PAYLOAD_BYTES];
+ unsigned char round = 0;
+ unsigned char harq_pid = 0;
+ eNB_UE_STATS *eNB_UE_stats = NULL;
+ uint16_t sdu_length_total = 0;
+
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = eNB->common_channels;
+ UE_list_t *UE_list = &eNB->UE_list;
+ int continue_flag = 0;
+ int32_t normalized_rx_power, target_rx_power;
+ int32_t tpc = 1;
+ static int32_t tpc_accumulated = 0;
+ UE_sched_ctrl *ue_sched_ctl;
+ int mcs;
+ int i;
+ int min_rb_unit[MAX_NUM_CCs];
+ int N_RB_DL[MAX_NUM_CCs];
+ int total_nb_available_rb[MAX_NUM_CCs];
+ int N_RBG[MAX_NUM_CCs];
+ nfapi_dl_config_request_body_t *dl_req;
+ nfapi_dl_config_request_pdu_t *dl_config_pdu;
+ int tdd_sfa;
+ int ta_update;
#if 0
- if (UE_list->head == -1) {
+ if (UE_list->head == -1) {
+ return;
+ }
+#endif
+
+ start_meas(&eNB->schedule_dlsch);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_IN);
+
+
+ // for TDD: check that we have to act here, otherwise return
+ if (cc[0].tdd_Config) {
+ tdd_sfa = cc[0].tdd_Config->subframeAssignment;
+ switch (subframeP) {
+ case 0:
+ // always continue
+ break;
+ case 1:
+ return;
+ break;
+ case 2:
+ return;
+ break;
+ case 3:
+ if ((tdd_sfa != 2) && (tdd_sfa != 5))
+ return;
+ break;
+ case 4:
+ if ((tdd_sfa != 1) && (tdd_sfa != 2) && (tdd_sfa != 4)
+ && (tdd_sfa != 5))
return;
+ break;
+ case 5:
+ break;
+ case 6:
+ case 7:
+ if ((tdd_sfa != 1) && (tdd_sfa != 2) && (tdd_sfa != 4)
+ && (tdd_sfa != 5))
+ return;
+ break;
+ case 8:
+ if ((tdd_sfa != 2) && (tdd_sfa != 3) && (tdd_sfa != 4)
+ && (tdd_sfa != 5))
+ return;
+ break;
+ case 9:
+ if ((tdd_sfa != 1) && (tdd_sfa != 3) && (tdd_sfa != 4)
+ && (tdd_sfa != 6))
+ return;
+ break;
+
}
-#endif
+ }
+ //weight = get_ue_weight(module_idP,UE_id);
+ aggregation = 2;
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ N_RB_DL[CC_id] = to_prb(cc[CC_id].mib->message.dl_Bandwidth);
+ min_rb_unit[CC_id] = get_min_rb_unit(module_idP, CC_id);
+ // get number of PRBs less those used by common channels
+ total_nb_available_rb[CC_id] = N_RB_DL[CC_id];
+ for (i = 0; i < N_RB_DL[CC_id]; i++)
+ if (cc[CC_id].vrb_map[i] != 0)
+ total_nb_available_rb[CC_id]--;
+
+ N_RBG[CC_id] = to_rbg(cc[CC_id].mib->message.dl_Bandwidth);
+
+ // store the global enb stats:
+ eNB->eNB_stats[CC_id].num_dlactive_UEs = UE_list->num_UEs;
+ eNB->eNB_stats[CC_id].available_prbs = total_nb_available_rb[CC_id];
+ eNB->eNB_stats[CC_id].total_available_prbs += total_nb_available_rb[CC_id];
+ eNB->eNB_stats[CC_id].dlsch_bytes_tx = 0;
+ eNB->eNB_stats[CC_id].dlsch_pdus_tx = 0;
+ }
- start_meas(&eNB->schedule_dlsch);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_IN);
+ /// CALLING Pre_Processor for downlink scheduling (Returns estimation of RBs required by each UE and the allocation on sub-band)
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR, VCD_FUNCTION_IN);
+ start_meas(&eNB->schedule_dlsch_preprocessor);
+ dlsch_scheduler_pre_processor(module_idP,
+ slice_idP,
+ frameP,
+ subframeP,
+ N_RBG,
+ mbsfn_flag);
+ stop_meas(&eNB->schedule_dlsch_preprocessor);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR, VCD_FUNCTION_OUT);
+
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ LOG_D(MAC, "doing schedule_ue_spec for CC_id %d\n", CC_id);
+
+ dl_req = &eNB->DL_req[CC_id].dl_config_request_body;
+
+ if (mbsfn_flag[CC_id] > 0)
+ continue;
+
+ for (UE_id = UE_list->head; UE_id >= 0;
+ UE_id = UE_list->next[UE_id]) {
+ continue_flag = 0; // reset the flag to allow allocation for the remaining UEs
+ rnti = UE_RNTI(module_idP, UE_id);
+ eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
+ ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+
+
+ if (rnti == NOT_A_RNTI) {
+ LOG_D(MAC, "Cannot find rnti for UE_id %d (num_UEs %d)\n",
+ UE_id, UE_list->num_UEs);
+ continue_flag = 1;
+ }
+ if (eNB_UE_stats == NULL) {
+ LOG_D(MAC, "[eNB] Cannot find eNB_UE_stats\n");
+ continue_flag = 1;
+ }
+ if (flexran_slice_member(UE_id, slice_idP) == 0)
+ continue;
- // for TDD: check that we have to act here, otherwise return
- if (cc[0].tdd_Config) {
- tdd_sfa = cc[0].tdd_Config->subframeAssignment;
- switch (subframeP) {
- case 0:
- // always continue
- break;
+ if (continue_flag != 1) {
+ switch (get_tmode(module_idP, CC_id, UE_id)) {
case 1:
- return;
- break;
case 2:
- return;
- break;
- case 3:
- if ((tdd_sfa != 2) && (tdd_sfa != 5))
- return;
- break;
- case 4:
- if ((tdd_sfa != 1) && (tdd_sfa != 2) && (tdd_sfa != 4)
- && (tdd_sfa != 5))
- return;
- break;
- case 5:
- break;
- case 6:
case 7:
- if ((tdd_sfa != 1) && (tdd_sfa != 2) && (tdd_sfa != 4)
- && (tdd_sfa != 5))
- return;
- break;
- case 8:
- if ((tdd_sfa != 2) && (tdd_sfa != 3) && (tdd_sfa != 4)
- && (tdd_sfa != 5))
- return;
- break;
- case 9:
- if ((tdd_sfa != 1) && (tdd_sfa != 3) && (tdd_sfa != 4)
- && (tdd_sfa != 6))
- return;
- break;
-
+ aggregation =
+ get_aggregation(get_bw_index(module_idP, CC_id),
+ ue_sched_ctl->dl_cqi[CC_id],
+ format1);
+ break;
+ case 3:
+ aggregation =
+ get_aggregation(get_bw_index(module_idP, CC_id),
+ ue_sched_ctl->dl_cqi[CC_id],
+ format2A);
+ break;
+ default:
+ LOG_W(MAC, "Unsupported transmission mode %d\n",
+ get_tmode(module_idP, CC_id, UE_id));
+ aggregation = 2;
}
- }
- //weight = get_ue_weight(module_idP,UE_id);
- aggregation = 2;
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- N_RB_DL[CC_id] = to_prb(cc[CC_id].mib->message.dl_Bandwidth);
- min_rb_unit[CC_id] = get_min_rb_unit(module_idP, CC_id);
- // get number of PRBs less those used by common channels
- total_nb_available_rb[CC_id] = N_RB_DL[CC_id];
- for (i = 0; i < N_RB_DL[CC_id]; i++)
- if (cc[CC_id].vrb_map[i] != 0)
- total_nb_available_rb[CC_id]--;
-
- N_RBG[CC_id] = to_rbg(cc[CC_id].mib->message.dl_Bandwidth);
-
- // store the global enb stats:
- eNB->eNB_stats[CC_id].num_dlactive_UEs = UE_list->num_UEs;
- eNB->eNB_stats[CC_id].available_prbs =
- total_nb_available_rb[CC_id];
- eNB->eNB_stats[CC_id].total_available_prbs +=
- total_nb_available_rb[CC_id];
- eNB->eNB_stats[CC_id].dlsch_bytes_tx = 0;
- eNB->eNB_stats[CC_id].dlsch_pdus_tx = 0;
- }
-
- /// CALLING Pre_Processor for downlink scheduling (Returns estimation of RBs required by each UE and the allocation on sub-band)
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR, VCD_FUNCTION_IN);
- start_meas(&eNB->schedule_dlsch_preprocessor);
- dlsch_scheduler_pre_processor(module_idP,
- slice_idP,
- frameP,
- subframeP,
- N_RBG,
- mbsfn_flag);
- stop_meas(&eNB->schedule_dlsch_preprocessor);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR, VCD_FUNCTION_OUT);
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- LOG_D(MAC, "doing schedule_ue_spec for CC_id %d\n", CC_id);
-
- dl_req = &eNB->DL_req[CC_id].dl_config_request_body;
-
- if (mbsfn_flag[CC_id] > 0)
- continue;
-
- for (UE_id = UE_list->head; UE_id >= 0;
- UE_id = UE_list->next[UE_id]) {
- continue_flag = 0; // reset the flag to allow allocation for the remaining UEs
- rnti = UE_RNTI(module_idP, UE_id);
- eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
- ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-
-
- if (rnti == NOT_A_RNTI) {
- LOG_D(MAC, "Cannot find rnti for UE_id %d (num_UEs %d)\n",
- UE_id, UE_list->num_UEs);
- continue_flag = 1;
- }
-
- if (eNB_UE_stats == NULL) {
- LOG_D(MAC, "[eNB] Cannot find eNB_UE_stats\n");
- continue_flag = 1;
- }
- if (flexran_slice_member(UE_id, slice_idP) == 0)
- continue;
-
- if (continue_flag != 1) {
- switch (get_tmode(module_idP, CC_id, UE_id)) {
- case 1:
- case 2:
- case 7:
- aggregation =
- get_aggregation(get_bw_index(module_idP, CC_id),
- ue_sched_ctl->dl_cqi[CC_id],
- format1);
- break;
- case 3:
- aggregation =
- get_aggregation(get_bw_index(module_idP, CC_id),
- ue_sched_ctl->dl_cqi[CC_id],
- format2A);
- break;
- default:
- LOG_W(MAC, "Unsupported transmission mode %d\n",
- get_tmode(module_idP, CC_id, UE_id));
- aggregation = 2;
- }
- }
- /* if (continue_flag != 1 */
- if ((ue_sched_ctl->pre_nb_available_rbs[CC_id] == 0) || // no RBs allocated
- CCE_allocation_infeasible(module_idP, CC_id, 1, subframeP,
- aggregation, rnti)) {
- LOG_D(MAC,
- "[eNB %d] Frame %d : no RB allocated for UE %d on CC_id %d: continue \n",
- module_idP, frameP, UE_id, CC_id);
- continue_flag = 1; //to next user (there might be rbs availiable for other UEs in TM5
- }
+ }
+ /* if (continue_flag != 1 */
+ if ((ue_sched_ctl->pre_nb_available_rbs[CC_id] == 0) || // no RBs allocated
+ CCE_allocation_infeasible(module_idP, CC_id, 1, subframeP,
+ aggregation, rnti)) {
+ LOG_D(MAC,
+ "[eNB %d] Frame %d : no RB allocated for UE %d on CC_id %d: continue \n",
+ module_idP, frameP, UE_id, CC_id);
+ continue_flag = 1; //to next user (there might be rbs availiable for other UEs in TM5
+ }
- if (cc[CC_id].tdd_Config != NULL) { //TDD
- set_ue_dai(subframeP,
- UE_id,
- CC_id,
- cc[CC_id].tdd_Config->subframeAssignment,
- UE_list);
- // update UL DAI after DLSCH scheduling
- set_ul_DAI(module_idP, UE_id, CC_id, frameP, subframeP);
- }
+ if (cc[CC_id].tdd_Config != NULL) { //TDD
+ set_ue_dai(subframeP,
+ UE_id,
+ CC_id,
+ cc[CC_id].tdd_Config->subframeAssignment,
+ UE_list);
+ // update UL DAI after DLSCH scheduling
+ set_ul_DAI(module_idP, UE_id, CC_id, frameP, subframeP);
+ }
- if (continue_flag == 1) {
- add_ue_dlsch_info(module_idP,
- CC_id, UE_id, subframeP, S_DL_NONE);
- continue;
- }
+ if (continue_flag == 1) {
+ add_ue_dlsch_info(module_idP,
+ CC_id, UE_id, subframeP, S_DL_NONE);
+ continue;
+ }
#warning RK->CR This old API call has to be revisited for FAPI, or logic must be changed
#if 0
- /* add "fake" DCI to have CCE_allocation_infeasible work properly for next allocations */
- /* if we don't add it, next allocations may succeed but overall allocations may fail */
- /* will be removed at the end of this function */
- add_ue_spec_dci(&eNB->common_channels[CC_id].DCI_pdu, &(char[]) {
- 0}, rnti, 1, aggregation, 1, format1, 0);
+ /* add "fake" DCI to have CCE_allocation_infeasible work properly for next allocations */
+ /* if we don't add it, next allocations may succeed but overall allocations may fail */
+ /* will be removed at the end of this function */
+ add_ue_spec_dci(&eNB->common_channels[CC_id].DCI_pdu, &(char[]) {
+ 0}, rnti, 1, aggregation, 1, format1, 0);
#endif
- nb_available_rb = ue_sched_ctl->pre_nb_available_rbs[CC_id];
+ nb_available_rb = ue_sched_ctl->pre_nb_available_rbs[CC_id];
- if (cc->tdd_Config)
- harq_pid = ((frameP * 10) + subframeP) % 10;
- else
- harq_pid = ((frameP * 10) + subframeP) & 7;
+ if (cc->tdd_Config) harq_pid = ((frameP * 10) + subframeP) % 10;
+ else harq_pid = ((frameP * 10) + subframeP) & 7;
- round = ue_sched_ctl->round[CC_id][harq_pid];
+ round = ue_sched_ctl->round[CC_id][harq_pid];
- UE_list->eNB_UE_stats[CC_id][UE_id].crnti = rnti;
- UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status =
- mac_eNB_get_rrc_status(module_idP, rnti);
- UE_list->eNB_UE_stats[CC_id][UE_id].harq_pid = harq_pid;
- UE_list->eNB_UE_stats[CC_id][UE_id].harq_round = round;
+ UE_list->eNB_UE_stats[CC_id][UE_id].crnti = rnti;
+ UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status = mac_eNB_get_rrc_status(module_idP, rnti);
+ UE_list->eNB_UE_stats[CC_id][UE_id].harq_pid = harq_pid;
+ UE_list->eNB_UE_stats[CC_id][UE_id].harq_round = round;
- if (UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status <
- RRC_CONNECTED)
- continue;
+ if (UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status < RRC_CONNECTED) continue;
- sdu_length_total = 0;
- num_sdus = 0;
-
- /*
- DevCheck(((eNB_UE_stats->dl_cqi < MIN_CQI_VALUE) || (eNB_UE_stats->dl_cqi > MAX_CQI_VALUE)),
- eNB_UE_stats->dl_cqi, MIN_CQI_VALUE, MAX_CQI_VALUE);
- */
- if (nfapi_mode) {
- eNB_UE_stats->dlsch_mcs1 = 10;//cqi_to_mcs[ue_sched_ctl->dl_cqi[CC_id]];
- }
- else {
- eNB_UE_stats->dlsch_mcs1 = cqi_to_mcs[ue_sched_ctl->dl_cqi[CC_id]];
- }
- eNB_UE_stats->dlsch_mcs1 = cmin(eNB_UE_stats->dlsch_mcs1, slice_maxmcs[slice_idP]); //cmin(eNB_UE_stats->dlsch_mcs1, openair_daq_vars.target_ue_dl_mcs);
-
-
- // store stats
- //UE_list->eNB_UE_stats[CC_id][UE_id].dl_cqi= eNB_UE_stats->dl_cqi;
-
- // initializing the rb allocation indicator for each UE
- for (j = 0; j < N_RBG[CC_id]; j++) {
- UE_list->
- UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j]
- = 0;
- }
+ sdu_length_total = 0;
+ num_sdus = 0;
+
+ /*
+ DevCheck(((eNB_UE_stats->dl_cqi < MIN_CQI_VALUE) || (eNB_UE_stats->dl_cqi > MAX_CQI_VALUE)),
+ eNB_UE_stats->dl_cqi, MIN_CQI_VALUE, MAX_CQI_VALUE);
+ */
+ if (nfapi_mode) {
+ eNB_UE_stats->dlsch_mcs1 = 10;//cqi_to_mcs[ue_sched_ctl->dl_cqi[CC_id]];
+ }
+ else {
+ eNB_UE_stats->dlsch_mcs1 = cqi_to_mcs[ue_sched_ctl->dl_cqi[CC_id]];
+ }
+ eNB_UE_stats->dlsch_mcs1 = cmin(eNB_UE_stats->dlsch_mcs1, slice_maxmcs[slice_idP]); //cmin(eNB_UE_stats->dlsch_mcs1, openair_daq_vars.target_ue_dl_mcs);
+
+
+ // store stats
+ //UE_list->eNB_UE_stats[CC_id][UE_id].dl_cqi= eNB_UE_stats->dl_cqi;
+ // initializing the rb allocation indicator for each UE
+ for (j = 0; j < N_RBG[CC_id]; j++) {
+ UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = 0;
+ }
+
+ LOG_D(MAC,
+ "[eNB %d] Frame %d: Scheduling UE %d on CC_id %d (rnti %x, harq_pid %d, round %d, rb %d, cqi %d, mcs %d, rrc %d)\n",
+ module_idP, frameP, UE_id, CC_id, rnti, harq_pid, round,
+ nb_available_rb, ue_sched_ctl->dl_cqi[CC_id],
+ eNB_UE_stats->dlsch_mcs1,
+ UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status);
+
+
+
+ /* process retransmission */
+
+ if (round != 8) {
+
+ // get freq_allocation
+ nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
+ TBS = get_TBS_DL(UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid],
+ nb_rb);
+
+ if (nb_rb <= nb_available_rb) {
+ if (cc[CC_id].tdd_Config != NULL) {
+ UE_list->UE_template[CC_id][UE_id].DAI++;
+ update_ul_dci(module_idP, CC_id, rnti,
+ UE_list->UE_template[CC_id][UE_id].
+ DAI);
LOG_D(MAC,
- "[eNB %d] Frame %d: Scheduling UE %d on CC_id %d (rnti %x, harq_pid %d, round %d, rb %d, cqi %d, mcs %d, rrc %d)\n",
- module_idP, frameP, UE_id, CC_id, rnti, harq_pid, round,
- nb_available_rb, ue_sched_ctl->dl_cqi[CC_id],
- eNB_UE_stats->dlsch_mcs1,
- UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status);
-
-
-
- /* process retransmission */
-
- if (round != 8) {
-
- // get freq_allocation
- nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
- TBS =
- get_TBS_DL(UE_list->
- UE_template[CC_id][UE_id].oldmcs1[harq_pid],
- nb_rb);
-
- if (nb_rb <= nb_available_rb) {
- if (cc[CC_id].tdd_Config != NULL) {
- UE_list->UE_template[CC_id][UE_id].DAI++;
- update_ul_dci(module_idP, CC_id, rnti,
- UE_list->UE_template[CC_id][UE_id].
- DAI);
- LOG_D(MAC,
- "DAI update: CC_id %d subframeP %d: UE %d, DAI %d\n",
- CC_id, subframeP, UE_id,
- UE_list->UE_template[CC_id][UE_id].DAI);
- }
-
- if (nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
- for (j = 0; j < N_RBG[CC_id]; j++) { // for indicating the rballoc for each sub-band
- UE_list->UE_template[CC_id][UE_id].
- rballoc_subband[harq_pid][j] =
- ue_sched_ctl->rballoc_sub_UE[CC_id][j];
- }
- } else {
- nb_rb_temp = nb_rb;
- j = 0;
-
- while ((nb_rb_temp > 0) && (j < N_RBG[CC_id])) {
- if (ue_sched_ctl->rballoc_sub_UE[CC_id][j] ==
- 1) {
- if (UE_list->
- UE_template[CC_id]
- [UE_id].rballoc_subband[harq_pid][j])
- printf
- ("WARN: rballoc_subband not free for retrans?\n");
- UE_list->
- UE_template[CC_id]
- [UE_id].rballoc_subband[harq_pid][j] =
- ue_sched_ctl->rballoc_sub_UE[CC_id][j];
-
- if ((j == N_RBG[CC_id] - 1) &&
- ((N_RB_DL[CC_id] == 25) ||
- (N_RB_DL[CC_id] == 50))) {
- nb_rb_temp =
- nb_rb_temp - min_rb_unit[CC_id] +
- 1;
- } else {
- nb_rb_temp =
- nb_rb_temp - min_rb_unit[CC_id];
- }
- }
-
- j = j + 1;
- }
- }
-
- nb_available_rb -= nb_rb;
- /*
- eNB->mu_mimo_mode[UE_id].pre_nb_available_rbs = nb_rb;
- eNB->mu_mimo_mode[UE_id].dl_pow_off = ue_sched_ctl->dl_pow_off[CC_id];
-
- for(j=0; j<N_RBG[CC_id]; j++) {
- eNB->mu_mimo_mode[UE_id].rballoc_sub[j] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j];
- }
- */
-
- switch (get_tmode(module_idP, CC_id, UE_id)) {
- case 1:
- case 2:
- case 7:
- default:
- LOG_D(MAC,"retransmission DL_REQ: rnti:%x\n",rnti);
-
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->
- number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type =
- NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 +
- sizeof(nfapi_dl_config_dci_dl_pdu));
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- dci_format = NFAPI_DL_DCI_FORMAT_1;
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level =
- get_aggregation(get_bw_index
- (module_idP, CC_id),
- ue_sched_ctl->dl_cqi[CC_id],
- format1);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti =
- rnti;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
-
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- harq_process = harq_pid;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // dont adjust power when retransmitting
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.new_data_indicator_1 =
- UE_list->UE_template[CC_id][UE_id].
- oldNDI[harq_pid];
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 =
- UE_list->UE_template[CC_id][UE_id].
- oldmcs1[harq_pid];
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.redundancy_version_1 =
- round & 3;
-
- if (cc[CC_id].tdd_Config != NULL) { //TDD
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.downlink_assignment_index =
- (UE_list->UE_template[CC_id][UE_id].DAI -
- 1) & 3;
- LOG_D(MAC,
- "[eNB %d] Retransmission CC_id %d : harq_pid %d, round %d, dai %d, mcs %d\n",
- module_idP, CC_id, harq_pid, round,
- (UE_list->UE_template[CC_id][UE_id].DAI -
- 1),
- UE_list->
- UE_template[CC_id][UE_id].oldmcs1
- [harq_pid]);
- } else {
- LOG_D(MAC,
- "[eNB %d] Retransmission CC_id %d : harq_pid %d, round %d, mcs %d\n",
- module_idP, CC_id, harq_pid, round,
- UE_list->
- UE_template[CC_id][UE_id].oldmcs1
- [harq_pid]);
-
- }
- if (!CCE_allocation_infeasible
- (module_idP, CC_id, 1, subframeP,
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level, rnti)) {
- dl_req->number_dci++;
- dl_req->number_pdu++;
- dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
-
- eNB->DL_req[CC_id].sfn_sf = frameP<<4 | subframeP;
- eNB->DL_req[CC_id].header.message_id = NFAPI_DL_CONFIG_REQUEST;
-
- fill_nfapi_dlsch_config(eNB, dl_req, TBS, -1
- /* retransmission, no pdu_index */
- , rnti, 0, // type 0 allocation from 7.1.6 in 36.213
- 0, // virtual_resource_block_assignment_flag, unused here
- 0, // resource_block_coding, to be filled in later
- getQm(UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid]), round & 3, // redundancy version
- 1, // transport blocks
- 0, // transport block to codeword swap flag
- cc[CC_id].p_eNB == 1 ? 0 : 1, // transmission_scheme
- 1, // number of layers
- 1, // number of subbands
- // uint8_t codebook_index,
- 4, // UE category capacity
- UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->pdsch_ConfigDedicated->p_a, 0, // delta_power_offset for TM5
- 0, // ngap
- 0, // nprb
- cc[CC_id].p_eNB == 1 ? 1 : 2, // transmission mode
- 0, //number of PRBs treated as one subband, not used here
- 0 // number of beamforming vectors, not used here
- );
-
- LOG_D(MAC,
- "Filled NFAPI configuration for DCI/DLSCH %d, retransmission round %d\n",
- eNB->pdu_index[CC_id], round);
-
- program_dlsch_acknak(module_idP, CC_id, UE_id,
- frameP, subframeP,
- dl_config_pdu->
- dci_dl_pdu.dci_dl_pdu_rel8.
- cce_idx);
- // No TX request for retransmission (check if null request for FAPI)
- } else {
- LOG_W(MAC,
- "Frame %d, Subframe %d: Dropping DLSCH allocation for UE %d\%x, infeasible CCE allocation\n",
- frameP, subframeP, UE_id, rnti);
- }
- }
-
-
- add_ue_dlsch_info(module_idP,
- CC_id, UE_id, subframeP,
- S_DL_SCHEDULED);
-
- //eNB_UE_stats->dlsch_trials[round]++;
- UE_list->eNB_UE_stats[CC_id][UE_id].
- num_retransmission += 1;
- UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used_retx =
- nb_rb;
- UE_list->eNB_UE_stats[CC_id][UE_id].
- total_rbs_used_retx += nb_rb;
- UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs1 =
- eNB_UE_stats->dlsch_mcs1;
- UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs2 =
- eNB_UE_stats->dlsch_mcs1;
- } else {
- LOG_D(MAC,
- "[eNB %d] Frame %d CC_id %d : don't schedule UE %d, its retransmission takes more resources than we have\n",
- module_idP, frameP, CC_id, UE_id);
- }
- } else { /* This is a potentially new SDU opportunity */
-
- rlc_status.bytes_in_buffer = 0;
- // Now check RLC information to compute number of required RBs
- // get maximum TBS size for RLC request
- TBS =
- get_TBS_DL(eNB_UE_stats->dlsch_mcs1, nb_available_rb);
- // check first for RLC data on DCCH
- // add the length for all the control elements (timing adv, drx, etc) : header + payload
-
- if (ue_sched_ctl->ta_timer == 0) {
- ta_update = ue_sched_ctl->ta_update;
- /* if we send TA then set timer to not send it for a while */
- if (ta_update != 31)
- ue_sched_ctl->ta_timer = 20;
- /* reset ta_update */
- ue_sched_ctl->ta_update = 31;
+ "DAI update: CC_id %d subframeP %d: UE %d, DAI %d\n",
+ CC_id, subframeP, UE_id,
+ UE_list->UE_template[CC_id][UE_id].DAI);
+ }
+
+ if (nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
+ for (j = 0; j < N_RBG[CC_id]; j++) { // for indicating the rballoc for each sub-band
+ UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
+ }
+ } else {
+ nb_rb_temp = nb_rb;
+ j = 0;
+
+ while ((nb_rb_temp > 0) && (j < N_RBG[CC_id])) {
+ if (ue_sched_ctl->rballoc_sub_UE[CC_id][j] == 1) {
+ if (UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j])
+ printf("WARN: rballoc_subband not free for retrans?\n");
+ UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
+
+ if ((j == N_RBG[CC_id] - 1) &&
+ ((N_RB_DL[CC_id] == 25) ||
+ (N_RB_DL[CC_id] == 50))) {
+ nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id] + 1;
} else {
- ta_update = 31;
+ nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id];
}
+ }
- ta_len = (ta_update != 31) ? 2 : 0;
+ j = j + 1;
+ }
+ }
- header_len_dcch = 2; // 2 bytes DCCH SDU subheader
+ nb_available_rb -= nb_rb;
+ /*
+ eNB->mu_mimo_mode[UE_id].pre_nb_available_rbs = nb_rb;
+ eNB->mu_mimo_mode[UE_id].dl_pow_off = ue_sched_ctl->dl_pow_off[CC_id];
- if (TBS - ta_len - header_len_dcch > 0) {
- rlc_status = mac_rlc_status_ind(module_idP, rnti, module_idP, frameP, subframeP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH, (TBS - ta_len - header_len_dcch)); // transport block set size
+ for(j=0; j<N_RBG[CC_id]; j++) {
+ eNB->mu_mimo_mode[UE_id].rballoc_sub[j] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j];
+ }
+ */
+
+ switch (get_tmode(module_idP, CC_id, UE_id)) {
+ case 1:
+ case 2:
+ case 7:
+ default:
+ LOG_D(MAC,"retransmission DL_REQ: rnti:%x\n",rnti);
+
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void *) dl_config_pdu, 0,
+ sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = get_aggregation(get_bw_index(module_idP, CC_id),
+ ue_sched_ctl->dl_cqi[CC_id],
+ format1);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
+
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = harq_pid;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // dont adjust power when retransmitting
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid];
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid];
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = round & 3;
- sdu_lengths[0] = 0;
+ if (cc[CC_id].tdd_Config != NULL) { //TDD
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.downlink_assignment_index = (UE_list->UE_template[CC_id][UE_id].DAI - 1) & 3;
+ LOG_D(MAC,
+ "[eNB %d] Retransmission CC_id %d : harq_pid %d, round %d, dai %d, mcs %d\n",
+ module_idP, CC_id, harq_pid, round,
+ (UE_list->UE_template[CC_id][UE_id].DAI - 1),
+ UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid]);
+ } else {
+ LOG_D(MAC,
+ "[eNB %d] Retransmission CC_id %d : harq_pid %d, round %d, mcs %d\n",
+ module_idP, CC_id, harq_pid, round,
+ UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid]);
- if (rlc_status.bytes_in_buffer > 0) { // There is DCCH to transmit
- LOG_D(MAC,
- "[eNB %d] SFN/SF %d.%d, DL-DCCH->DLSCH CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
- module_idP, frameP, subframeP, CC_id,
- TBS - header_len_dcch);
- sdu_lengths[0] = mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH, TBS, //not used
- (char *)
- &dlsch_buffer
- [0]);
+ }
+ if (!CCE_allocation_infeasible(module_idP, CC_id, 1, subframeP,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, rnti)) {
+ dl_req->number_dci++;
+ dl_req->number_pdu++;
+ dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
+
+ eNB->DL_req[CC_id].sfn_sf = frameP<<4 | subframeP;
+ eNB->DL_req[CC_id].header.message_id = NFAPI_DL_CONFIG_REQUEST;
+
+ fill_nfapi_dlsch_config(eNB, dl_req, TBS, -1
+ /* retransmission, no pdu_index */
+ , rnti, 0, // type 0 allocation from 7.1.6 in 36.213
+ 0, // virtual_resource_block_assignment_flag, unused here
+ 0, // resource_block_coding, to be filled in later
+ getQm(UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid]), round & 3, // redundancy version
+ 1, // transport blocks
+ 0, // transport block to codeword swap flag
+ cc[CC_id].p_eNB == 1 ? 0 : 1, // transmission_scheme
+ 1, // number of layers
+ 1, // number of subbands
+ // uint8_t codebook_index,
+ 4, // UE category capacity
+ UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->pdsch_ConfigDedicated->p_a, 0, // delta_power_offset for TM5
+ 0, // ngap
+ 0, // nprb
+ cc[CC_id].p_eNB == 1 ? 1 : 2, // transmission mode
+ 0, //number of PRBs treated as one subband, not used here
+ 0 // number of beamforming vectors, not used here
+ );
+
+ LOG_D(MAC,
+ "Filled NFAPI configuration for DCI/DLSCH %d, retransmission round %d\n",
+ eNB->pdu_index[CC_id], round);
+
+ program_dlsch_acknak(module_idP, CC_id, UE_id,
+ frameP, subframeP,
+ dl_config_pdu->
+ dci_dl_pdu.dci_dl_pdu_rel8.
+ cce_idx);
+ // No TX request for retransmission (check if null request for FAPI)
+ } else {
+ LOG_W(MAC,
+ "Frame %d, Subframe %d: Dropping DLSCH allocation for UE %d\%x, infeasible CCE allocation\n",
+ frameP, subframeP, UE_id, rnti);
+ }
+ }
+
+
+ add_ue_dlsch_info(module_idP,
+ CC_id, UE_id, subframeP,
+ S_DL_SCHEDULED);
- T(T_ENB_MAC_UE_DL_SDU, T_INT(module_idP),
- T_INT(CC_id), T_INT(rnti), T_INT(frameP),
- T_INT(subframeP), T_INT(harq_pid), T_INT(DCCH),
- T_INT(sdu_lengths[0]));
-
- LOG_D(MAC,
- "[eNB %d][DCCH] CC_id %d Got %d bytes from RLC\n",
- module_idP, CC_id, sdu_lengths[0]);
- sdu_length_total = sdu_lengths[0];
- sdu_lcids[0] = DCCH;
- UE_list->eNB_UE_stats[CC_id][UE_id].
- num_pdu_tx[DCCH] += 1;
- UE_list->
- eNB_UE_stats[CC_id][UE_id].num_bytes_tx[DCCH]
- += sdu_lengths[0];
- num_sdus = 1;
+ //eNB_UE_stats->dlsch_trials[round]++;
+ UE_list->eNB_UE_stats[CC_id][UE_id].num_retransmission += 1;
+ UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used_retx = nb_rb;
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_retx += nb_rb;
+ UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs1 = eNB_UE_stats->dlsch_mcs1;
+ UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs2 = eNB_UE_stats->dlsch_mcs1;
+ } else {
+ LOG_D(MAC,
+ "[eNB %d] Frame %d CC_id %d : don't schedule UE %d, its retransmission takes more resources than we have\n",
+ module_idP, frameP, CC_id, UE_id);
+ }
+ } else { /* This is a potentially new SDU opportunity */
+
+ rlc_status.bytes_in_buffer = 0;
+ // Now check RLC information to compute number of required RBs
+ // get maximum TBS size for RLC request
+ TBS =
+ get_TBS_DL(eNB_UE_stats->dlsch_mcs1, nb_available_rb);
+ // check first for RLC data on DCCH
+ // add the length for all the control elements (timing adv, drx, etc) : header + payload
+
+ if (ue_sched_ctl->ta_timer == 0) {
+ ta_update = ue_sched_ctl->ta_update;
+ /* if we send TA then set timer to not send it for a while */
+ if (ta_update != 31) ue_sched_ctl->ta_timer = 20;
+ /* reset ta_update */
+ ue_sched_ctl->ta_update = 31;
+ } else {
+ ta_update = 31;
+ }
+
+ ta_len = (ta_update != 31) ? 2 : 0;
+
+ header_len_dcch = 2; // 2 bytes DCCH SDU subheader
+
+ if (TBS - ta_len - header_len_dcch > 0) {
+ rlc_status = mac_rlc_status_ind(module_idP, rnti, module_idP, frameP, subframeP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH, (TBS - ta_len - header_len_dcch)); // transport block set size
+
+ sdu_lengths[0] = 0;
+
+ if (rlc_status.bytes_in_buffer > 0) { // There is DCCH to transmit
+ LOG_D(MAC,
+ "[eNB %d] SFN/SF %d.%d, DL-DCCH->DLSCH CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
+ module_idP, frameP, subframeP, CC_id,
+ TBS - header_len_dcch);
+ sdu_lengths[0] = mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH, TBS, //not used
+ (char *)
+ &dlsch_buffer
+ [0]);
+
+ T(T_ENB_MAC_UE_DL_SDU, T_INT(module_idP),
+ T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+ T_INT(subframeP), T_INT(harq_pid), T_INT(DCCH),
+ T_INT(sdu_lengths[0]));
+
+ LOG_D(MAC,
+ "[eNB %d][DCCH] CC_id %d Got %d bytes from RLC\n",
+ module_idP, CC_id, sdu_lengths[0]);
+ sdu_length_total = sdu_lengths[0];
+ sdu_lcids[0] = DCCH;
+ UE_list->eNB_UE_stats[CC_id][UE_id].num_pdu_tx[DCCH] += 1;
+ UE_list->eNB_UE_stats[CC_id][UE_id].num_bytes_tx[DCCH] += sdu_lengths[0];
+ num_sdus = 1;
#ifdef DEBUG_eNB_SCHEDULER
- LOG_T(MAC,
- "[eNB %d][DCCH] CC_id %d Got %d bytes :",
- module_idP, CC_id, sdu_lengths[0]);
+ LOG_T(MAC,
+ "[eNB %d][DCCH] CC_id %d Got %d bytes :",
+ module_idP, CC_id, sdu_lengths[0]);
- for (j = 0; j < sdu_lengths[0]; j++) {
- LOG_T(MAC, "%x ", dlsch_buffer[j]);
- }
+ for (j = 0; j < sdu_lengths[0]; j++) {
+ LOG_T(MAC, "%x ", dlsch_buffer[j]);
+ }
- LOG_T(MAC, "\n");
+ LOG_T(MAC, "\n");
#endif
- } else {
- header_len_dcch = 0;
- sdu_length_total = 0;
- }
- }
- // check for DCCH1 and update header information (assume 2 byte sub-header)
- if (TBS - ta_len - header_len_dcch - sdu_length_total > 0) {
- rlc_status = mac_rlc_status_ind(module_idP, rnti, module_idP, frameP, subframeP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH + 1, (TBS - ta_len - header_len_dcch - sdu_length_total)); // transport block set size less allocations for timing advance and
- // DCCH SDU
- sdu_lengths[num_sdus] = 0;
-
- if (rlc_status.bytes_in_buffer > 0) {
- LOG_D(MAC,
- "[eNB %d], Frame %d, DCCH1->DLSCH, CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
- module_idP, frameP, CC_id,
- TBS - header_len_dcch - sdu_length_total);
- sdu_lengths[num_sdus] += mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH + 1, TBS, //not used
- (char *)
- &dlsch_buffer
- [sdu_length_total]);
-
- T(T_ENB_MAC_UE_DL_SDU, T_INT(module_idP),
- T_INT(CC_id), T_INT(rnti), T_INT(frameP),
- T_INT(subframeP), T_INT(harq_pid),
- T_INT(DCCH + 1), T_INT(sdu_lengths[num_sdus]));
-
- sdu_lcids[num_sdus] = DCCH1;
- sdu_length_total += sdu_lengths[num_sdus];
- header_len_dcch += 2;
- UE_list->eNB_UE_stats[CC_id][UE_id].
- num_pdu_tx[DCCH1] += 1;
- UE_list->
- eNB_UE_stats[CC_id][UE_id].num_bytes_tx[DCCH1]
- += sdu_lengths[num_sdus];
- num_sdus++;
+ } else {
+ header_len_dcch = 0;
+ sdu_length_total = 0;
+ }
+ }
+ // check for DCCH1 and update header information (assume 2 byte sub-header)
+ if (TBS - ta_len - header_len_dcch - sdu_length_total > 0) {
+ rlc_status = mac_rlc_status_ind(module_idP, rnti, module_idP, frameP, subframeP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH + 1, (TBS - ta_len - header_len_dcch - sdu_length_total)); // transport block set size less allocations for timing advance and
+ // DCCH SDU
+ sdu_lengths[num_sdus] = 0;
+
+ if (rlc_status.bytes_in_buffer > 0) {
+ LOG_D(MAC,
+ "[eNB %d], Frame %d, DCCH1->DLSCH, CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
+ module_idP, frameP, CC_id,
+ TBS - header_len_dcch - sdu_length_total);
+ sdu_lengths[num_sdus] += mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, DCCH + 1, TBS, //not used
+ (char *)
+ &dlsch_buffer
+ [sdu_length_total]);
+
+ T(T_ENB_MAC_UE_DL_SDU, T_INT(module_idP),
+ T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+ T_INT(subframeP), T_INT(harq_pid),
+ T_INT(DCCH + 1), T_INT(sdu_lengths[num_sdus]));
+
+ sdu_lcids[num_sdus] = DCCH1;
+ sdu_length_total += sdu_lengths[num_sdus];
+ header_len_dcch += 2;
+ UE_list->eNB_UE_stats[CC_id][UE_id].
+ num_pdu_tx[DCCH1] += 1;
+ UE_list->eNB_UE_stats[CC_id][UE_id].num_bytes_tx[DCCH1] += sdu_lengths[num_sdus];
+ num_sdus++;
#ifdef DEBUG_eNB_SCHEDULER
- LOG_T(MAC,
- "[eNB %d][DCCH1] CC_id %d Got %d bytes :",
- module_idP, CC_id, sdu_lengths[num_sdus]);
+ LOG_T(MAC,
+ "[eNB %d][DCCH1] CC_id %d Got %d bytes :",
+ module_idP, CC_id, sdu_lengths[num_sdus]);
- for (j = 0; j < sdu_lengths[num_sdus]; j++) {
- LOG_T(MAC, "%x ", dlsch_buffer[j]);
- }
+ for (j = 0; j < sdu_lengths[num_sdus]; j++) {
+ LOG_T(MAC, "%x ", dlsch_buffer[j]);
+ }
- LOG_T(MAC, "\n");
+ LOG_T(MAC, "\n");
#endif
- }
- }
- // assume the max dtch header size, and adjust it later
- header_len_dtch = 0;
- header_len_dtch_last = 0; // the header length of the last mac sdu
- // lcid has to be sorted before the actual allocation (similar struct as ue_list).
- for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
- // TBD: check if the lcid is active
-
- header_len_dtch += 3;
- header_len_dtch_last = 3;
- LOG_D(MAC,
- "[eNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (tbs %d, len %d)\n",
- module_idP, frameP, lcid, TBS,
- TBS - ta_len - header_len_dcch -
- sdu_length_total - header_len_dtch);
-
- if (TBS - ta_len - header_len_dcch - sdu_length_total - header_len_dtch > 0) { // NN: > 2 ?
- rlc_status = mac_rlc_status_ind(module_idP,
- rnti,
- module_idP,
- frameP,
- subframeP,
- ENB_FLAG_YES,
- MBMS_FLAG_NO,
- lcid,
- TBS - ta_len -
- header_len_dcch -
- sdu_length_total -
- header_len_dtch);
-
-
- if (rlc_status.bytes_in_buffer > 0) {
-
- LOG_D(MAC,
- "[eNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d)\n",
- module_idP, frameP,
- TBS - header_len_dcch -
- sdu_length_total - header_len_dtch, lcid,
- header_len_dtch);
- sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, lcid, TBS, //not used
- (char
- *)
- &dlsch_buffer
- [sdu_length_total]);
- T(T_ENB_MAC_UE_DL_SDU, T_INT(module_idP),
- T_INT(CC_id), T_INT(rnti), T_INT(frameP),
- T_INT(subframeP), T_INT(harq_pid),
- T_INT(lcid), T_INT(sdu_lengths[num_sdus]));
-
- LOG_D(MAC,
- "[eNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n",
- module_idP, sdu_lengths[num_sdus], lcid);
- sdu_lcids[num_sdus] = lcid;
- sdu_length_total += sdu_lengths[num_sdus];
- UE_list->
- eNB_UE_stats[CC_id][UE_id].num_pdu_tx[lcid]
- += 1;
- UE_list->
- eNB_UE_stats[CC_id][UE_id].num_bytes_tx
- [lcid] += sdu_lengths[num_sdus];
- if (sdu_lengths[num_sdus] < 128) {
- header_len_dtch--;
- header_len_dtch_last--;
- }
- num_sdus++;
- UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
- } // no data for this LCID
- else {
- header_len_dtch -= 3;
- }
- } // no TBS left
- else {
- header_len_dtch -= 3;
- break;
- }
+ }
+ }
+ // assume the max dtch header size, and adjust it later
+ header_len_dtch = 0;
+ header_len_dtch_last = 0; // the header length of the last mac sdu
+ // lcid has to be sorted before the actual allocation (similar struct as ue_list).
+ for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
+ // TBD: check if the lcid is active
+
+ header_len_dtch += 3;
+ header_len_dtch_last = 3;
+ LOG_D(MAC,
+ "[eNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (tbs %d, len %d)\n",
+ module_idP, frameP, lcid, TBS,
+ TBS - ta_len - header_len_dcch -
+ sdu_length_total - header_len_dtch);
+
+ if (TBS - ta_len - header_len_dcch - sdu_length_total - header_len_dtch > 0) { // NN: > 2 ?
+ rlc_status = mac_rlc_status_ind(module_idP,
+ rnti,
+ module_idP,
+ frameP,
+ subframeP,
+ ENB_FLAG_YES,
+ MBMS_FLAG_NO,
+ lcid,
+ TBS - ta_len -
+ header_len_dcch -
+ sdu_length_total -
+ header_len_dtch);
+
+
+ if (rlc_status.bytes_in_buffer > 0) {
+
+ LOG_D(MAC,
+ "[eNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d)\n",
+ module_idP, frameP,
+ TBS - header_len_dcch -
+ sdu_length_total - header_len_dtch, lcid,
+ header_len_dtch);
+ sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP, rnti, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, lcid, TBS, //not used
+ (char
+ *)
+ &dlsch_buffer
+ [sdu_length_total]);
+ T(T_ENB_MAC_UE_DL_SDU, T_INT(module_idP),
+ T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+ T_INT(subframeP), T_INT(harq_pid),
+ T_INT(lcid), T_INT(sdu_lengths[num_sdus]));
+
+ LOG_D(MAC,
+ "[eNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n",
+ module_idP, sdu_lengths[num_sdus], lcid);
+ sdu_lcids[num_sdus] = lcid;
+ sdu_length_total += sdu_lengths[num_sdus];
+ UE_list->
+ eNB_UE_stats[CC_id][UE_id].num_pdu_tx[lcid]
+ += 1;
+ UE_list->
+ eNB_UE_stats[CC_id][UE_id].num_bytes_tx
+ [lcid] += sdu_lengths[num_sdus];
+ if (sdu_lengths[num_sdus] < 128) {
+ header_len_dtch--;
+ header_len_dtch_last--;
+ }
+ num_sdus++;
+ UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
+ } // no data for this LCID
+ else {
+ header_len_dtch -= 3;
+ }
+ } // no TBS left
+ else {
+ header_len_dtch -= 3;
+ break;
+ }
+ }
+ if (header_len_dtch == 0)
+ header_len_dtch_last = 0;
+ // there is at least one SDU
+ // if (num_sdus > 0 ){
+ if ((sdu_length_total + header_len_dcch +
+ header_len_dtch) > 0) {
+
+ // Now compute number of required RBs for total sdu length
+ // Assume RAH format 2
+ // adjust header lengths
+ header_len_dcch_tmp = header_len_dcch;
+ header_len_dtch_tmp = header_len_dtch;
+ if (header_len_dtch == 0) {
+ header_len_dcch = (header_len_dcch > 0) ? 1 : 0; //header_len_dcch; // remove length field
+ } else {
+ header_len_dtch_last -= 1; // now use it to find how many bytes has to be removed for the last MAC SDU
+ header_len_dtch = (header_len_dtch > 0) ? header_len_dtch - header_len_dtch_last : header_len_dtch; // remove length field for the last SDU
+ }
+
+ mcs = eNB_UE_stats->dlsch_mcs1;
+
+ if (mcs == 0) {
+ nb_rb = 4; // don't let the TBS get too small
+ } else {
+ nb_rb = min_rb_unit[CC_id];
+ }
+
+ TBS = get_TBS_DL(mcs, nb_rb);
+
+ while (TBS <
+ (sdu_length_total + header_len_dcch +
+ header_len_dtch + ta_len)) {
+ nb_rb += min_rb_unit[CC_id]; //
+
+ if (nb_rb > nb_available_rb) { // if we've gone beyond the maximum number of RBs
+ // (can happen if N_RB_DL is odd)
+ TBS =
+ get_TBS_DL(eNB_UE_stats->dlsch_mcs1,
+ nb_available_rb);
+ nb_rb = nb_available_rb;
+ break;
+ }
+
+ TBS = get_TBS_DL(eNB_UE_stats->dlsch_mcs1, nb_rb);
+ }
+
+ if (nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
+ for (j = 0; j < N_RBG[CC_id]; j++) { // for indicating the rballoc for each sub-band
+ UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
+ }
+ } else {
+ nb_rb_temp = nb_rb;
+ j = 0;
+
+ while ((nb_rb_temp > 0) && (j < N_RBG[CC_id])) {
+ if (ue_sched_ctl->rballoc_sub_UE[CC_id][j] == 1) {
+ UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
+
+ if ((j == N_RBG[CC_id] - 1) &&
+ ((N_RB_DL[CC_id] == 25) ||
+ (N_RB_DL[CC_id] == 50))) {
+ nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id] + 1;
+ } else {
+ nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id];
}
- if (header_len_dtch == 0)
- header_len_dtch_last = 0;
- // there is at least one SDU
- // if (num_sdus > 0 ){
- if ((sdu_length_total + header_len_dcch +
- header_len_dtch) > 0) {
-
- // Now compute number of required RBs for total sdu length
- // Assume RAH format 2
- // adjust header lengths
- header_len_dcch_tmp = header_len_dcch;
- header_len_dtch_tmp = header_len_dtch;
- if (header_len_dtch == 0) {
- header_len_dcch = (header_len_dcch > 0) ? 1 : 0; //header_len_dcch; // remove length field
- } else {
- header_len_dtch_last -= 1; // now use it to find how many bytes has to be removed for the last MAC SDU
- header_len_dtch = (header_len_dtch > 0) ? header_len_dtch - header_len_dtch_last : header_len_dtch; // remove length field for the last SDU
- }
-
- mcs = eNB_UE_stats->dlsch_mcs1;
-
- if (mcs == 0) {
- nb_rb = 4; // don't let the TBS get too small
- } else {
- nb_rb = min_rb_unit[CC_id];
- }
-
- TBS = get_TBS_DL(mcs, nb_rb);
-
- while (TBS <
- (sdu_length_total + header_len_dcch +
- header_len_dtch + ta_len)) {
- nb_rb += min_rb_unit[CC_id]; //
-
- if (nb_rb > nb_available_rb) { // if we've gone beyond the maximum number of RBs
- // (can happen if N_RB_DL is odd)
- TBS =
- get_TBS_DL(eNB_UE_stats->dlsch_mcs1,
- nb_available_rb);
- nb_rb = nb_available_rb;
- break;
- }
-
- TBS = get_TBS_DL(eNB_UE_stats->dlsch_mcs1, nb_rb);
- }
-
- if (nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
- for (j = 0; j < N_RBG[CC_id]; j++) { // for indicating the rballoc for each sub-band
- UE_list->UE_template[CC_id][UE_id].
- rballoc_subband[harq_pid][j] =
- ue_sched_ctl->rballoc_sub_UE[CC_id][j];
- }
- } else {
- nb_rb_temp = nb_rb;
- j = 0;
-
- while ((nb_rb_temp > 0) && (j < N_RBG[CC_id])) {
- if (ue_sched_ctl->rballoc_sub_UE[CC_id][j] ==
- 1) {
- UE_list->
- UE_template[CC_id]
- [UE_id].rballoc_subband[harq_pid][j] =
- ue_sched_ctl->rballoc_sub_UE[CC_id][j];
-
- if ((j == N_RBG[CC_id] - 1) &&
- ((N_RB_DL[CC_id] == 25) ||
- (N_RB_DL[CC_id] == 50))) {
- nb_rb_temp =
- nb_rb_temp - min_rb_unit[CC_id] +
- 1;
- } else {
- nb_rb_temp =
- nb_rb_temp - min_rb_unit[CC_id];
- }
- }
-
- j = j + 1;
- }
- }
-
- // decrease mcs until TBS falls below required length
- while ((TBS >
- (sdu_length_total + header_len_dcch +
- header_len_dtch + ta_len)) && (mcs > 0)) {
- mcs--;
- TBS = get_TBS_DL(mcs, nb_rb);
- }
-
- // if we have decreased too much or we don't have enough RBs, increase MCS
- while ((TBS <
- (sdu_length_total + header_len_dcch +
- header_len_dtch + ta_len))
- && (((ue_sched_ctl->dl_pow_off[CC_id] > 0)
- && (mcs < 28))
- || ((ue_sched_ctl->dl_pow_off[CC_id] == 0)
- && (mcs <= 15)))) {
- mcs++;
- TBS = get_TBS_DL(mcs, nb_rb);
- }
-
- LOG_D(MAC,
- "dlsch_mcs before and after the rate matching = (%d, %d)\n",
- eNB_UE_stats->dlsch_mcs1, mcs);
+ }
+
+ j = j + 1;
+ }
+ }
+
+ // decrease mcs until TBS falls below required length
+ while ((TBS > (sdu_length_total + header_len_dcch + header_len_dtch + ta_len)) && (mcs > 0)) {
+ mcs--;
+ TBS = get_TBS_DL(mcs, nb_rb);
+ }
+
+ // if we have decreased too much or we don't have enough RBs, increase MCS
+ while ((TBS < (sdu_length_total + header_len_dcch + header_len_dtch + ta_len))
+ && (((ue_sched_ctl->dl_pow_off[CC_id] > 0)
+ && (mcs < 28))
+ || ((ue_sched_ctl->dl_pow_off[CC_id] == 0)
+ && (mcs <= 15)))) {
+ mcs++;
+ TBS = get_TBS_DL(mcs, nb_rb);
+ }
+
+ LOG_D(MAC,
+ "dlsch_mcs before and after the rate matching = (%d, %d)\n",
+ eNB_UE_stats->dlsch_mcs1, mcs);
#ifdef DEBUG_eNB_SCHEDULER
- LOG_D(MAC,
- "[eNB %d] CC_id %d Generated DLSCH header (mcs %d, TBS %d, nb_rb %d)\n",
- module_idP, CC_id, mcs, TBS, nb_rb);
- // msg("[MAC][eNB ] Reminder of DLSCH with random data %d %d %d %d \n",
- // TBS, sdu_length_total, offset, TBS-sdu_length_total-offset);
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d Generated DLSCH header (mcs %d, TBS %d, nb_rb %d)\n",
+ module_idP, CC_id, mcs, TBS, nb_rb);
+ // msg("[MAC][eNB ] Reminder of DLSCH with random data %d %d %d %d \n",
+ // TBS, sdu_length_total, offset, TBS-sdu_length_total-offset);
#endif
- if ((TBS - header_len_dcch - header_len_dtch -
- sdu_length_total - ta_len) <= 2) {
- padding =
- (TBS - header_len_dcch - header_len_dtch -
- sdu_length_total - ta_len);
- post_padding = 0;
- } else {
- padding = 0;
-
- // adjust the header len
- if (header_len_dtch == 0) {
- header_len_dcch = header_len_dcch_tmp;
- } else { //if (( header_len_dcch==0)&&((header_len_dtch==1)||(header_len_dtch==2)))
- header_len_dtch = header_len_dtch_tmp;
- }
-
- post_padding = TBS - sdu_length_total - header_len_dcch - header_len_dtch - ta_len; // 1 is for the postpadding header
- }
-
-
- offset = generate_dlsch_header((unsigned char *) UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0], num_sdus, //num_sdus
- sdu_lengths, //
- sdu_lcids, 255, // no drx
- ta_update, // timing advance
- NULL, // contention res id
- padding, post_padding);
-
- //#ifdef DEBUG_eNB_SCHEDULER
- if (ta_update != 31) {
- LOG_D(MAC,
- "[eNB %d][DLSCH] Frame %d Generate header for UE_id %d on CC_id %d: sdu_length_total %d, num_sdus %d, sdu_lengths[0] %d, sdu_lcids[0] %d => payload offset %d,timing advance value : %d, padding %d,post_padding %d,(mcs %d, TBS %d, nb_rb %d),header_dcch %d, header_dtch %d\n",
- module_idP, frameP, UE_id, CC_id,
- sdu_length_total, num_sdus, sdu_lengths[0],
- sdu_lcids[0], offset, ta_update, padding,
- post_padding, mcs, TBS, nb_rb,
- header_len_dcch, header_len_dtch);
- }
- //#endif
+ if ((TBS - header_len_dcch - header_len_dtch - sdu_length_total - ta_len) <= 2) {
+ padding = (TBS - header_len_dcch - header_len_dtch - sdu_length_total - ta_len);
+ post_padding = 0;
+ } else {
+ padding = 0;
+
+ // adjust the header len
+ if (header_len_dtch == 0) {
+ header_len_dcch = header_len_dcch_tmp;
+ } else { //if (( header_len_dcch==0)&&((header_len_dtch==1)||(header_len_dtch==2)))
+ header_len_dtch = header_len_dtch_tmp;
+ }
+
+ post_padding = TBS - sdu_length_total - header_len_dcch - header_len_dtch - ta_len; // 1 is for the postpadding header
+ }
+
+
+ offset = generate_dlsch_header((unsigned char *) UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0], num_sdus, //num_sdus
+ sdu_lengths, //
+ sdu_lcids, 255, // no drx
+ ta_update, // timing advance
+ NULL, // contention res id
+ padding, post_padding);
+
+ //#ifdef DEBUG_eNB_SCHEDULER
+ if (ta_update != 31) {
+ LOG_D(MAC,
+ "[eNB %d][DLSCH] Frame %d Generate header for UE_id %d on CC_id %d: sdu_length_total %d, num_sdus %d, sdu_lengths[0] %d, sdu_lcids[0] %d => payload offset %d,timing advance value : %d, padding %d,post_padding %d,(mcs %d, TBS %d, nb_rb %d),header_dcch %d, header_dtch %d\n",
+ module_idP, frameP, UE_id, CC_id,
+ sdu_length_total, num_sdus, sdu_lengths[0],
+ sdu_lcids[0], offset, ta_update, padding,
+ post_padding, mcs, TBS, nb_rb,
+ header_len_dcch, header_len_dtch);
+ }
+ //#endif
#ifdef DEBUG_eNB_SCHEDULER
- LOG_T(MAC, "[eNB %d] First 16 bytes of DLSCH : \n");
+ LOG_T(MAC, "[eNB %d] First 16 bytes of DLSCH : \n");
- for (i = 0; i < 16; i++) {
- LOG_T(MAC, "%x.", dlsch_buffer[i]);
- }
+ for (i = 0; i < 16; i++) {
+ LOG_T(MAC, "%x.", dlsch_buffer[i]);
+ }
- LOG_T(MAC, "\n");
+ LOG_T(MAC, "\n");
#endif
- // cycle through SDUs and place in dlsch_buffer
- memcpy(&UE_list->
- DLSCH_pdu[CC_id][0][UE_id].payload[0][offset],
- dlsch_buffer, sdu_length_total);
- // memcpy(RC.mac[0].DLSCH_pdu[0][0].payload[0][offset],dcch_buffer,sdu_lengths[0]);
-
- // fill remainder of DLSCH with random data
- for (j = 0; j < (TBS - sdu_length_total - offset); j++) {
- UE_list->DLSCH_pdu[CC_id][0][UE_id].
- payload[0][offset + sdu_length_total + j] =
- (char) (taus() & 0xff);
- }
-
-
- if (opt_enabled == 1) {
- trace_pdu(1, (uint8_t *)
- UE_list->DLSCH_pdu[CC_id][0][UE_id].
- payload[0], TBS, module_idP, 3,
- UE_RNTI(module_idP, UE_id), eNB->frame,
- eNB->subframe, 0, 0);
- LOG_D(OPT,
- "[eNB %d][DLSCH] CC_id %d Frame %d rnti %x with size %d\n",
- module_idP, CC_id, frameP,
- UE_RNTI(module_idP, UE_id), TBS);
- }
-
- T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP),
- T_INT(CC_id), T_INT(rnti), T_INT(frameP),
- T_INT(subframeP), T_INT(harq_pid),
- T_BUFFER(UE_list->DLSCH_pdu[CC_id][0][UE_id].
- payload[0], TBS));
-
- UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] =
- nb_rb;
-
- add_ue_dlsch_info(module_idP,
- CC_id, UE_id, subframeP,
- S_DL_SCHEDULED);
- // store stats
- eNB->eNB_stats[CC_id].dlsch_bytes_tx +=
- sdu_length_total;
- eNB->eNB_stats[CC_id].dlsch_pdus_tx += 1;
-
- UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used = nb_rb;
- UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used +=
- nb_rb;
- UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs1 =
- eNB_UE_stats->dlsch_mcs1;
- UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs2 = mcs;
- UE_list->eNB_UE_stats[CC_id][UE_id].TBS = TBS;
-
- UE_list->eNB_UE_stats[CC_id][UE_id].overhead_bytes =
- TBS - sdu_length_total;
- UE_list->eNB_UE_stats[CC_id][UE_id].total_sdu_bytes +=
- sdu_length_total;
- UE_list->eNB_UE_stats[CC_id][UE_id].total_pdu_bytes +=
- TBS;
- UE_list->eNB_UE_stats[CC_id][UE_id].total_num_pdus +=
- 1;
-
- if (cc[CC_id].tdd_Config != NULL) { // TDD
- UE_list->UE_template[CC_id][UE_id].DAI++;
- update_ul_dci(module_idP, CC_id, rnti,
- UE_list->UE_template[CC_id][UE_id].
- DAI);
- }
- // do PUCCH power control
- // this is the normalized RX power
- eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
-
- /* TODO: fix how we deal with power, unit is not dBm, it's special from nfapi */
- normalized_rx_power = ue_sched_ctl->pucch1_snr[CC_id];
- target_rx_power = 208;
-
- // this assumes accumulated tpc
- // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
- int32_t framex10psubframe =
- UE_list->UE_template[CC_id][UE_id].
- pucch_tpc_tx_frame * 10 +
- UE_list->UE_template[CC_id][UE_id].
- pucch_tpc_tx_subframe;
- if (((framex10psubframe + 10) <= (frameP * 10 + subframeP)) || //normal case
- ((framex10psubframe > (frameP * 10 + subframeP)) && (((10240 - framex10psubframe + frameP * 10 + subframeP) >= 10)))) //frame wrap-around
- if (ue_sched_ctl->pucch1_cqi_update[CC_id] == 1) {
- ue_sched_ctl->pucch1_cqi_update[CC_id] = 0;
-
- UE_list->
- UE_template[CC_id]
- [UE_id].pucch_tpc_tx_frame = frameP;
- UE_list->
- UE_template[CC_id]
- [UE_id].pucch_tpc_tx_subframe = subframeP;
-
- if (normalized_rx_power >
- (target_rx_power + 4)) {
- tpc = 0; //-1
- tpc_accumulated--;
- } else if (normalized_rx_power <
- (target_rx_power - 4)) {
- tpc = 2; //+1
- tpc_accumulated++;
- } else {
- tpc = 1; //0
- }
-
- LOG_D(MAC,
- "[eNB %d] DLSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",
- module_idP, frameP, subframeP, harq_pid,
- tpc, tpc_accumulated,
- normalized_rx_power, target_rx_power);
-
- } // Po_PUCCH has been updated
- else {
- tpc = 1; //0
- } // time to do TPC update
- else {
- tpc = 1; //0
- }
-
- dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type =
- NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format =
- NFAPI_DL_DCI_FORMAT_1;
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level =
- get_aggregation(get_bw_index(module_idP, CC_id),
- ue_sched_ctl->dl_cqi[CC_id],
- format1);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
-
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- harq_process = harq_pid;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = tpc; // dont adjust power when retransmitting
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.new_data_indicator_1 =
- 1 -
- UE_list->UE_template[CC_id][UE_id].
- oldNDI[harq_pid];
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.redundancy_version_1 = 0;
- //deactivate second codeword
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_2 = 0;
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.redundancy_version_2 = 1;
- if (cc[CC_id].tdd_Config != NULL) { //TDD
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.downlink_assignment_index =
- (UE_list->UE_template[CC_id][UE_id].DAI -
- 1) & 3;
- LOG_D(MAC,
- "[eNB %d] Initial transmission CC_id %d : harq_pid %d, dai %d, mcs %d\n",
- module_idP, CC_id, harq_pid,
- (UE_list->UE_template[CC_id][UE_id].DAI - 1),
- mcs);
- } else {
- LOG_D(MAC,
- "[eNB %d] Initial transmission CC_id %d : harq_pid %d, mcs %d\n",
- module_idP, CC_id, harq_pid, mcs);
-
- }
- LOG_D(MAC, "Checking feasibility pdu %d (new sdu)\n",
- dl_req->number_pdu);
- if (!CCE_allocation_infeasible
- (module_idP, CC_id, 1, subframeP,
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level, rnti)) {
-
-
- ue_sched_ctl->round[CC_id][harq_pid] = 0;
- dl_req->number_dci++;
- dl_req->number_pdu++;
- dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
-
- eNB->DL_req[CC_id].sfn_sf = frameP<<4 | subframeP;
- eNB->DL_req[CC_id].header.message_id = NFAPI_DL_CONFIG_REQUEST;
-
- // Toggle NDI for next time
- LOG_D(MAC,
- "CC_id %d Frame %d, subframeP %d: Toggling Format1 NDI for UE %d (rnti %x/%d) oldNDI %d\n",
- CC_id, frameP, subframeP, UE_id, rnti,
- harq_pid,
- UE_list->
- UE_template[CC_id][UE_id].oldNDI[harq_pid]);
-
- UE_list->UE_template[CC_id][UE_id].
- oldNDI[harq_pid] =
- 1 -
- UE_list->UE_template[CC_id][UE_id].
- oldNDI[harq_pid];
- UE_list->UE_template[CC_id][UE_id].
- oldmcs1[harq_pid] = mcs;
- UE_list->UE_template[CC_id][UE_id].
- oldmcs2[harq_pid] = 0;
- AssertFatal(UE_list->UE_template[CC_id]
- [UE_id].physicalConfigDedicated !=
- NULL,
- "physicalConfigDedicated is NULL\n");
- AssertFatal(UE_list->UE_template[CC_id]
- [UE_id].
- physicalConfigDedicated->pdsch_ConfigDedicated
- != NULL,
- "physicalConfigDedicated->pdsch_ConfigDedicated is NULL\n");
-
- fill_nfapi_dlsch_config(eNB, dl_req, TBS, eNB->pdu_index[CC_id], rnti, 0, // type 0 allocation from 7.1.6 in 36.213
- 0, // virtual_resource_block_assignment_flag, unused here
- 0, // resource_block_coding, to be filled in later
- getQm(mcs), 0, // redundancy version
- 1, // transport blocks
- 0, // transport block to codeword swap flag
- cc[CC_id].p_eNB == 1 ? 0 : 1, // transmission_scheme
- 1, // number of layers
- 1, // number of subbands
- // uint8_t codebook_index,
- 4, // UE category capacity
- UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->pdsch_ConfigDedicated->p_a, 0, // delta_power_offset for TM5
- 0, // ngap
- 0, // nprb
- cc[CC_id].p_eNB == 1 ? 1 : 2, // transmission mode
- 0, //number of PRBs treated as one subband, not used here
- 0 // number of beamforming vectors, not used here
- );
- eNB->TX_req[CC_id].sfn_sf =
- fill_nfapi_tx_req(&eNB->
- TX_req
- [CC_id].tx_request_body,
- (frameP * 10) + subframeP,
- TBS, eNB->pdu_index[CC_id],
- eNB->
- UE_list.DLSCH_pdu[CC_id][0][(unsigned char)
- UE_id].payload
- [0]);
+ // cycle through SDUs and place in dlsch_buffer
+ memcpy(&UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset],
+ dlsch_buffer, sdu_length_total);
+ // memcpy(RC.mac[0].DLSCH_pdu[0][0].payload[0][offset],dcch_buffer,sdu_lengths[0]);
+
+ // fill remainder of DLSCH with random data
+ for (j = 0; j < (TBS - sdu_length_total - offset); j++) {
+ UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset + sdu_length_total + j] = (char) (taus() & 0xff);
+ }
+
+
+ if (opt_enabled == 1) {
+ trace_pdu(1, (uint8_t *)
+ UE_list->DLSCH_pdu[CC_id][0][UE_id].
+ payload[0], TBS, module_idP, 3,
+ UE_RNTI(module_idP, UE_id), eNB->frame,
+ eNB->subframe, 0, 0);
+ LOG_D(OPT,
+ "[eNB %d][DLSCH] CC_id %d Frame %d rnti %x with size %d\n",
+ module_idP, CC_id, frameP,
+ UE_RNTI(module_idP, UE_id), TBS);
+ }
+
+ T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP),
+ T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+ T_INT(subframeP), T_INT(harq_pid),
+ T_BUFFER(UE_list->DLSCH_pdu[CC_id][0][UE_id].
+ payload[0], TBS));
+
+ UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] = nb_rb;
+
+ add_ue_dlsch_info(module_idP,
+ CC_id, UE_id, subframeP,
+ S_DL_SCHEDULED);
+ // store stats
+ eNB->eNB_stats[CC_id].dlsch_bytes_tx += sdu_length_total;
+ eNB->eNB_stats[CC_id].dlsch_pdus_tx += 1;
+
+ UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used = nb_rb;
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used += nb_rb;
+ UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs1 = eNB_UE_stats->dlsch_mcs1;
+ UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs2 = mcs;
+ UE_list->eNB_UE_stats[CC_id][UE_id].TBS = TBS;
+
+ UE_list->eNB_UE_stats[CC_id][UE_id].overhead_bytes = TBS - sdu_length_total;
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_sdu_bytes += sdu_length_total;
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_pdu_bytes += TBS;
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_num_pdus += 1;
+
+ if (cc[CC_id].tdd_Config != NULL) { // TDD
+ UE_list->UE_template[CC_id][UE_id].DAI++;
+ update_ul_dci(module_idP, CC_id, rnti,
+ UE_list->UE_template[CC_id][UE_id].
+ DAI);
+ }
+ // do PUCCH power control
+ // this is the normalized RX power
+ eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
+
+ /* TODO: fix how we deal with power, unit is not dBm, it's special from nfapi */
+ normalized_rx_power = ue_sched_ctl->pucch1_snr[CC_id];
+ target_rx_power = 208;
+
+ // this assumes accumulated tpc
+ // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
+ int32_t framex10psubframe = UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_frame * 10 + UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_subframe;
+ if (((framex10psubframe + 10) <= (frameP * 10 + subframeP)) || //normal case
+ ((framex10psubframe > (frameP * 10 + subframeP)) && (((10240 - framex10psubframe + frameP * 10 + subframeP) >= 10)))) //frame wrap-around
+ if (ue_sched_ctl->pucch1_cqi_update[CC_id] == 1) {
+ ue_sched_ctl->pucch1_cqi_update[CC_id] = 0;
+
+ UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_frame = frameP;
+ UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_subframe = subframeP;
+
+ if (normalized_rx_power > (target_rx_power + 4)) {
+ tpc = 0; //-1
+ tpc_accumulated--;
+ } else if (normalized_rx_power < (target_rx_power - 4)) {
+ tpc = 2; //+1
+ tpc_accumulated++;
+ } else {
+ tpc = 1; //0
+ }
+
+ LOG_D(MAC,
+ "[eNB %d] DLSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",
+ module_idP, frameP, subframeP, harq_pid,
+ tpc, tpc_accumulated,
+ normalized_rx_power, target_rx_power);
+
+ } // Po_PUCCH has been updated
+ else {
+ tpc = 1; //0
+ } // time to do TPC update
+ else {
+ tpc = 1; //0
+ }
+
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void *) dl_config_pdu, 0,
+ sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = get_aggregation(get_bw_index(module_idP, CC_id),
+ ue_sched_ctl->dl_cqi[CC_id],
+ format1);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
+
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = harq_pid;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = tpc; // dont adjust power when retransmitting
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = 1 - UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid];
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = 0;
+ //deactivate second codeword
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_2 = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_2 = 1;
+ if (cc[CC_id].tdd_Config != NULL) { //TDD
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.downlink_assignment_index = (UE_list->UE_template[CC_id][UE_id].DAI - 1) & 3;
+ LOG_D(MAC,
+ "[eNB %d] Initial transmission CC_id %d : harq_pid %d, dai %d, mcs %d\n",
+ module_idP, CC_id, harq_pid,
+ (UE_list->UE_template[CC_id][UE_id].DAI - 1),
+ mcs);
+ } else {
+ LOG_D(MAC,
+ "[eNB %d] Initial transmission CC_id %d : harq_pid %d, mcs %d\n",
+ module_idP, CC_id, harq_pid, mcs);
- LOG_D(MAC,
- "Filled NFAPI configuration for DCI/DLSCH/TXREQ %d, new SDU\n",
- eNB->pdu_index[CC_id]);
+ }
+ LOG_D(MAC, "Checking feasibility pdu %d (new sdu)\n",
+ dl_req->number_pdu);
+ if (!CCE_allocation_infeasible(module_idP, CC_id, 1, subframeP,
+ dl_config_pdu->dci_dl_pdu.
+ dci_dl_pdu_rel8.aggregation_level, rnti)) {
- eNB->pdu_index[CC_id]++;
- program_dlsch_acknak(module_idP, CC_id, UE_id,
- frameP, subframeP,
- dl_config_pdu->
- dci_dl_pdu.dci_dl_pdu_rel8.
- cce_idx);
- } else {
- LOG_W(MAC,
- "Frame %d, Subframe %d: Dropping DLSCH allocation for UE %d/%x, infeasible CCE allocations\n",
- frameP, subframeP, UE_id, rnti);
- }
- } else { // There is no data from RLC or MAC header, so don't schedule
+ ue_sched_ctl->round[CC_id][harq_pid] = 0;
+ dl_req->number_dci++;
+ dl_req->number_pdu++;
+ dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
- }
- }
+ eNB->DL_req[CC_id].sfn_sf = frameP<<4 | subframeP;
+ eNB->DL_req[CC_id].header.message_id = NFAPI_DL_CONFIG_REQUEST;
- if (cc[CC_id].tdd_Config != NULL) { // TDD
- set_ul_DAI(module_idP, UE_id, CC_id, frameP, subframeP);
- }
+ // Toggle NDI for next time
+ LOG_D(MAC,
+ "CC_id %d Frame %d, subframeP %d: Toggling Format1 NDI for UE %d (rnti %x/%d) oldNDI %d\n",
+ CC_id, frameP, subframeP, UE_id, rnti,
+ harq_pid,
+ UE_list->
+ UE_template[CC_id][UE_id].oldNDI[harq_pid]);
+
+ UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid] = 1 - UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid];
+ UE_list->UE_template[CC_id][UE_id].oldmcs1[harq_pid] = mcs;
+ UE_list->UE_template[CC_id][UE_id].oldmcs2[harq_pid] = 0;
+ AssertFatal(UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated !=
+ NULL,
+ "physicalConfigDedicated is NULL\n");
+ AssertFatal(UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->pdsch_ConfigDedicated != NULL,
+ "physicalConfigDedicated->pdsch_ConfigDedicated is NULL\n");
+
+ fill_nfapi_dlsch_config(eNB, dl_req, TBS, eNB->pdu_index[CC_id], rnti, 0, // type 0 allocation from 7.1.6 in 36.213
+ 0, // virtual_resource_block_assignment_flag, unused here
+ 0, // resource_block_coding, to be filled in later
+ getQm(mcs), 0, // redundancy version
+ 1, // transport blocks
+ 0, // transport block to codeword swap flag
+ cc[CC_id].p_eNB == 1 ? 0 : 1, // transmission_scheme
+ 1, // number of layers
+ 1, // number of subbands
+ // uint8_t codebook_index,
+ 4, // UE category capacity
+ UE_list->UE_template[CC_id][UE_id].physicalConfigDedicated->pdsch_ConfigDedicated->p_a, 0, // delta_power_offset for TM5
+ 0, // ngap
+ 0, // nprb
+ cc[CC_id].p_eNB == 1 ? 1 : 2, // transmission mode
+ 0, //number of PRBs treated as one subband, not used here
+ 0 // number of beamforming vectors, not used here
+ );
+ eNB->TX_req[CC_id].sfn_sf = fill_nfapi_tx_req(&eNB->
+ TX_req
+ [CC_id].tx_request_body,
+ (frameP * 10) + subframeP,
+ TBS, eNB->pdu_index[CC_id],
+ eNB->
+ UE_list.DLSCH_pdu[CC_id][0][(unsigned char)
+ UE_id].payload
+ [0]);
+
+ LOG_D(MAC,
+ "Filled NFAPI configuration for DCI/DLSCH/TXREQ %d, new SDU\n",
+ eNB->pdu_index[CC_id]);
+
+ eNB->pdu_index[CC_id]++;
+ program_dlsch_acknak(module_idP, CC_id, UE_id,
+ frameP, subframeP,
+ dl_config_pdu->
+ dci_dl_pdu.dci_dl_pdu_rel8.
+ cce_idx);
+
+ } else {
+ LOG_W(MAC,
+ "Frame %d, Subframe %d: Dropping DLSCH allocation for UE %d/%x, infeasible CCE allocations\n",
+ frameP, subframeP, UE_id, rnti);
+ }
+ } else { // There is no data from RLC or MAC header, so don't schedule
- } // UE_id loop
- } // CC_id loop
+ }
+ }
+
+ if (cc[CC_id].tdd_Config != NULL) { // TDD
+ set_ul_DAI(module_idP, UE_id, CC_id, frameP, subframeP);
+ }
+ } // UE_id loop
+ } // CC_id loop
- fill_DLSCH_dci(module_idP, frameP, subframeP, mbsfn_flag);
- stop_meas(&eNB->schedule_dlsch);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_OUT);
+ fill_DLSCH_dci(module_idP, frameP, subframeP, mbsfn_flag);
+
+ stop_meas(&eNB->schedule_dlsch);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_OUT);
}
@@ -1679,111 +1545,84 @@ fill_DLSCH_dci(module_id_t module_idP,
//------------------------------------------------------------------------------
{
- // loop over all allocated UEs and compute frequency allocations for PDSCH
- int UE_id = -1;
- uint8_t /* first_rb, */ nb_rb = 3;
- rnti_t rnti;
- //unsigned char *vrb_map;
- uint8_t rballoc_sub[25];
- //uint8_t number_of_subbands=13;
-
- //unsigned char round;
- unsigned char harq_pid;
- int i;
- int CC_id;
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- UE_list_t *UE_list = &eNB->UE_list;
- int N_RBG;
- int N_RB_DL;
- COMMON_channels_t *cc;
-
- start_meas(&eNB->fill_DLSCH_dci);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI, VCD_FUNCTION_IN);
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- LOG_D(MAC, "Doing fill DCI for CC_id %d\n", CC_id);
-
- if (mbsfn_flagP[CC_id] > 0)
- continue;
-
- cc = &eNB->common_channels[CC_id];
- N_RBG = to_rbg(cc->mib->message.dl_Bandwidth);
- N_RB_DL = to_prb(cc->mib->message.dl_Bandwidth);
-
- // UE specific DCIs
- for (UE_id = UE_list->head; UE_id >= 0;
- UE_id = UE_list->next[UE_id]) {
- LOG_T(MAC, "CC_id %d, UE_id: %d => status %d\n", CC_id, UE_id,
- eNB_dlsch_info[module_idP][CC_id][UE_id].status);
-
- if (eNB_dlsch_info[module_idP][CC_id][UE_id].status ==
- S_DL_SCHEDULED) {
-
- // clear scheduling flag
- eNB_dlsch_info[module_idP][CC_id][UE_id].status =
- S_DL_WAITING;
- rnti = UE_RNTI(module_idP, UE_id);
- if (cc->tdd_Config)
- harq_pid = ((frameP * 10) + subframeP) % 10;
- else
- harq_pid = ((frameP * 10) + subframeP) & 7;
- nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
-
-
-
- /// Synchronizing rballoc with rballoc_sub
- for (i = 0; i < N_RBG; i++) {
- rballoc_sub[i] =
- UE_list->
- UE_template[CC_id][UE_id].rballoc_subband[harq_pid]
- [i];
- }
+ // loop over all allocated UEs and compute frequency allocations for PDSCH
+ int UE_id = -1;
+ uint8_t /* first_rb, */ nb_rb = 3;
+ rnti_t rnti;
+ //unsigned char *vrb_map;
+ uint8_t rballoc_sub[25];
+ //uint8_t number_of_subbands=13;
+
+ //unsigned char round;
+ unsigned char harq_pid;
+ int i;
+ int CC_id;
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+ int N_RBG;
+ int N_RB_DL;
+ COMMON_channels_t *cc;
+
+ start_meas(&eNB->fill_DLSCH_dci);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI, VCD_FUNCTION_IN);
+
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ LOG_D(MAC, "Doing fill DCI for CC_id %d\n", CC_id);
+
+ if (mbsfn_flagP[CC_id] > 0)
+ continue;
+
+ cc = &eNB->common_channels[CC_id];
+ N_RBG = to_rbg(cc->mib->message.dl_Bandwidth);
+ N_RB_DL = to_prb(cc->mib->message.dl_Bandwidth);
+
+ // UE specific DCIs
+ for (UE_id = UE_list->head; UE_id >= 0;
+ UE_id = UE_list->next[UE_id]) {
+ LOG_T(MAC, "CC_id %d, UE_id: %d => status %d\n", CC_id, UE_id,
+ eNB_dlsch_info[module_idP][CC_id][UE_id].status);
+
+ if (eNB_dlsch_info[module_idP][CC_id][UE_id].status == S_DL_SCHEDULED) {
+
+ // clear scheduling flag
+ eNB_dlsch_info[module_idP][CC_id][UE_id].status = S_DL_WAITING;
+ rnti = UE_RNTI(module_idP, UE_id);
+ if (cc->tdd_Config) harq_pid = ((frameP * 10) + subframeP) % 10;
+ else harq_pid = ((frameP * 10) + subframeP) & 7;
+ nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
+
+ /// Synchronizing rballoc with rballoc_sub
+ for (i = 0; i < N_RBG; i++) {
+ rballoc_sub[i] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][i];
+ }
- nfapi_dl_config_request_t *DL_req =
- &RC.mac[module_idP]->DL_req[0];
- nfapi_dl_config_request_pdu_t *dl_config_pdu;
-
- for (i = 0;
- i < DL_req[CC_id].dl_config_request_body.number_pdu;
- i++) {
- dl_config_pdu =
- &DL_req[CC_id].
- dl_config_request_body.dl_config_pdu_list[i];
- if ((dl_config_pdu->pdu_type ==
- NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
- && (dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- rnti == rnti)
- && (dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.dci_format != 1)) {
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.resource_block_coding =
- allocate_prbs_sub(nb_rb, N_RB_DL, N_RBG,
- rballoc_sub);
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.resource_allocation_type = 0;
- } else
- if ((dl_config_pdu->pdu_type ==
- NFAPI_DL_CONFIG_DLSCH_PDU_TYPE)
- && (dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.
- rnti == rnti)
- && (dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.resource_allocation_type ==
- 0)) {
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.resource_block_coding =
- allocate_prbs_sub(nb_rb, N_RB_DL, N_RBG,
- rballoc_sub);
- }
- }
+ nfapi_dl_config_request_t *DL_req = &RC.mac[module_idP]->DL_req[0];
+ nfapi_dl_config_request_pdu_t *dl_config_pdu;
+
+ for (i = 0;
+ i < DL_req[CC_id].dl_config_request_body.number_pdu;
+ i++) {
+ dl_config_pdu = &DL_req[CC_id].dl_config_request_body.dl_config_pdu_list[i];
+ if ((dl_config_pdu->pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
+ && (dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti == rnti)
+ && (dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format != 1)) {
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = allocate_prbs_sub(nb_rb, N_RB_DL, N_RBG,rballoc_sub);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_allocation_type = 0;
+ } else
+ if ((dl_config_pdu->pdu_type == NFAPI_DL_CONFIG_DLSCH_PDU_TYPE)
+ && (dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti == rnti)
+ && (dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type == 0)) {
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding =allocate_prbs_sub(nb_rb, N_RB_DL, N_RBG,rballoc_sub);
}
}
-
+ }
}
- stop_meas(&eNB->fill_DLSCH_dci);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI, VCD_FUNCTION_OUT);
+ }
+
+ stop_meas(&eNB->fill_DLSCH_dci);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI, VCD_FUNCTION_OUT);
}
//------------------------------------------------------------------------------
@@ -1793,37 +1632,35 @@ unsigned char *get_dlsch_sdu(module_id_t module_idP,
//------------------------------------------------------------------------------
{
- int UE_id;
- eNB_MAC_INST *eNB = RC.mac[module_idP];
+ int UE_id;
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
- if (rntiP == SI_RNTI) {
- LOG_D(MAC, "[eNB %d] CC_id %d Frame %d Get DLSCH sdu for BCCH \n",
- module_idP, CC_id, frameP);
+ if (rntiP == SI_RNTI) {
+ LOG_D(MAC, "[eNB %d] CC_id %d Frame %d Get DLSCH sdu for BCCH \n",
+ module_idP, CC_id, frameP);
- return ((unsigned char *) &eNB->common_channels[CC_id].
- BCCH_pdu.payload[0]);
- }
+ return ((unsigned char *) &eNB->common_channels[CC_id].BCCH_pdu.payload[0]);
+ }
- if (rntiP==P_RNTI) {
- LOG_D(MAC,"[eNB %d] CC_id %d Frame %d Get PCH sdu for PCCH \n", module_idP, CC_id, frameP);
+ if (rntiP==P_RNTI) {
+ LOG_D(MAC,"[eNB %d] CC_id %d Frame %d Get PCH sdu for PCCH \n", module_idP, CC_id, frameP);
- return((unsigned char *)&eNB->common_channels[CC_id].PCCH_pdu.payload[0]);
- }
+ return((unsigned char *)&eNB->common_channels[CC_id].PCCH_pdu.payload[0]);
+ }
UE_id = find_UE_id(module_idP,rntiP);
- if (UE_id != -1) {
- LOG_D(MAC,
- "[eNB %d] Frame %d: CC_id %d Get DLSCH sdu for rnti %x => UE_id %d\n",
- module_idP, frameP, CC_id, rntiP, UE_id);
- return ((unsigned char *) &eNB->
- UE_list.DLSCH_pdu[CC_id][TBindex][UE_id].payload[0]);
- } else {
- LOG_E(MAC,
- "[eNB %d] Frame %d: CC_id %d UE with RNTI %x does not exist\n",
- module_idP, frameP, CC_id, rntiP);
- return NULL;
- }
+ if (UE_id != -1) {
+ LOG_D(MAC,
+ "[eNB %d] Frame %d: CC_id %d Get DLSCH sdu for rnti %x => UE_id %d\n",
+ module_idP, frameP, CC_id, rntiP, UE_id);
+ return ((unsigned char *) &eNB->UE_list.DLSCH_pdu[CC_id][TBindex][UE_id].payload[0]);
+ } else {
+ LOG_E(MAC,
+ "[eNB %d] Frame %d: CC_id %d UE with RNTI %x does not exist\n",
+ module_idP, frameP, CC_id, rntiP);
+ return NULL;
+ }
}
@@ -1835,27 +1672,25 @@ update_ul_dci(module_id_t module_idP,
//------------------------------------------------------------------------------
{
- nfapi_hi_dci0_request_t *HI_DCI0_req =
- &RC.mac[module_idP]->HI_DCI0_req[CC_idP];
- nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
- &HI_DCI0_req->hi_dci0_request_body.hi_dci0_pdu_list[0];
- COMMON_channels_t *cc = &RC.mac[module_idP]->common_channels[CC_idP];
- int i;
+ nfapi_hi_dci0_request_t *HI_DCI0_req =
+ &RC.mac[module_idP]->HI_DCI0_req[CC_idP];
+ nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
+ &HI_DCI0_req->hi_dci0_request_body.hi_dci0_pdu_list[0];
+ COMMON_channels_t *cc = &RC.mac[module_idP]->common_channels[CC_idP];
+ int i;
- if (cc->tdd_Config != NULL) { // TDD
- for (i = 0;
- i <
- HI_DCI0_req->hi_dci0_request_body.number_of_dci +
- HI_DCI0_req->hi_dci0_request_body.number_of_dci; i++) {
+ if (cc->tdd_Config != NULL) { // TDD
+ for (i = 0;
+ i <HI_DCI0_req->hi_dci0_request_body.number_of_dci + HI_DCI0_req->hi_dci0_request_body.number_of_dci;
+ i++) {
- if ((hi_dci0_pdu[i].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE) &&
- (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti == rntiP))
- hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.dl_assignment_index =
- (daiP - 1) & 3;
+ if ((hi_dci0_pdu[i].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE) &&
+ (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti == rntiP))
+ hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.dl_assignment_index = (daiP - 1) & 3;
- }
}
+ }
}
@@ -1866,64 +1701,64 @@ set_ue_dai(sub_frame_t subframeP,
UE_list_t * UE_list)
//------------------------------------------------------------------------------
{
- switch (tdd_config) {
- case 0:
- if ((subframeP == 0) || (subframeP == 1) || (subframeP == 3)
- || (subframeP == 5) || (subframeP == 6) || (subframeP == 8)) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ switch (tdd_config) {
+ case 0:
+ if ((subframeP == 0) || (subframeP == 1) || (subframeP == 3)
+ || (subframeP == 5) || (subframeP == 6) || (subframeP == 8)) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- case 1:
- if ((subframeP == 0) || (subframeP == 4) || (subframeP == 5)
- || (subframeP == 9)) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ case 1:
+ if ((subframeP == 0) || (subframeP == 4) || (subframeP == 5)
+ || (subframeP == 9)) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- case 2:
- if ((subframeP == 4) || (subframeP == 5)) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ case 2:
+ if ((subframeP == 4) || (subframeP == 5)) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- case 3:
- if ((subframeP == 5) || (subframeP == 7) || (subframeP == 9)) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ case 3:
+ if ((subframeP == 5) || (subframeP == 7) || (subframeP == 9)) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- case 4:
- if ((subframeP == 0) || (subframeP == 6)) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ case 4:
+ if ((subframeP == 0) || (subframeP == 6)) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- case 5:
- if (subframeP == 9) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ case 5:
+ if (subframeP == 9) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- case 6:
- if ((subframeP == 0) || (subframeP == 1) || (subframeP == 5)
- || (subframeP == 6) || (subframeP == 9)) {
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- }
+ case 6:
+ if ((subframeP == 0) || (subframeP == 1) || (subframeP == 5)
+ || (subframeP == 6) || (subframeP == 9)) {
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ }
- break;
+ break;
- default:
- UE_list->UE_template[CC_id][UE_id].DAI = 0;
- LOG_N(MAC, "unknow TDD config %d\n", tdd_config);
- break;
- }
+ default:
+ UE_list->UE_template[CC_id][UE_id].DAI = 0;
+ LOG_N(MAC, "unknow TDD config %d\n", tdd_config);
+ break;
+ }
}
void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
@@ -1944,22 +1779,22 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
#ifdef FORMAT1C
int gap_index = 0; /* indicate which gap(1st or 2nd) is used (0:1st) */
const int GAP_MAP [9][2] = {
- {-1, 0}, /* N_RB_DL [6-10] -1: |N_RB/2| 0: N/A*/
- {4, 0}, /* N_RB_DL [11] */
- {8, 0}, /* N_RB_DL [12-19] */
- {12, 0}, /* N_RB_DL [20-26] */
- {18, 0}, /* N_RB_DL [27-44] */
- {27, 0}, /* N_RB_DL [45-49] */
- {27, 9}, /* N_RB_DL [50-63] */
- {32, 16}, /* N_RB_DL [64-79] */
- {48, 16} /* N_RB_DL [80-110] */
- };
+ {-1, 0}, /* N_RB_DL [6-10] -1: |N_RB/2| 0: N/A*/
+ {4, 0}, /* N_RB_DL [11] */
+ {8, 0}, /* N_RB_DL [12-19] */
+ {12, 0}, /* N_RB_DL [20-26] */
+ {18, 0}, /* N_RB_DL [27-44] */
+ {27, 0}, /* N_RB_DL [45-49] */
+ {27, 9}, /* N_RB_DL [50-63] */
+ {32, 16}, /* N_RB_DL [64-79] */
+ {48, 16} /* N_RB_DL [80-110] */
+ };
uint8_t n_rb_step = 0;
uint8_t n_gap = 0;
uint8_t n_vrb_dl = 0;
uint8_t Lcrbs = 0;
uint16_t rb_bit = 168; /* RB bit number value is unsure */
- #endif
+#endif
start_meas(&eNB->schedule_pch);
@@ -1973,298 +1808,298 @@ void schedule_PCH(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP)
continue;
}
if (frameP % UE_PF_PO[CC_id][i].T == UE_PF_PO[CC_id][i].PF_min && subframeP == UE_PF_PO[CC_id][i].PO) {
- pcch_sdu_length = mac_rrc_data_req(module_idP,
+ pcch_sdu_length = mac_rrc_data_req(module_idP,
CC_id,
frameP,
PCCH,1,
&cc->PCCH_pdu.payload[0],
i); // used for ue index
- if (pcch_sdu_length == 0) {
- LOG_D(MAC,"[eNB %d] Frame %d subframe %d: PCCH not active(size = 0 byte)\n", module_idP,frameP, subframeP);
- continue;
- }
- LOG_D(MAC,"[eNB %d] Frame %d subframe %d: PCCH->PCH CC_id %d UE_id %d, Received %d bytes \n", module_idP, frameP, subframeP, CC_id,i, pcch_sdu_length);
+ if (pcch_sdu_length == 0) {
+ LOG_D(MAC,"[eNB %d] Frame %d subframe %d: PCCH not active(size = 0 byte)\n", module_idP,frameP, subframeP);
+ continue;
+ }
+ LOG_D(MAC,"[eNB %d] Frame %d subframe %d: PCCH->PCH CC_id %d UE_id %d, Received %d bytes \n", module_idP, frameP, subframeP, CC_id,i, pcch_sdu_length);
#ifdef FORMAT1C
- //NO SIB
- if ((subframeP == 1 || subframeP == 2 || subframeP == 4 || subframeP == 6 || subframeP == 9) ||
- (subframeP == 5 && ((frameP % 2) != 0 && (frameP % 8) != 1))) {
- switch (n_rb_dl) {
+ //NO SIB
+ if ((subframeP == 1 || subframeP == 2 || subframeP == 4 || subframeP == 6 || subframeP == 9) ||
+ (subframeP == 5 && ((frameP % 2) != 0 && (frameP % 8) != 1))) {
+ switch (n_rb_dl) {
#if 0
- case 6:
- n_gap = n_rb_dl/2; /* expect: 3 */
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap));; /* expect: 6 */
- first_rb = 0;
- break;
- case 15:
- n_gap = GAP_MAP[2][0]; /* expect: 8 */
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 14 */
- first_rb = 6;
- break;
+ case 6:
+ n_gap = n_rb_dl/2; /* expect: 3 */
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap));; /* expect: 6 */
+ first_rb = 0;
+ break;
+ case 15:
+ n_gap = GAP_MAP[2][0]; /* expect: 8 */
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 14 */
+ first_rb = 6;
+ break;
#endif
- case 25:
- n_gap = GAP_MAP[3][0]; /* expect: 12 */
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 24 */
- first_rb = 10;
- break;
- case 50:
- n_gap = GAP_MAP[6][gap_index]; /* expect: 27 or 9 */
- if (gap_index > 0) {
- n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* 36 */
- } else {
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 46 */
- }
- first_rb = 24;
- break;
- case 100:
- n_gap = GAP_MAP[8][gap_index]; /* expect: 48 or 16 */
- if (gap_index > 0) {
- n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* expect: 96 */
- } else {
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 96 */
- }
- first_rb = 48;
- break;
- }
- } else if (subframeP == 5 && ((frameP % 2) == 0 || (frameP % 8) == 1)) { // SIB + paging
- switch (n_rb_dl) {
+ case 25:
+ n_gap = GAP_MAP[3][0]; /* expect: 12 */
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 24 */
+ first_rb = 10;
+ break;
+ case 50:
+ n_gap = GAP_MAP[6][gap_index]; /* expect: 27 or 9 */
+ if (gap_index > 0) {
+ n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* 36 */
+ } else {
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 46 */
+ }
+ first_rb = 24;
+ break;
+ case 100:
+ n_gap = GAP_MAP[8][gap_index]; /* expect: 48 or 16 */
+ if (gap_index > 0) {
+ n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* expect: 96 */
+ } else {
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 96 */
+ }
+ first_rb = 48;
+ break;
+ }
+ } else if (subframeP == 5 && ((frameP % 2) == 0 || (frameP % 8) == 1)) { // SIB + paging
+ switch (n_rb_dl) {
#if 0
- case 6:
- n_gap = n_rb_dl/2; /* expect: 3 */
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap));; /* expect: 6 */
- first_rb = 0;
- break;
- case 15:
- n_gap = GAP_MAP[2][0]; /* expect: 8 */
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 14 */
- first_rb = 10;
- break;
+ case 6:
+ n_gap = n_rb_dl/2; /* expect: 3 */
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap));; /* expect: 6 */
+ first_rb = 0;
+ break;
+ case 15:
+ n_gap = GAP_MAP[2][0]; /* expect: 8 */
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 14 */
+ first_rb = 10;
+ break;
#endif
- case 25:
- n_gap = GAP_MAP[3][0]; /* expect: 12 */
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 24 */
- first_rb = 14;
- break;
- case 50:
- n_gap = GAP_MAP[6][gap_index]; /* expect: 27 or 9 */
- if (gap_index > 0) {
- n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* 36 */
- } else {
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 46 */
- }
- first_rb = 28;
- break;
- case 100:
- n_gap = GAP_MAP[8][gap_index]; /* expect: 48 or 16 */
- if (gap_index > 0) {
- n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* expect: 96 */
- } else {
- n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 96 */
- }
- first_rb = 52;
- break;
- }
- }
- /* Get MCS for length of PCH */
- if (pcch_sdu_length <= TBStable1C[0]) {
- mcs=0;
- } else if (pcch_sdu_length <= TBStable1C[1]) {
- mcs=1;
- } else if (pcch_sdu_length <= TBStable1C[2]) {
- mcs=2;
- } else if (pcch_sdu_length <= TBStable1C[3]) {
- mcs=3;
- } else if (pcch_sdu_length <= TBStable1C[4]) {
- mcs=4;
- } else if (pcch_sdu_length <= TBStable1C[5]) {
- mcs=5;
- } else if (pcch_sdu_length <= TBStable1C[6]) {
- mcs=6;
- } else if (pcch_sdu_length <= TBStable1C[7]) {
- mcs=7;
- } else if (pcch_sdu_length <= TBStable1C[8]) {
- mcs=8;
- } else if (pcch_sdu_length <= TBStable1C[9]) {
- mcs=9;
- } else {
- /* unexpected: pcch sdb size is over max value*/
- LOG_E(MAC,"[eNB %d] Frame %d : PCCH->PCH CC_id %d, Received %d bytes is over max length(256) \n",
- module_idP, frameP,CC_id, pcch_sdu_length);
- return;
- }
- rb_num = TBStable1C[mcs] / rb_bit + ( (TBStable1C[mcs] % rb_bit == 0)? 0: 1) + 1;
- /* calculate N_RB_STEP and Lcrbs */
- if (n_rb_dl < 50) {
- n_rb_step = 2;
- Lcrbs = rb_num / 2 + ((rb_num % 2 == 0) ? 0:2);
- } else {
- n_rb_step = 4;
- Lcrbs = rb_num / 4 + ((rb_num % 4 == 0) ? 0:4);
- }
- for(i = 0;i < Lcrbs ;i++){
- vrb_map[first_rb+i] = 1;
- }
+ case 25:
+ n_gap = GAP_MAP[3][0]; /* expect: 12 */
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 24 */
+ first_rb = 14;
+ break;
+ case 50:
+ n_gap = GAP_MAP[6][gap_index]; /* expect: 27 or 9 */
+ if (gap_index > 0) {
+ n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* 36 */
+ } else {
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 46 */
+ }
+ first_rb = 28;
+ break;
+ case 100:
+ n_gap = GAP_MAP[8][gap_index]; /* expect: 48 or 16 */
+ if (gap_index > 0) {
+ n_vrb_dl = (n_rb_dl / (2*n_gap)) * (2*n_gap); /* expect: 96 */
+ } else {
+ n_vrb_dl = 2*((n_gap < (n_rb_dl - n_gap)) ? n_gap : (n_rb_dl - n_gap)); /* expect: 96 */
+ }
+ first_rb = 52;
+ break;
+ }
+ }
+ /* Get MCS for length of PCH */
+ if (pcch_sdu_length <= TBStable1C[0]) {
+ mcs=0;
+ } else if (pcch_sdu_length <= TBStable1C[1]) {
+ mcs=1;
+ } else if (pcch_sdu_length <= TBStable1C[2]) {
+ mcs=2;
+ } else if (pcch_sdu_length <= TBStable1C[3]) {
+ mcs=3;
+ } else if (pcch_sdu_length <= TBStable1C[4]) {
+ mcs=4;
+ } else if (pcch_sdu_length <= TBStable1C[5]) {
+ mcs=5;
+ } else if (pcch_sdu_length <= TBStable1C[6]) {
+ mcs=6;
+ } else if (pcch_sdu_length <= TBStable1C[7]) {
+ mcs=7;
+ } else if (pcch_sdu_length <= TBStable1C[8]) {
+ mcs=8;
+ } else if (pcch_sdu_length <= TBStable1C[9]) {
+ mcs=9;
+ } else {
+ /* unexpected: pcch sdb size is over max value*/
+ LOG_E(MAC,"[eNB %d] Frame %d : PCCH->PCH CC_id %d, Received %d bytes is over max length(256) \n",
+ module_idP, frameP,CC_id, pcch_sdu_length);
+ return;
+ }
+ rb_num = TBStable1C[mcs] / rb_bit + ( (TBStable1C[mcs] % rb_bit == 0)? 0: 1) + 1;
+ /* calculate N_RB_STEP and Lcrbs */
+ if (n_rb_dl < 50) {
+ n_rb_step = 2;
+ Lcrbs = rb_num / 2 + ((rb_num % 2 == 0) ? 0:2);
+ } else {
+ n_rb_step = 4;
+ Lcrbs = rb_num / 4 + ((rb_num % 4 == 0) ? 0:4);
+ }
+ for(i = 0;i < Lcrbs ;i++){
+ vrb_map[first_rb+i] = 1;
+ }
#else
- //NO SIB
- if ((subframeP == 1 || subframeP == 2 || subframeP == 4 || subframeP == 6 || subframeP == 9) ||
- (subframeP == 5 && ((frameP % 2) != 0 && (frameP % 8) != 1))) {
- switch (n_rb_dl) {
- case 25:
- first_rb = 10;
- break;
- case 50:
- first_rb = 24;
- break;
- case 100:
- first_rb = 48;
- break;
- }
- } else if (subframeP == 5 && ((frameP % 2) == 0 || (frameP % 8) == 1)) { // SIB + paging
- switch (n_rb_dl) {
- case 25:
- first_rb = 14;
- break;
- case 50:
- first_rb = 28;
- break;
- case 100:
- first_rb = 52;
- break;
- }
- }
+ //NO SIB
+ if ((subframeP == 1 || subframeP == 2 || subframeP == 4 || subframeP == 6 || subframeP == 9) ||
+ (subframeP == 5 && ((frameP % 2) != 0 && (frameP % 8) != 1))) {
+ switch (n_rb_dl) {
+ case 25:
+ first_rb = 10;
+ break;
+ case 50:
+ first_rb = 24;
+ break;
+ case 100:
+ first_rb = 48;
+ break;
+ }
+ } else if (subframeP == 5 && ((frameP % 2) == 0 || (frameP % 8) == 1)) { // SIB + paging
+ switch (n_rb_dl) {
+ case 25:
+ first_rb = 14;
+ break;
+ case 50:
+ first_rb = 28;
+ break;
+ case 100:
+ first_rb = 52;
+ break;
+ }
+ }
- vrb_map[first_rb] = 1;
- vrb_map[first_rb+1] = 1;
- vrb_map[first_rb+2] = 1;
- vrb_map[first_rb+3] = 1;
- /* Get MCS for length of PCH */
- if (pcch_sdu_length <= get_TBS_DL(0,3)) {
- mcs=0;
- } else if (pcch_sdu_length <= get_TBS_DL(1,3)) {
- mcs=1;
- } else if (pcch_sdu_length <= get_TBS_DL(2,3)) {
- mcs=2;
- } else if (pcch_sdu_length <= get_TBS_DL(3,3)) {
- mcs=3;
- } else if (pcch_sdu_length <= get_TBS_DL(4,3)) {
- mcs=4;
- } else if (pcch_sdu_length <= get_TBS_DL(5,3)) {
- mcs=5;
- } else if (pcch_sdu_length <= get_TBS_DL(6,3)) {
- mcs=6;
- } else if (pcch_sdu_length <= get_TBS_DL(7,3)) {
- mcs=7;
- } else if (pcch_sdu_length <= get_TBS_DL(8,3)) {
- mcs=8;
- } else if (pcch_sdu_length <= get_TBS_DL(9,3)) {
- mcs=9;
- }
+ vrb_map[first_rb] = 1;
+ vrb_map[first_rb+1] = 1;
+ vrb_map[first_rb+2] = 1;
+ vrb_map[first_rb+3] = 1;
+ /* Get MCS for length of PCH */
+ if (pcch_sdu_length <= get_TBS_DL(0,3)) {
+ mcs=0;
+ } else if (pcch_sdu_length <= get_TBS_DL(1,3)) {
+ mcs=1;
+ } else if (pcch_sdu_length <= get_TBS_DL(2,3)) {
+ mcs=2;
+ } else if (pcch_sdu_length <= get_TBS_DL(3,3)) {
+ mcs=3;
+ } else if (pcch_sdu_length <= get_TBS_DL(4,3)) {
+ mcs=4;
+ } else if (pcch_sdu_length <= get_TBS_DL(5,3)) {
+ mcs=5;
+ } else if (pcch_sdu_length <= get_TBS_DL(6,3)) {
+ mcs=6;
+ } else if (pcch_sdu_length <= get_TBS_DL(7,3)) {
+ mcs=7;
+ } else if (pcch_sdu_length <= get_TBS_DL(8,3)) {
+ mcs=8;
+ } else if (pcch_sdu_length <= get_TBS_DL(9,3)) {
+ mcs=9;
+ }
#endif
- dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
- memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
#ifdef FORMAT1C
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1C;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = getRIV(n_vrb_dl/n_rb_step, first_rb/n_rb_step, Lcrbs/n_rb_step);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.ngap = n_gap;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1C;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = getRIV(n_vrb_dl/n_rb_step, first_rb/n_rb_step, Lcrbs/n_rb_step);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.ngap = n_gap;
#else
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = 0;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // no TPC
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = 1;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = 1;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = getRIV(n_rb_dl,first_rb,4);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = 0;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = 1; // no TPC
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = 1;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = 1;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = getRIV(n_rb_dl,first_rb,4);
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
#endif
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = 4;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = 0xFFFE; // P-RNTI
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 2; // P-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
-
- // Rel10 fields
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = 3;
- // Rel13 fields
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = 0; // regular UE
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not BR
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = 0xFFFF;
-
- if (!CCE_allocation_infeasible(module_idP, CC_id, 0, subframeP, dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, P_RNTI)) {
- LOG_D(MAC,"Frame %d: Subframe %d : Adding common DCI for P_RNTI\n", frameP,subframeP);
- dl_req->number_dci++;
- dl_req->number_pdu++;
- dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
- memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_dl_config_dlsch_pdu));
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = eNB->pdu_index[CC_id];
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = 0xFFFE;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = 4;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = 0xFFFE; // P-RNTI
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 2; // P-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
+
+ // Rel10 fields
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel10.pdsch_start = 3;
+ // Rel13 fields
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type = 0; // regular UE
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type = 2; // not BR
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io = 0xFFFF;
+
+ if (!CCE_allocation_infeasible(module_idP, CC_id, 0, subframeP, dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, P_RNTI)) {
+ LOG_D(MAC,"Frame %d: Subframe %d : Adding common DCI for P_RNTI\n", frameP,subframeP);
+ dl_req->number_dci++;
+ dl_req->number_pdu++;
+ dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = eNB->pdu_index[CC_id];
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = 0xFFFE;
#ifdef FORMAT1C
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 3; // format 1C
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(n_vrb_dl/n_rb_step, first_rb/n_rb_step, Lcrbs/n_rb_step);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 3; // format 1C
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(n_vrb_dl/n_rb_step, first_rb/n_rb_step, Lcrbs/n_rb_step);
#else
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(n_rb_dl,first_rb,4);
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = 2; // format 1A/1B/1D
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = getRIV(n_rb_dl,first_rb,4);
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0; // localized
#endif
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1;// first block
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB==1 ) ? 0 : 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
- // dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB==1 ) ? 1 : 2;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
- // dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
- dl_req->number_pdu++;
-
- eNB->TX_req[CC_id].sfn_sf = (frameP<<4)+subframeP;
- TX_req = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus];
- TX_req->pdu_length = pcch_sdu_length;
- TX_req->pdu_index = eNB->pdu_index[CC_id]++;
- TX_req->num_segments = 1;
- TX_req->segments[0].segment_length = pcch_sdu_length;
- TX_req->segments[0].segment_data = cc[CC_id].PCCH_pdu.payload;
- eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
- } else {
- LOG_E(MAC,"[eNB %d] CCid %d Frame %d, subframe %d : Cannot add DCI 1A/1C for Paging\n",module_idP, CC_id, frameP, subframeP);
- continue;
- }
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = 2; //QPSK
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = 1;// first block
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = (cc->p_eNB==1 ) ? 0 : 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = 1;
+ // dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = ;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = 4; // 0 dB
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = 0;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = (cc->p_eNB==1 ) ? 1 : 2;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = 1;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = 1;
+ // dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector = ;
+ dl_req->number_pdu++;
+
+ eNB->TX_req[CC_id].sfn_sf = (frameP<<4)+subframeP;
+ TX_req = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus];
+ TX_req->pdu_length = pcch_sdu_length;
+ TX_req->pdu_index = eNB->pdu_index[CC_id]++;
+ TX_req->num_segments = 1;
+ TX_req->segments[0].segment_length = pcch_sdu_length;
+ TX_req->segments[0].segment_data = cc[CC_id].PCCH_pdu.payload;
+ eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
+ } else {
+ LOG_E(MAC,"[eNB %d] CCid %d Frame %d, subframe %d : Cannot add DCI 1A/1C for Paging\n",module_idP, CC_id, frameP, subframeP);
+ continue;
+ }
- if (opt_enabled == 1) {
- trace_pdu(1,
- &eNB->common_channels[CC_id].PCCH_pdu.payload[0],
- pcch_sdu_length,
- 0xffff,
- PCCH,
- P_RNTI,
- eNB->frame,
- eNB->subframe,
- 0,
- 0);
- LOG_D(OPT,"[eNB %d][PCH] Frame %d trace pdu for CC_id %d rnti %x with size %d\n",
- module_idP, frameP, CC_id, 0xffff, pcch_sdu_length);
+ if (opt_enabled == 1) {
+ trace_pdu(1,
+ &eNB->common_channels[CC_id].PCCH_pdu.payload[0],
+ pcch_sdu_length,
+ 0xffff,
+ PCCH,
+ P_RNTI,
+ eNB->frame,
+ eNB->subframe,
+ 0,
+ 0);
+ LOG_D(OPT,"[eNB %d][PCH] Frame %d trace pdu for CC_id %d rnti %x with size %d\n",
+ module_idP, frameP, CC_id, 0xffff, pcch_sdu_length);
+ }
+ eNB->eNB_stats[CC_id].total_num_pcch_pdu+=1;
+ eNB->eNB_stats[CC_id].pcch_buffer=pcch_sdu_length;
+ eNB->eNB_stats[CC_id].total_pcch_buffer+=pcch_sdu_length;
+ eNB->eNB_stats[CC_id].pcch_mcs=mcs;
+ //paging first_rb log
+ LOG_D(MAC,"[eNB %d] Frame %d subframe %d PCH: paging_ue_index %d pcch_sdu_length %d mcs %d first_rb %d\n",
+ module_idP, frameP, subframeP, UE_PF_PO[CC_id][i].ue_index_value, pcch_sdu_length, mcs, first_rb);
+
+ pthread_mutex_lock(&ue_pf_po_mutex);
+ memset(&UE_PF_PO[CC_id][i], 0, sizeof(UE_PF_PO_t));
+ pthread_mutex_unlock(&ue_pf_po_mutex);
}
- eNB->eNB_stats[CC_id].total_num_pcch_pdu+=1;
- eNB->eNB_stats[CC_id].pcch_buffer=pcch_sdu_length;
- eNB->eNB_stats[CC_id].total_pcch_buffer+=pcch_sdu_length;
- eNB->eNB_stats[CC_id].pcch_mcs=mcs;
- //paging first_rb log
- LOG_D(MAC,"[eNB %d] Frame %d subframe %d PCH: paging_ue_index %d pcch_sdu_length %d mcs %d first_rb %d\n",
- module_idP, frameP, subframeP, UE_PF_PO[CC_id][i].ue_index_value, pcch_sdu_length, mcs, first_rb);
-
- pthread_mutex_lock(&ue_pf_po_mutex);
- memset(&UE_PF_PO[CC_id][i], 0, sizeof(UE_PF_PO_t));
- pthread_mutex_unlock(&ue_pf_po_mutex);
- }
}
}
/* this might be misleading when pcch is inactive */
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 721e345ea5054393ab29b54a7872d255e9a7ed9c..046a823a870691b8c9bec995dfdbb5f5cb4018fa 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -65,210 +65,206 @@ extern int n_active_slices;
int choose(int n, int k)
{
- int res = 1;
- int res2 = 1;
- int i;
+ int res = 1;
+ int res2 = 1;
+ int i;
- if (k > n)
- return (0);
- if (n == k)
- return (1);
+ if (k > n)
+ return (0);
+ if (n == k)
+ return (1);
- for (i = n; i > k; i--)
- res *= i;
- for (i = 2; i <= (n - k); i++)
- res2 *= i;
+ for (i = n; i > k; i--)
+ res *= i;
+ for (i = 2; i <= (n - k); i++)
+ res2 *= i;
- return (res / res2);
+ return (res / res2);
}
// Patented algorithm from Yang et al, US Patent 2009, "Channel Quality Indexing and Reverse Indexing"
void reverse_index(int N, int M, int r, int *v)
{
- int BaseValue = 0;
- int IncreaseValue, ThresholdValue;
- int sumV;
- int i;
-
- r = choose(N, M) - 1 - r;
- memset((void *) v, 0, M * sizeof(int));
-
- sumV = 0;
- i = M;
- while (i > 0 && r > 0) {
- IncreaseValue = choose(N - M + 1 - sumV - v[i - 1] + i - 2, i - 1);
- ThresholdValue = BaseValue + IncreaseValue;
- if (r >= ThresholdValue) {
- v[i - 1]++;
- BaseValue = ThresholdValue;
- } else {
- r = r - BaseValue;
- sumV += v[i - 1];
- i--;
- BaseValue = 0;
- }
+ int BaseValue = 0;
+ int IncreaseValue, ThresholdValue;
+ int sumV;
+ int i;
+
+ r = choose(N, M) - 1 - r;
+ memset((void *) v, 0, M * sizeof(int));
+
+ sumV = 0;
+ i = M;
+ while (i > 0 && r > 0) {
+ IncreaseValue = choose(N - M + 1 - sumV - v[i - 1] + i - 2, i - 1);
+ ThresholdValue = BaseValue + IncreaseValue;
+ if (r >= ThresholdValue) {
+ v[i - 1]++;
+ BaseValue = ThresholdValue;
+ } else {
+ r = r - BaseValue;
+ sumV += v[i - 1];
+ i--;
+ BaseValue = 0;
}
+ }
}
int to_prb(int dl_Bandwidth)
{
- int prbmap[6] = { 6, 15, 25, 50, 75, 100 };
+ int prbmap[6] = { 6, 15, 25, 50, 75, 100 };
- AssertFatal(dl_Bandwidth < 6, "dl_Bandwidth is 0..5\n");
- return (prbmap[dl_Bandwidth]);
+ AssertFatal(dl_Bandwidth < 6, "dl_Bandwidth is 0..5\n");
+ return (prbmap[dl_Bandwidth]);
}
int to_rbg(int dl_Bandwidth)
{
- int rbgmap[6] = { 6, 8, 13, 17, 19, 25 };
+ int rbgmap[6] = { 6, 8, 13, 17, 19, 25 };
- AssertFatal(dl_Bandwidth < 6, "dl_Bandwidth is 0..5\n");
- return (rbgmap[dl_Bandwidth]);
+ AssertFatal(dl_Bandwidth < 6, "dl_Bandwidth is 0..5\n");
+ return (rbgmap[dl_Bandwidth]);
}
int get_phich_resource_times6(COMMON_channels_t * cc)
{
- int phichmap[4] = { 1, 3, 6, 12 };
- AssertFatal(cc != NULL, "cc is null\n");
- AssertFatal(cc->mib != NULL, "cc->mib is null\n");
- AssertFatal((cc->mib->message.phich_Config.phich_Resource >= 0) &&
- (cc->mib->message.phich_Config.phich_Resource < 4),
- "phich_Resource %d not in 0..3\n",
- (int) cc->mib->message.phich_Config.phich_Resource);
-
- return (phichmap[cc->mib->message.phich_Config.phich_Resource]);
+ int phichmap[4] = { 1, 3, 6, 12 };
+ AssertFatal(cc != NULL, "cc is null\n");
+ AssertFatal(cc->mib != NULL, "cc->mib is null\n");
+ AssertFatal((cc->mib->message.phich_Config.phich_Resource >= 0) &&
+ (cc->mib->message.phich_Config.phich_Resource < 4),
+ "phich_Resource %d not in 0..3\n",
+ (int) cc->mib->message.phich_Config.phich_Resource);
+
+ return (phichmap[cc->mib->message.phich_Config.phich_Resource]);
}
uint16_t mac_computeRIV(uint16_t N_RB_DL, uint16_t RBstart, uint16_t Lcrbs)
{
- uint16_t RIV;
+ uint16_t RIV;
- if (Lcrbs <= (1 + (N_RB_DL >> 1)))
- RIV = (N_RB_DL * (Lcrbs - 1)) + RBstart;
- else
- RIV = (N_RB_DL * (N_RB_DL + 1 - Lcrbs)) + (N_RB_DL - 1 - RBstart);
+ if (Lcrbs <= (1 + (N_RB_DL >> 1))) RIV = (N_RB_DL * (Lcrbs - 1)) + RBstart;
+ else RIV = (N_RB_DL * (N_RB_DL + 1 - Lcrbs)) + (N_RB_DL - 1 - RBstart);
- return (RIV);
+ return (RIV);
}
uint8_t getQm(uint8_t mcs)
{
- if (mcs < 10)
- return (2);
- else if (mcs < 17)
- return (4);
- else
- return (6);
+ if (mcs < 10) return (2);
+ else if (mcs < 17) return (4);
+ else return (6);
}
void
-get_Msg3alloc(COMMON_channels_t * cc,
- sub_frame_t current_subframe,
- frame_t current_frame, frame_t * frame,
- sub_frame_t * subframe)
+get_Msg3alloc(COMMON_channels_t *cc,
+ sub_frame_t current_subframe,
+ frame_t current_frame,
+ frame_t *frame,
+ sub_frame_t *subframe)
{
- // Fill in other TDD Configuration!!!!
+ // Fill in other TDD Configuration!!!!
- if (cc->tdd_Config == NULL) { // FDD
- *subframe = current_subframe + 6;
+ if (cc->tdd_Config == NULL) { // FDD
+ *subframe = current_subframe + 6;
- if (*subframe > 9) {
- *subframe = *subframe - 10;
- *frame = (current_frame + 1) & 1023;
- } else {
- *frame = current_frame;
- }
- } else { // TDD
- if (cc->tdd_Config->subframeAssignment == 1) {
- switch (current_subframe) {
-
- case 0:
- *subframe = 7;
- *frame = current_frame;
- break;
-
- case 4:
- *subframe = 2;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 5:
- *subframe = 2;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 9:
- *subframe = 7;
- *frame = (current_frame + 1) & 1023;
- break;
- }
- } else if (cc->tdd_Config->subframeAssignment == 3) {
- switch (current_subframe) {
-
- case 0:
- case 5:
- case 6:
- *subframe = 2;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 7:
- *subframe = 3;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 8:
- *subframe = 4;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 9:
- *subframe = 2;
- *frame = (current_frame + 2) & 1023;
- break;
- }
- } else if (cc->tdd_Config->subframeAssignment == 4) {
- switch (current_subframe) {
-
- case 0:
- case 4:
- case 5:
- case 6:
- *subframe = 2;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 7:
- *subframe = 3;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 8:
- case 9:
- *subframe = 2;
- *frame = (current_frame + 2) & 1023;
- break;
- }
- } else if (cc->tdd_Config->subframeAssignment == 5) {
- switch (current_subframe) {
-
- case 0:
- case 4:
- case 5:
- case 6:
- *subframe = 2;
- *frame = (current_frame + 1) & 1023;
- break;
-
- case 7:
- case 8:
- case 9:
- *subframe = 2;
- *frame = (current_frame + 2) & 1023;
- break;
- }
- }
+ if (*subframe > 9) {
+ *subframe = *subframe - 10;
+ *frame = (current_frame + 1) & 1023;
+ } else {
+ *frame = current_frame;
+ }
+ } else { // TDD
+ if (cc->tdd_Config->subframeAssignment == 1) {
+ switch (current_subframe) {
+
+ case 0:
+ *subframe = 7;
+ *frame = current_frame;
+ break;
+
+ case 4:
+ *subframe = 2;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 5:
+ *subframe = 2;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 9:
+ *subframe = 7;
+ *frame = (current_frame + 1) & 1023;
+ break;
+ }
+ } else if (cc->tdd_Config->subframeAssignment == 3) {
+ switch (current_subframe) {
+
+ case 0:
+ case 5:
+ case 6:
+ *subframe = 2;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 7:
+ *subframe = 3;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 8:
+ *subframe = 4;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 9:
+ *subframe = 2;
+ *frame = (current_frame + 2) & 1023;
+ break;
+ }
+ } else if (cc->tdd_Config->subframeAssignment == 4) {
+ switch (current_subframe) {
+
+ case 0:
+ case 4:
+ case 5:
+ case 6:
+ *subframe = 2;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 7:
+ *subframe = 3;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 8:
+ case 9:
+ *subframe = 2;
+ *frame = (current_frame + 2) & 1023;
+ break;
+ }
+ } else if (cc->tdd_Config->subframeAssignment == 5) {
+ switch (current_subframe) {
+
+ case 0:
+ case 4:
+ case 5:
+ case 6:
+ *subframe = 2;
+ *frame = (current_frame + 1) & 1023;
+ break;
+
+ case 7:
+ case 8:
+ case 9:
+ *subframe = 2;
+ *frame = (current_frame + 2) & 1023;
+ break;
+ }
}
+ }
}
@@ -279,466 +275,445 @@ get_Msg3allocret(COMMON_channels_t * cc,
frame_t current_frame,
frame_t * frame, sub_frame_t * subframe)
{
- if (cc->tdd_Config == NULL) { //FDD
- /* always retransmit in n+8 */
- *subframe = current_subframe + 8;
+ if (cc->tdd_Config == NULL) { //FDD
+ /* always retransmit in n+8 */
+ *subframe = current_subframe + 8;
- if (*subframe > 9) {
- *subframe = *subframe - 10;
- *frame = (current_frame + 1) & 1023;
- } else {
- *frame = current_frame;
- }
+ if (*subframe > 9) {
+ *subframe = *subframe - 10;
+ *frame = (current_frame + 1) & 1023;
} else {
- if (cc->tdd_Config->subframeAssignment == 1) {
- // original PUSCH in 2, PHICH in 6 (S), ret in 2
- // original PUSCH in 3, PHICH in 9, ret in 3
- // original PUSCH in 7, PHICH in 1 (S), ret in 7
- // original PUSCH in 8, PHICH in 4, ret in 8
- *frame = (current_frame + 1) & 1023;
- } else if (cc->tdd_Config->subframeAssignment == 3) {
- // original PUSCH in 2, PHICH in 8, ret in 2 next frame
- // original PUSCH in 3, PHICH in 9, ret in 3 next frame
- // original PUSCH in 4, PHICH in 0, ret in 4 next frame
- *frame = (current_frame + 1) & 1023;
- } else if (cc->tdd_Config->subframeAssignment == 4) {
- // original PUSCH in 2, PHICH in 8, ret in 2 next frame
- // original PUSCH in 3, PHICH in 9, ret in 3 next frame
- *frame = (current_frame + 1) & 1023;
- } else if (cc->tdd_Config->subframeAssignment == 5) {
- // original PUSCH in 2, PHICH in 8, ret in 2 next frame
- *frame = (current_frame + 1) & 1023;
- }
+ *frame = current_frame;
}
+ } else {
+ if (cc->tdd_Config->subframeAssignment == 1) {
+ // original PUSCH in 2, PHICH in 6 (S), ret in 2
+ // original PUSCH in 3, PHICH in 9, ret in 3
+ // original PUSCH in 7, PHICH in 1 (S), ret in 7
+ // original PUSCH in 8, PHICH in 4, ret in 8
+ *frame = (current_frame + 1) & 1023;
+ } else if (cc->tdd_Config->subframeAssignment == 3) {
+ // original PUSCH in 2, PHICH in 8, ret in 2 next frame
+ // original PUSCH in 3, PHICH in 9, ret in 3 next frame
+ // original PUSCH in 4, PHICH in 0, ret in 4 next frame
+ *frame = (current_frame + 1) & 1023;
+ } else if (cc->tdd_Config->subframeAssignment == 4) {
+ // original PUSCH in 2, PHICH in 8, ret in 2 next frame
+ // original PUSCH in 3, PHICH in 9, ret in 3 next frame
+ *frame = (current_frame + 1) & 1023;
+ } else if (cc->tdd_Config->subframeAssignment == 5) {
+ // original PUSCH in 2, PHICH in 8, ret in 2 next frame
+ *frame = (current_frame + 1) & 1023;
+ }
+ }
}
uint8_t
subframe2harqpid(COMMON_channels_t * cc, frame_t frame,
sub_frame_t subframe)
{
- uint8_t ret = 255;
-
- AssertFatal(cc != NULL, "cc is null\n");
+ uint8_t ret = 255;
- if (cc->tdd_Config == NULL) { // FDD
- ret = (((frame << 1) + subframe) & 7);
- } else {
- switch (cc->tdd_Config->subframeAssignment) {
- case 1:
- if ((subframe == 2) ||
- (subframe == 3) || (subframe == 7) || (subframe == 8))
- switch (subframe) {
- case 2:
- case 3:
- ret = (subframe - 2);
- break;
-
- case 7:
- case 8:
- ret = (subframe - 5);
- break;
-
- default:
- AssertFatal(1 == 0,
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframe,
- (int) cc->tdd_Config->subframeAssignment);
- break;
- }
-
- break;
+ AssertFatal(cc != NULL, "cc is null\n");
+ if (cc->tdd_Config == NULL) { // FDD
+ ret = (((frame << 1) + subframe) & 7);
+ } else {
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 1:
+ if ((subframe == 2) ||
+ (subframe == 3) || (subframe == 7) || (subframe == 8))
+ switch (subframe) {
case 2:
- AssertFatal((subframe == 2) || (subframe == 7),
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframe,
- (int) cc->tdd_Config->subframeAssignment);
-
- ret = (subframe / 7);
- break;
-
case 3:
- AssertFatal((subframe > 1) && (subframe < 5),
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframe,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframe - 2);
- break;
-
- case 4:
- AssertFatal((subframe > 1) && (subframe < 4),
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframe,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframe - 2);
- break;
-
- case 5:
- AssertFatal(subframe == 2,
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframe,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframe - 2);
- break;
-
+ ret = (subframe - 2);
+ break;
+ case 7:
+ case 8:
+ ret = (subframe - 5);
+ break;
default:
- AssertFatal(1 == 0,
- "subframe2_harq_pid, Unsupported TDD mode %d\n",
- (int) cc->tdd_Config->subframeAssignment);
+ AssertFatal(1 == 0,
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframe,
+ (int) cc->tdd_Config->subframeAssignment);
+ break;
}
+
+ break;
+
+ case 2:
+ AssertFatal((subframe == 2) || (subframe == 7),
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframe,
+ (int) cc->tdd_Config->subframeAssignment);
+
+ ret = (subframe / 7);
+ break;
+
+ case 3:
+ AssertFatal((subframe > 1) && (subframe < 5),
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframe,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframe - 2);
+ break;
+
+ case 4:
+ AssertFatal((subframe > 1) && (subframe < 4),
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframe,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframe - 2);
+ break;
+
+ case 5:
+ AssertFatal(subframe == 2,
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframe,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframe - 2);
+ break;
+
+ default:
+ AssertFatal(1 == 0,
+ "subframe2_harq_pid, Unsupported TDD mode %d\n",
+ (int) cc->tdd_Config->subframeAssignment);
}
- return ret;
+ }
+ return ret;
}
uint8_t
get_Msg3harqpid(COMMON_channels_t * cc,
frame_t frame, sub_frame_t current_subframe)
{
- uint8_t ul_subframe = 0;
- uint32_t ul_frame = 0;
-
- if (cc->tdd_Config == NULL) { // FDD
- ul_subframe =
- (current_subframe >
- 3) ? (current_subframe - 4) : (current_subframe + 6);
- ul_frame = (current_subframe > 3) ? ((frame + 1) & 1023) : frame;
- } else {
- switch (cc->tdd_Config->subframeAssignment) {
- case 1:
- switch (current_subframe) {
- case 9:
- case 0:
- ul_subframe = 7;
- break;
-
- case 5:
- case 7:
- ul_subframe = 2;
- break;
+ uint8_t ul_subframe = 0;
+ uint32_t ul_frame = 0;
- }
-
- break;
-
- case 3:
- switch (current_subframe) {
- case 0:
- case 5:
- case 6:
- ul_subframe = 2;
- break;
-
- case 7:
- ul_subframe = 3;
- break;
-
- case 8:
- ul_subframe = 4;
- break;
-
- case 9:
- ul_subframe = 2;
- break;
- }
-
- break;
-
- case 4:
- switch (current_subframe) {
- case 0:
- case 5:
- case 6:
- case 8:
- case 9:
- ul_subframe = 2;
- break;
-
- case 7:
- ul_subframe = 3;
- break;
- }
-
- break;
-
- case 5:
- ul_subframe = 2;
- break;
-
- default:
- LOG_E(PHY,
- "get_Msg3_harq_pid: Unsupported TDD configuration %d\n",
- (int) cc->tdd_Config->subframeAssignment);
- AssertFatal(1 == 0,
- "get_Msg3_harq_pid: Unsupported TDD configuration");
- break;
- }
+ if (cc->tdd_Config == NULL) { // FDD
+ ul_subframe =
+ (current_subframe >
+ 3) ? (current_subframe - 4) : (current_subframe + 6);
+ ul_frame = (current_subframe > 3) ? ((frame + 1) & 1023) : frame;
+ } else {
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 1:
+ switch (current_subframe) {
+ case 9:
+ case 0:
+ ul_subframe = 7;
+ break;
+ case 5:
+ case 7:
+ ul_subframe = 2;
+ break;
+ }
+ break;
+ case 3:
+ switch (current_subframe) {
+ case 0:
+ case 5:
+ case 6:
+ ul_subframe = 2;
+ break;
+ case 7:
+ ul_subframe = 3;
+ break;
+ case 8:
+ ul_subframe = 4;
+ break;
+ case 9:
+ ul_subframe = 2;
+ break;
+ }
+ break;
+ case 4:
+ switch (current_subframe) {
+ case 0:
+ case 5:
+ case 6:
+ case 8:
+ case 9:
+ ul_subframe = 2;
+ break;
+ case 7:
+ ul_subframe = 3;
+ break;
+ }
+ break;
+ case 5:
+ ul_subframe = 2;
+ break;
+ default:
+ LOG_E(PHY,
+ "get_Msg3_harq_pid: Unsupported TDD configuration %d\n",
+ (int) cc->tdd_Config->subframeAssignment);
+ AssertFatal(1 == 0,
+ "get_Msg3_harq_pid: Unsupported TDD configuration");
+ break;
}
+ }
- return (subframe2harqpid(cc, ul_frame, ul_subframe));
+ return (subframe2harqpid(cc, ul_frame, ul_subframe));
}
uint32_t
pdcchalloc2ulframe(COMMON_channels_t * ccP, uint32_t frame, uint8_t n)
{
- uint32_t ul_frame;
-
- if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 1) && ((n == 1) || (n == 6))) // tdd_config 0,1 SF 1,5
- ul_frame = (frame + (n == 1 ? 0 : 1));
- else if ((ccP->tdd_Config) &&
- (ccP->tdd_Config->subframeAssignment == 6) &&
- ((n == 0) || (n == 1) || (n == 5) || (n == 6)))
- ul_frame = (frame + (n >= 5 ? 1 : 0));
- else if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 6) && (n == 9)) // tdd_config 6 SF 9
- ul_frame = (frame + 1);
- else
- ul_frame = (frame + (n >= 6 ? 1 : 0));
+ uint32_t ul_frame;
+
+ if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 1) && ((n == 1) || (n == 6))) // tdd_config 0,1 SF 1,5
+ ul_frame = (frame + (n == 1 ? 0 : 1));
+ else if ((ccP->tdd_Config) &&
+ (ccP->tdd_Config->subframeAssignment == 6) &&
+ ((n == 0) || (n == 1) || (n == 5) || (n == 6)))
+ ul_frame = (frame + (n >= 5 ? 1 : 0));
+ else if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 6) && (n == 9)) // tdd_config 6 SF 9
+ ul_frame = (frame + 1);
+ else
+ ul_frame = (frame + (n >= 6 ? 1 : 0));
- LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, n,
- ul_frame);
- return ul_frame;
+ LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, n,
+ ul_frame);
+ return ul_frame;
}
uint8_t pdcchalloc2ulsubframe(COMMON_channels_t * ccP, uint8_t n)
{
- uint8_t ul_subframe;
-
- if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 1) && ((n == 1) || (n == 6))) // tdd_config 0,1 SF 1,5
- ul_subframe = ((n + 6) % 10);
- else if ((ccP->tdd_Config) &&
- (ccP->tdd_Config->subframeAssignment == 6) &&
- ((n == 0) || (n == 1) || (n == 5) || (n == 6)))
- ul_subframe = ((n + 7) % 10);
- else if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 6) && (n == 9)) // tdd_config 6 SF 9
- ul_subframe = ((n + 5) % 10);
- else
- ul_subframe = ((n + 4) % 10);
+ uint8_t ul_subframe;
+
+ if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 1) && ((n == 1) || (n == 6))) // tdd_config 0,1 SF 1,5
+ ul_subframe = ((n + 6) % 10);
+ else if ((ccP->tdd_Config) &&
+ (ccP->tdd_Config->subframeAssignment == 6) &&
+ ((n == 0) || (n == 1) || (n == 5) || (n == 6)))
+ ul_subframe = ((n + 7) % 10);
+ else if ((ccP->tdd_Config) && (ccP->tdd_Config->subframeAssignment == 6) && (n == 9)) // tdd_config 6 SF 9
+ ul_subframe = ((n + 5) % 10);
+ else
+ ul_subframe = ((n + 4) % 10);
- LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n", n, ul_subframe);
- return ul_subframe;
+ LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n", n, ul_subframe);
+ return ul_subframe;
}
int is_UL_sf(COMMON_channels_t * ccP, sub_frame_t subframeP)
{
- // if FDD return dummy value
- if (ccP->tdd_Config == NULL)
- return (0);
-
- switch (ccP->tdd_Config->subframeAssignment) {
- case 1:
- switch (subframeP) {
- case 0:
- case 4:
- case 5:
- case 9:
- return (0);
- break;
-
- case 2:
- case 3:
- case 7:
- case 8:
- return (1);
- break;
-
- default:
- return (0);
- break;
- }
- break;
-
- case 3:
- if ((subframeP <= 1) || (subframeP >= 5))
- return (0);
- else if ((subframeP > 1) && (subframeP < 5))
- return (1);
- else
- AssertFatal(1 == 0, "Unknown subframe number\n");
- break;
+ // if FDD return dummy value
+ if (ccP->tdd_Config == NULL)
+ return (0);
+ switch (ccP->tdd_Config->subframeAssignment) {
+ case 1:
+ switch (subframeP) {
+ case 0:
case 4:
- if ((subframeP <= 1) || (subframeP >= 4))
- return (0);
- else if ((subframeP > 1) && (subframeP < 4))
- return (1);
- else
- AssertFatal(1 == 0, "Unknown subframe number\n");
- break;
-
case 5:
- if ((subframeP <= 1) || (subframeP >= 3))
- return (0);
- else if ((subframeP > 1) && (subframeP < 3))
- return (1);
- else
- AssertFatal(1 == 0, "Unknown subframe number\n");
- break;
-
+ case 9:
+ return (0);
+ break;
+ case 2:
+ case 3:
+ case 7:
+ case 8:
+ return (1);
+ break;
default:
- AssertFatal(1 == 0,
- "subframe %d Unsupported TDD configuration %d\n",
- subframeP, (int) ccP->tdd_Config->subframeAssignment);
- break;
+ return (0);
+ break;
}
+ break;
+ case 3:
+ if ((subframeP <= 1) || (subframeP >= 5))
+ return (0);
+ else if ((subframeP > 1) && (subframeP < 5))
+ return (1);
+ else
+ AssertFatal(1 == 0, "Unknown subframe number\n");
+ break;
+ case 4:
+ if ((subframeP <= 1) || (subframeP >= 4))
+ return (0);
+ else if ((subframeP > 1) && (subframeP < 4))
+ return (1);
+ else
+ AssertFatal(1 == 0, "Unknown subframe number\n");
+ break;
+ case 5:
+ if ((subframeP <= 1) || (subframeP >= 3))
+ return (0);
+ else if ((subframeP > 1) && (subframeP < 3))
+ return (1);
+ else
+ AssertFatal(1 == 0, "Unknown subframe number\n");
+ break;
+ default:
+ AssertFatal(1 == 0,
+ "subframe %d Unsupported TDD configuration %d\n",
+ subframeP, (int) ccP->tdd_Config->subframeAssignment);
+ break;
+ }
}
uint16_t get_pucch1_absSF(COMMON_channels_t * cc, uint16_t dlsch_absSF)
{
- uint16_t sf, f, nextf;
+ uint16_t sf, f, nextf;
- if (cc->tdd_Config == NULL) { //FDD n+4
- return ((dlsch_absSF + 4) % 10240);
- } else {
- sf = dlsch_absSF % 10;
- f = dlsch_absSF / 10;
- nextf = (f + 1) & 1023;
-
- switch (cc->tdd_Config->subframeAssignment) {
- case 0:
- AssertFatal(1 == 0, "SFA 0 to be filled in now, :-)\n");
- break;
- case 1:
- if ((sf == 5) || (sf == 6))
- return ((10 * nextf) + 2); // ACK/NAK in SF 2 next frame
- else if (sf == 9)
- return ((10 * nextf) + 3); // ACK/NAK in SF 3 next frame
- else if ((sf == 0) || (sf == 1))
- return ((10 * f) + 2); // ACK/NAK in SF 7 same frame
- else
- AssertFatal(1 == 0,
- "Impossible dlsch subframe %d for TDD configuration 3\n",
- sf);
- break;
- case 2:
- if ((sf == 4) || (sf == 5) || (sf == 6) || (sf == 8))
- return ((10 * nextf) + 2); // ACK/NAK in SF 2 next frame
- else if (sf == 9)
- return ((10 * nextf) + 7); // ACK/NAK in SF 7 next frame
- else if ((sf == 0) || (sf == 1) || (sf == 3))
- return ((10 * f) + 7); // ACK/NAK in SF 7 same frame
- else
- AssertFatal(1 == 0,
- "Impossible dlsch subframe %d for TDD configuration 3\n",
- sf);
- break;
- case 3:
- if ((sf == 5) || (sf == 6) || (sf == 7) || (sf == 8)
- || (sf == 9))
- return ((10 * nextf) + (sf >> 1)); // ACK/NAK in 2,3,4 resp. next frame
- else if (sf == 1)
- return ((10 * nextf) + 2); // ACK/NAK in 2 next frame
- else if (sf == 0)
- return ((10 * f) + 4); // ACK/NAK in 4 same frame
- else
- AssertFatal(1 == 0,
- "Impossible dlsch subframe %d for TDD configuration 3\n",
- sf);
- break;
- case 4:
- if ((sf == 6) || (sf == 7) || (sf == 8) || (sf == 9))
- return (((10 * nextf) + 3) % 10240); // ACK/NAK in SF 3 next frame
- else if ((sf == 0) || (sf == 1) || (sf == 4) || (sf == 5))
- return (((10 * nextf) + 2) % 10240); // ACK/NAK in SF 2 next frame
- else
- AssertFatal(1 == 0,
- "Impossible dlsch subframe %d for TDD configuration 4\n",
- sf);
- break;
- case 5:
- if ((sf == 0) || (sf == 1) || (sf == 3) || (sf == 4)
- || (sf == 5) || (sf == 6) || (sf == 7) || (sf == 8))
- return (((10 * nextf) + 2) % 10240); // ACK/NAK in SF 3 next frame
- else if (sf == 9)
- return (((10 * (1 + nextf)) + 2) % 10240); // ACK/NAK in SF 2 next frame
- else
- AssertFatal(1 == 0,
- "Impossible dlsch subframe %d for TDD configuration 5\n",
- sf);
- break;
- case 6:
- AssertFatal(1 == 0, "SFA 6 To be filled in now, :-)\n");
- break;
- default:
- AssertFatal(1 == 0, "Illegal TDD subframe Assigment %d\n",
- (int) cc->tdd_Config->subframeAssignment);
- break;
- }
+ if (cc->tdd_Config == NULL) { //FDD n+4
+ return ((dlsch_absSF + 4) % 10240);
+ } else {
+ sf = dlsch_absSF % 10;
+ f = dlsch_absSF / 10;
+ nextf = (f + 1) & 1023;
+
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 0:
+ AssertFatal(1 == 0, "SFA 0 to be filled in now, :-)\n");
+ break;
+ case 1:
+ if ((sf == 5) || (sf == 6))
+ return ((10 * nextf) + 2); // ACK/NAK in SF 2 next frame
+ else if (sf == 9)
+ return ((10 * nextf) + 3); // ACK/NAK in SF 3 next frame
+ else if ((sf == 0) || (sf == 1))
+ return ((10 * f) + 2); // ACK/NAK in SF 7 same frame
+ else
+ AssertFatal(1 == 0,
+ "Impossible dlsch subframe %d for TDD configuration 3\n",
+ sf);
+ break;
+ case 2:
+ if ((sf == 4) || (sf == 5) || (sf == 6) || (sf == 8))
+ return ((10 * nextf) + 2); // ACK/NAK in SF 2 next frame
+ else if (sf == 9)
+ return ((10 * nextf) + 7); // ACK/NAK in SF 7 next frame
+ else if ((sf == 0) || (sf == 1) || (sf == 3))
+ return ((10 * f) + 7); // ACK/NAK in SF 7 same frame
+ else
+ AssertFatal(1 == 0,
+ "Impossible dlsch subframe %d for TDD configuration 3\n",
+ sf);
+ break;
+ case 3:
+ if ((sf == 5) || (sf == 6) || (sf == 7) || (sf == 8)
+ || (sf == 9))
+ return ((10 * nextf) + (sf >> 1)); // ACK/NAK in 2,3,4 resp. next frame
+ else if (sf == 1)
+ return ((10 * nextf) + 2); // ACK/NAK in 2 next frame
+ else if (sf == 0)
+ return ((10 * f) + 4); // ACK/NAK in 4 same frame
+ else
+ AssertFatal(1 == 0,
+ "Impossible dlsch subframe %d for TDD configuration 3\n",
+ sf);
+ break;
+ case 4:
+ if ((sf == 6) || (sf == 7) || (sf == 8) || (sf == 9))
+ return (((10 * nextf) + 3) % 10240); // ACK/NAK in SF 3 next frame
+ else if ((sf == 0) || (sf == 1) || (sf == 4) || (sf == 5))
+ return (((10 * nextf) + 2) % 10240); // ACK/NAK in SF 2 next frame
+ else
+ AssertFatal(1 == 0,
+ "Impossible dlsch subframe %d for TDD configuration 4\n",
+ sf);
+ break;
+ case 5:
+ if ((sf == 0) || (sf == 1) || (sf == 3) || (sf == 4)
+ || (sf == 5) || (sf == 6) || (sf == 7) || (sf == 8))
+ return (((10 * nextf) + 2) % 10240); // ACK/NAK in SF 3 next frame
+ else if (sf == 9)
+ return (((10 * (1 + nextf)) + 2) % 10240); // ACK/NAK in SF 2 next frame
+ else
+ AssertFatal(1 == 0,
+ "Impossible dlsch subframe %d for TDD configuration 5\n",
+ sf);
+ break;
+ case 6:
+ AssertFatal(1 == 0, "SFA 6 To be filled in now, :-)\n");
+ break;
+ default:
+ AssertFatal(1 == 0, "Illegal TDD subframe Assigment %d\n",
+ (int) cc->tdd_Config->subframeAssignment);
+ break;
}
- AssertFatal(1 == 0, "Shouldn't get here\n");
+ }
+ AssertFatal(1 == 0, "Shouldn't get here\n");
}
void
get_srs_pos(COMMON_channels_t * cc, uint16_t isrs,
uint16_t * psrsPeriodicity, uint16_t * psrsOffset)
{
- if (cc->tdd_Config) { // TDD
- AssertFatal(isrs >= 10, "2 ms SRS periodicity not supported");
+ if (cc->tdd_Config) { // TDD
+ AssertFatal(isrs >= 10, "2 ms SRS periodicity not supported");
- if ((isrs > 9) && (isrs < 15)) {
- *psrsPeriodicity = 5;
- *psrsOffset = isrs - 10;
- }
- if ((isrs > 14) && (isrs < 25)) {
- *psrsPeriodicity = 10;
- *psrsOffset = isrs - 15;
- }
- if ((isrs > 24) && (isrs < 45)) {
- *psrsPeriodicity = 20;
- *psrsOffset = isrs - 25;
- }
- if ((isrs > 44) && (isrs < 85)) {
- *psrsPeriodicity = 40;
- *psrsOffset = isrs - 45;
- }
- if ((isrs > 84) && (isrs < 165)) {
- *psrsPeriodicity = 80;
- *psrsOffset = isrs - 85;
- }
- if ((isrs > 164) && (isrs < 325)) {
- *psrsPeriodicity = 160;
- *psrsOffset = isrs - 165;
- }
- if ((isrs > 324) && (isrs < 645)) {
- *psrsPeriodicity = 320;
- *psrsOffset = isrs - 325;
- }
+ if ((isrs > 9) && (isrs < 15)) {
+ *psrsPeriodicity = 5;
+ *psrsOffset = isrs - 10;
+ }
+ if ((isrs > 14) && (isrs < 25)) {
+ *psrsPeriodicity = 10;
+ *psrsOffset = isrs - 15;
+ }
+ if ((isrs > 24) && (isrs < 45)) {
+ *psrsPeriodicity = 20;
+ *psrsOffset = isrs - 25;
+ }
+ if ((isrs > 44) && (isrs < 85)) {
+ *psrsPeriodicity = 40;
+ *psrsOffset = isrs - 45;
+ }
+ if ((isrs > 84) && (isrs < 165)) {
+ *psrsPeriodicity = 80;
+ *psrsOffset = isrs - 85;
+ }
+ if ((isrs > 164) && (isrs < 325)) {
+ *psrsPeriodicity = 160;
+ *psrsOffset = isrs - 165;
+ }
+ if ((isrs > 324) && (isrs < 645)) {
+ *psrsPeriodicity = 320;
+ *psrsOffset = isrs - 325;
+ }
- AssertFatal(isrs <= 644, "Isrs out of range %d>644\n", isrs);
- } // TDD
- else { // FDD
- if (isrs < 2) {
- *psrsPeriodicity = 2;
- *psrsOffset = isrs;
- }
- if ((isrs > 1) && (isrs < 7)) {
- *psrsPeriodicity = 5;
- *psrsOffset = isrs - 2;
- }
- if ((isrs > 6) && (isrs < 17)) {
- *psrsPeriodicity = 10;
- *psrsOffset = isrs - 7;
- }
- if ((isrs > 16) && (isrs < 37)) {
- *psrsPeriodicity = 20;
- *psrsOffset = isrs - 17;
- }
- if ((isrs > 36) && (isrs < 77)) {
- *psrsPeriodicity = 40;
- *psrsOffset = isrs - 37;
- }
- if ((isrs > 76) && (isrs < 157)) {
- *psrsPeriodicity = 80;
- *psrsOffset = isrs - 77;
- }
- if ((isrs > 156) && (isrs < 317)) {
- *psrsPeriodicity = 160;
- *psrsOffset = isrs - 157;
- }
- if ((isrs > 316) && (isrs < 637)) {
- *psrsPeriodicity = 320;
- *psrsOffset = isrs - 317;
- }
- AssertFatal(isrs <= 636, "Isrs out of range %d>636\n", isrs);
+ AssertFatal(isrs <= 644, "Isrs out of range %d>644\n", isrs);
+ } // TDD
+ else { // FDD
+ if (isrs < 2) {
+ *psrsPeriodicity = 2;
+ *psrsOffset = isrs;
+ }
+ if ((isrs > 1) && (isrs < 7)) {
+ *psrsPeriodicity = 5;
+ *psrsOffset = isrs - 2;
+ }
+ if ((isrs > 6) && (isrs < 17)) {
+ *psrsPeriodicity = 10;
+ *psrsOffset = isrs - 7;
+ }
+ if ((isrs > 16) && (isrs < 37)) {
+ *psrsPeriodicity = 20;
+ *psrsOffset = isrs - 17;
+ }
+ if ((isrs > 36) && (isrs < 77)) {
+ *psrsPeriodicity = 40;
+ *psrsOffset = isrs - 37;
+ }
+ if ((isrs > 76) && (isrs < 157)) {
+ *psrsPeriodicity = 80;
+ *psrsOffset = isrs - 77;
}
+ if ((isrs > 156) && (isrs < 317)) {
+ *psrsPeriodicity = 160;
+ *psrsOffset = isrs - 157;
+ }
+ if ((isrs > 316) && (isrs < 637)) {
+ *psrsPeriodicity = 320;
+ *psrsOffset = isrs - 317;
+ }
+ AssertFatal(isrs <= 636, "Isrs out of range %d>636\n", isrs);
+ }
}
void
@@ -746,83 +721,83 @@ get_csi_params(COMMON_channels_t * cc,
struct CQI_ReportPeriodic *cqi_ReportPeriodic,
uint16_t * Npd, uint16_t * N_OFFSET_CQI, int *H)
{
- uint16_t cqi_PMI_ConfigIndex =
- cqi_ReportPeriodic->choice.setup.cqi_pmi_ConfigIndex;
- uint8_t Jtab[6] = { 0, 2, 2, 3, 4, 4 };
-
- AssertFatal(cqi_ReportPeriodic != NULL,
- "cqi_ReportPeriodic is null!\n");
-
- if (cc->tdd_Config == NULL) { //FDD
- if (cqi_PMI_ConfigIndex <= 1) { // 2 ms CQI_PMI period
- *Npd = 2;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex;
- } else if (cqi_PMI_ConfigIndex <= 6) { // 5 ms CQI_PMI period
- *Npd = 5;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 2;
- } else if (cqi_PMI_ConfigIndex <= 16) { // 10ms CQI_PMI period
- *Npd = 10;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 7;
- } else if (cqi_PMI_ConfigIndex <= 36) { // 20 ms CQI_PMI period
- *Npd = 20;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 17;
- } else if (cqi_PMI_ConfigIndex <= 76) { // 40 ms CQI_PMI period
- *Npd = 40;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 37;
- } else if (cqi_PMI_ConfigIndex <= 156) { // 80 ms CQI_PMI period
- *Npd = 80;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 77;
- } else if (cqi_PMI_ConfigIndex <= 316) { // 160 ms CQI_PMI period
- *Npd = 160;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 157;
- } else if (cqi_PMI_ConfigIndex > 317) {
-
- if (cqi_PMI_ConfigIndex <= 349) { // 32 ms CQI_PMI period
- *Npd = 32;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 318;
- } else if (cqi_PMI_ConfigIndex <= 413) { // 64 ms CQI_PMI period
- *Npd = 64;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 350;
- } else if (cqi_PMI_ConfigIndex <= 541) { // 128 ms CQI_PMI period
- *Npd = 128;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 414;
- }
- }
- } else { // TDD
- if (cqi_PMI_ConfigIndex == 0) { // all UL subframes
- *Npd = 1;
- *N_OFFSET_CQI = 0;
- } else if (cqi_PMI_ConfigIndex <= 6) { // 5 ms CQI_PMI period
- *Npd = 5;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 1;
- } else if (cqi_PMI_ConfigIndex <= 16) { // 10ms CQI_PMI period
- *Npd = 10;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 6;
- } else if (cqi_PMI_ConfigIndex <= 36) { // 20 ms CQI_PMI period
- *Npd = 20;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 16;
- } else if (cqi_PMI_ConfigIndex <= 76) { // 40 ms CQI_PMI period
- *Npd = 40;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 36;
- } else if (cqi_PMI_ConfigIndex <= 156) { // 80 ms CQI_PMI period
- *Npd = 80;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 76;
- } else if (cqi_PMI_ConfigIndex <= 316) { // 160 ms CQI_PMI period
- *Npd = 160;
- *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 156;
- }
+ uint16_t cqi_PMI_ConfigIndex =
+ cqi_ReportPeriodic->choice.setup.cqi_pmi_ConfigIndex;
+ uint8_t Jtab[6] = { 0, 2, 2, 3, 4, 4 };
+
+ AssertFatal(cqi_ReportPeriodic != NULL,
+ "cqi_ReportPeriodic is null!\n");
+
+ if (cc->tdd_Config == NULL) { //FDD
+ if (cqi_PMI_ConfigIndex <= 1) { // 2 ms CQI_PMI period
+ *Npd = 2;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex;
+ } else if (cqi_PMI_ConfigIndex <= 6) { // 5 ms CQI_PMI period
+ *Npd = 5;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 2;
+ } else if (cqi_PMI_ConfigIndex <= 16) { // 10ms CQI_PMI period
+ *Npd = 10;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 7;
+ } else if (cqi_PMI_ConfigIndex <= 36) { // 20 ms CQI_PMI period
+ *Npd = 20;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 17;
+ } else if (cqi_PMI_ConfigIndex <= 76) { // 40 ms CQI_PMI period
+ *Npd = 40;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 37;
+ } else if (cqi_PMI_ConfigIndex <= 156) { // 80 ms CQI_PMI period
+ *Npd = 80;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 77;
+ } else if (cqi_PMI_ConfigIndex <= 316) { // 160 ms CQI_PMI period
+ *Npd = 160;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 157;
+ } else if (cqi_PMI_ConfigIndex > 317) {
+
+ if (cqi_PMI_ConfigIndex <= 349) { // 32 ms CQI_PMI period
+ *Npd = 32;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 318;
+ } else if (cqi_PMI_ConfigIndex <= 413) { // 64 ms CQI_PMI period
+ *Npd = 64;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 350;
+ } else if (cqi_PMI_ConfigIndex <= 541) { // 128 ms CQI_PMI period
+ *Npd = 128;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 414;
+ }
+ }
+ } else { // TDD
+ if (cqi_PMI_ConfigIndex == 0) { // all UL subframes
+ *Npd = 1;
+ *N_OFFSET_CQI = 0;
+ } else if (cqi_PMI_ConfigIndex <= 6) { // 5 ms CQI_PMI period
+ *Npd = 5;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 1;
+ } else if (cqi_PMI_ConfigIndex <= 16) { // 10ms CQI_PMI period
+ *Npd = 10;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 6;
+ } else if (cqi_PMI_ConfigIndex <= 36) { // 20 ms CQI_PMI period
+ *Npd = 20;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 16;
+ } else if (cqi_PMI_ConfigIndex <= 76) { // 40 ms CQI_PMI period
+ *Npd = 40;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 36;
+ } else if (cqi_PMI_ConfigIndex <= 156) { // 80 ms CQI_PMI period
+ *Npd = 80;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 76;
+ } else if (cqi_PMI_ConfigIndex <= 316) { // 160 ms CQI_PMI period
+ *Npd = 160;
+ *N_OFFSET_CQI = cqi_PMI_ConfigIndex - 156;
}
+ }
- // get H
- if (cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.
- present ==
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI)
- *H = 1 +
- (Jtab[cc->mib->message.dl_Bandwidth] *
- cqi_ReportPeriodic->choice.setup.
- cqi_FormatIndicatorPeriodic.choice.subbandCQI.k);
- else
- *H = 1;
+ // get H
+ if (cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.
+ present ==
+ CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI)
+ *H = 1 +
+ (Jtab[cc->mib->message.dl_Bandwidth] *
+ cqi_ReportPeriodic->choice.setup.
+ cqi_FormatIndicatorPeriodic.choice.subbandCQI.k);
+ else
+ *H = 1;
}
uint8_t
@@ -831,127 +806,129 @@ get_dl_cqi_pmi_size_pusch(COMMON_channels_t * cc, uint8_t tmode,
CQI_ReportModeAperiodic_t *
cqi_ReportModeAperiodic)
{
- int Ntab[6] = { 0, 4, 7, 9, 10, 13 };
- int N = Ntab[cc->mib->message.dl_Bandwidth];
- int Ltab_uesel[6] = { 0, 6, 9, 13, 15, 18 };
- int L = Ltab_uesel[cc->mib->message.dl_Bandwidth];
-
- AssertFatal(cqi_ReportModeAperiodic != NULL,
- "cqi_ReportPeriodic is null!\n");
-
- switch (*cqi_ReportModeAperiodic) {
- case CQI_ReportModeAperiodic_rm12:
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm12\n",
- tmode);
- AssertFatal(cc->p_eNB <= 4,
- "only up to 4 antenna ports supported here\n");
- if (ri == 1 && cc->p_eNB == 2)
- return (4 + (N << 1));
- else if (ri == 2 && cc->p_eNB == 2)
- return (8 + N);
- else if (ri == 1 && cc->p_eNB == 4)
- return (4 + (N << 2));
- else if (ri > 1 && cc->p_eNB == 4)
- return (8 + (N << 2));
- break;
- case CQI_ReportModeAperiodic_rm20:
- // Table 5.2.2.6.3-1 (36.212)
- AssertFatal(tmode == 1 || tmode == 2 || tmode == 3 || tmode == 7
- || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm20\n",
- tmode);
- AssertFatal(tmode != 9
- && tmode != 10,
- "TM9/10 will be handled later for CQI_ReportModeAperiodic_rm20\n");
- return (4 + 2 + L);
- break;
- case CQI_ReportModeAperiodic_rm22:
- // Table 5.2.2.6.3-2 (36.212)
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm22\n",
- tmode);
- AssertFatal(tmode != 9
- && tmode != 10,
- "TM9/10 will be handled later for CQI_ReportModeAperiodic_rm22\n");
- if (ri == 1 && cc->p_eNB == 2)
- return (4 + 2 + 0 + 0 + L + 4);
- if (ri == 2 && cc->p_eNB == 2)
- return (4 + 2 + 4 + 2 + L + 2);
- if (ri == 1 && cc->p_eNB == 4)
- return (4 + 2 + 0 + 0 + L + 8);
- if (ri >= 2 && cc->p_eNB == 4)
- return (4 + 2 + 4 + 2 + L + 8);
- break;
- case CQI_ReportModeAperiodic_rm30:
- // Table 5.2.2.6.2-1 (36.212)
- AssertFatal(tmode == 1 || tmode == 2 || tmode == 3 || tmode == 7
- || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm30\n",
- tmode);
- AssertFatal(tmode != 8 && tmode != 9
- && tmode != 10,
- "TM8/9/10 will be handled later for CQI_ReportModeAperiodic_rm30\n");
- return (4 + (N << 1));
- break;
- case CQI_ReportModeAperiodic_rm31:
- // Table 5.2.2.6.2-2 (36.212)
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm31\n",
- tmode);
- AssertFatal(tmode != 8 && tmode != 9
- && tmode != 10,
- "TM8/9/10 will be handled later for CQI_ReportModeAperiodic_rm31\n");
- if (ri == 1 && cc->p_eNB == 2)
- return (4 + (N << 1) + 0 + 0 + 2);
- else if (ri == 2 && cc->p_eNB == 2)
- return (4 + (N << 1) + 4 + (N << 1) + 1);
- else if (ri == 1 && cc->p_eNB == 4)
- return (4 + (N << 1) + 0 + 0 + 4);
- else if (ri >= 2 && cc->p_eNB == 4)
- return (4 + (N << 1) + 4 + (N << 1) + 4);
- break;
- case CQI_ReportModeAperiodic_rm32_v1250:
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm32\n",
- tmode);
- AssertFatal(1 == 0,
- "CQI_ReportModeAperiodic_rm32_v1250 not supported yet\n");
- break;
- case CQI_ReportModeAperiodic_rm10_v1310:
- // Table 5.2.2.6.1-1F/G (36.212)
- if (ri == 1)
- return (4); // F
- else
- return (7); // G
- break;
- case CQI_ReportModeAperiodic_rm11_v1310:
- // Table 5.2.2.6.1-1H (36.212)
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal TM (%d) for CQI_ReportModeAperiodic_rm11\n",
- tmode);
- AssertFatal(cc->p_eNB <= 4,
- "only up to 4 antenna ports supported here\n");
- if (ri == 1 && cc->p_eNB == 2)
- return (4 + 0 + 2);
- else if (ri == 2 && cc->p_eNB == 2)
- return (4 + 4 + 1);
- else if (ri == 1 && cc->p_eNB == 4)
- return (4 + 0 + 4);
- else if (ri > 1 && cc->p_eNB == 4)
- return (4 + 4 + 4);
+ int Ntab[6] = { 0, 4, 7, 9, 10, 13 };
+ int N = Ntab[cc->mib->message.dl_Bandwidth];
+ int Ltab_uesel[6] = { 0, 6, 9, 13, 15, 18 };
+ int L = Ltab_uesel[cc->mib->message.dl_Bandwidth];
+
+ AssertFatal(cqi_ReportModeAperiodic != NULL,
+ "cqi_ReportPeriodic is null!\n");
+
+ switch (*cqi_ReportModeAperiodic) {
+ case CQI_ReportModeAperiodic_rm12:
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm12\n",
+ tmode);
+ AssertFatal(cc->p_eNB <= 4,
+ "only up to 4 antenna ports supported here\n");
+ if (ri == 1 && cc->p_eNB == 2)
+ return (4 + (N << 1));
+ else if (ri == 2 && cc->p_eNB == 2)
+ return (8 + N);
+ else if (ri == 1 && cc->p_eNB == 4)
+ return (4 + (N << 2));
+ else if (ri > 1 && cc->p_eNB == 4)
+ return (8 + (N << 2));
+ break;
+ case CQI_ReportModeAperiodic_rm20:
+ // Table 5.2.2.6.3-1 (36.212)
+ AssertFatal(tmode == 1 || tmode == 2 || tmode == 3 || tmode == 7
+ || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm20\n",
+ tmode);
+ AssertFatal(tmode != 9
+ && tmode != 10,
+ "TM9/10 will be handled later for CQI_ReportModeAperiodic_rm20\n");
+ return (4 + 2 + L);
+ break;
+ case CQI_ReportModeAperiodic_rm22:
+ // Table 5.2.2.6.3-2 (36.212)
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm22\n",
+ tmode);
+ AssertFatal(tmode != 9
+ && tmode != 10,
+ "TM9/10 will be handled later for CQI_ReportModeAperiodic_rm22\n");
+ if (ri == 1 && cc->p_eNB == 2)
+ return (4 + 2 + 0 + 0 + L + 4);
+ if (ri == 2 && cc->p_eNB == 2)
+ return (4 + 2 + 4 + 2 + L + 2);
+ if (ri == 1 && cc->p_eNB == 4)
+ return (4 + 2 + 0 + 0 + L + 8);
+ if (ri >= 2 && cc->p_eNB == 4)
+ return (4 + 2 + 4 + 2 + L + 8);
+ break;
+ case CQI_ReportModeAperiodic_rm30:
+ // Table 5.2.2.6.2-1 (36.212)
+ AssertFatal(tmode == 1 || tmode == 2 || tmode == 3 || tmode == 7
+ || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm30\n",
+ tmode);
+ AssertFatal(tmode != 8 && tmode != 9
+ && tmode != 10,
+ "TM8/9/10 will be handled later for CQI_ReportModeAperiodic_rm30\n");
+ return (4 + (N << 1));
+ break;
+ case CQI_ReportModeAperiodic_rm31:
+ // Table 5.2.2.6.2-2 (36.212)
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm31\n",
+ tmode);
+ AssertFatal(tmode != 8 && tmode != 9
+ && tmode != 10,
+ "TM8/9/10 will be handled later for CQI_ReportModeAperiodic_rm31\n");
+ if (ri == 1 && cc->p_eNB == 2)
+ return (4 + (N << 1) + 0 + 0 + 2);
+ else if (ri == 2 && cc->p_eNB == 2)
+ return (4 + (N << 1) + 4 + (N << 1) + 1);
+ else if (ri == 1 && cc->p_eNB == 4)
+ return (4 + (N << 1) + 0 + 0 + 4);
+ else if (ri >= 2 && cc->p_eNB == 4)
+ return (4 + (N << 1) + 4 + (N << 1) + 4);
+ break;
+#ifdef Rel14
+ case CQI_ReportModeAperiodic_rm32_v1250:
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm32\n",
+ tmode);
+ AssertFatal(1 == 0,
+ "CQI_ReportModeAperiodic_rm32_v1250 not supported yet\n");
+ break;
+ case CQI_ReportModeAperiodic_rm10_v1310:
+ // Table 5.2.2.6.1-1F/G (36.212)
+ if (ri == 1)
+ return (4); // F
+ else
+ return (7); // G
+ break;
+ case CQI_ReportModeAperiodic_rm11_v1310:
+ // Table 5.2.2.6.1-1H (36.212)
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal TM (%d) for CQI_ReportModeAperiodic_rm11\n",
+ tmode);
+ AssertFatal(cc->p_eNB <= 4,
+ "only up to 4 antenna ports supported here\n");
+ if (ri == 1 && cc->p_eNB == 2)
+ return (4 + 0 + 2);
+ else if (ri == 2 && cc->p_eNB == 2)
+ return (4 + 4 + 1);
+ else if (ri == 1 && cc->p_eNB == 4)
+ return (4 + 0 + 4);
+ else if (ri > 1 && cc->p_eNB == 4)
+ return (4 + 4 + 4);
- break;
- }
- AssertFatal(1 == 0, "Shouldn't get here\n");
- return (0);
+ break;
+#endif /* Rel14 */
+ }
+ AssertFatal(1 == 0, "Shouldn't get here\n");
+ return (0);
}
uint8_t
@@ -959,103 +936,84 @@ get_rel8_dl_cqi_pmi_size(UE_sched_ctrl * sched_ctl, int CC_idP,
COMMON_channels_t * cc, uint8_t tmode,
struct CQI_ReportPeriodic * cqi_ReportPeriodic)
{
- int no_pmi = 0;
- // Ltab[6] = {0,log2(15/4/2),log2(25/4/2),log2(50/6/3),log2(75/8/4),log2(100/8/4)};
-
- uint8_t Ltab[6] = { 0, 1, 2, 2, 2, 2 };
- uint8_t ri = sched_ctl->periodic_ri_received[CC_idP];
-
- AssertFatal(cqi_ReportPeriodic != NULL,
- "cqi_ReportPeriodic is null!\n");
- AssertFatal(cqi_ReportPeriodic->present !=
- CQI_ReportPeriodic_PR_NOTHING,
- "cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_NOTHING!\n");
- AssertFatal(cqi_ReportPeriodic->choice.
- setup.cqi_FormatIndicatorPeriodic.present !=
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING,
- "cqi_ReportPeriodic->cqi_FormatIndicatorPeriodic.choice.setup.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING!\n");
-
- switch (tmode) {
- case 1:
- case 2:
- case 5:
- case 6:
- case 7:
- no_pmi = 1;
- break;
- default:
- no_pmi = 0;
- }
+ int no_pmi = 0;
+ // Ltab[6] = {0,log2(15/4/2),log2(25/4/2),log2(50/6/3),log2(75/8/4),log2(100/8/4)};
- if ((cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.
- present ==
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_widebandCQI)
- || (sched_ctl->feedback_cnt[CC_idP] == 0)) {
- // send wideband report every opportunity if wideband reporting mode is selected, else every H opportunities
- if (no_pmi == 1)
- return (4);
- else if ((cc->p_eNB == 2) && (ri == 1))
- return (6);
- else if ((cc->p_eNB == 2) && (ri == 2))
- return (8);
- else if ((cc->p_eNB == 4) && (ri == 1))
- return (8);
- else if ((cc->p_eNB == 4) && (ri == 2))
- return (11);
- else
- AssertFatal(1 == 0,
- "illegal combination p %d, ri %d, no_pmi %d\n",
- cc->p_eNB, ri, no_pmi);
- } else if (cqi_ReportPeriodic->choice.
- setup.cqi_FormatIndicatorPeriodic.present ==
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI)
- {
- if ((no_pmi == 1) || ri == 1)
- return (4 + Ltab[cc->mib->message.dl_Bandwidth]);
- else
- return (7 + Ltab[cc->mib->message.dl_Bandwidth]);
- }
+ uint8_t Ltab[6] = { 0, 1, 2, 2, 2, 2 };
+ uint8_t ri = sched_ctl->periodic_ri_received[CC_idP];
- AssertFatal(1 == 0,
- "Shouldn't get here : cqi_ReportPeriodic->present %d\n",
- cqi_ReportPeriodic->choice.
- setup.cqi_FormatIndicatorPeriodic.present);
+ AssertFatal(cqi_ReportPeriodic != NULL,
+ "cqi_ReportPeriodic is null!\n");
+ AssertFatal(cqi_ReportPeriodic->present != CQI_ReportPeriodic_PR_NOTHING,
+ "cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_NOTHING!\n");
+ AssertFatal(cqi_ReportPeriodic->choice.
+ setup.cqi_FormatIndicatorPeriodic.present != CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING,
+ "cqi_ReportPeriodic->cqi_FormatIndicatorPeriodic.choice.setup.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING!\n");
+
+ switch (tmode) {
+ case 1:
+ case 2:
+ case 5:
+ case 6:
+ case 7:
+ no_pmi = 1;
+ break;
+ default:
+ no_pmi = 0;
+ }
+
+ if ((cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_widebandCQI)
+ || (sched_ctl->feedback_cnt[CC_idP] == 0)) {
+ // send wideband report every opportunity if wideband reporting mode is selected, else every H opportunities
+ if (no_pmi == 1) return (4);
+ else if ((cc->p_eNB == 2) && (ri == 1)) return (6);
+ else if ((cc->p_eNB == 2) && (ri == 2)) return (8);
+ else if ((cc->p_eNB == 4) && (ri == 1)) return (8);
+ else if ((cc->p_eNB == 4) && (ri == 2)) return (11);
+ else
+ AssertFatal(1 == 0,
+ "illegal combination p %d, ri %d, no_pmi %d\n",
+ cc->p_eNB, ri, no_pmi);
+ } else if (cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI) {
+ if ((no_pmi == 1) || ri == 1) return (4 + Ltab[cc->mib->message.dl_Bandwidth]);
+ else return (7 + Ltab[cc->mib->message.dl_Bandwidth]);
+ }
+
+ AssertFatal(1 == 0,
+ "Shouldn't get here : cqi_ReportPeriodic->present %d\n",
+ cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present);
}
void
-fill_nfapi_dl_dci_1A(nfapi_dl_config_request_pdu_t * dl_config_pdu,
- uint8_t aggregation_level,
- uint16_t rnti,
- uint8_t rnti_type,
- uint8_t harq_process,
- uint8_t tpc,
- uint16_t resource_block_coding,
- uint8_t mcs, uint8_t ndi, uint8_t rv,
- uint8_t vrb_flag)
-{
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag =
- NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format =
- NFAPI_DL_DCI_FORMAT_1A;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level =
- aggregation_level;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = rnti_type;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = harq_process;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = tpc; // no TPC
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding =
- resource_block_coding;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = ndi;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = rv;
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = vrb_flag;
+fill_nfapi_dl_dci_1A(nfapi_dl_config_request_pdu_t *dl_config_pdu,
+ uint8_t aggregation_level,
+ uint16_t rnti,
+ uint8_t rnti_type,
+ uint8_t harq_process,
+ uint8_t tpc,
+ uint16_t resource_block_coding,
+ uint8_t mcs,
+ uint8_t ndi,
+ uint8_t rv,
+ uint8_t vrb_flag)
+{
+ memset((void *) dl_config_pdu, 0,
+ sizeof(nfapi_dl_config_request_pdu_t));
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = aggregation_level;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = rnti_type;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process = harq_process;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc = tpc;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = resource_block_coding;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1 = mcs;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1 = ndi;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1 = rv;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = vrb_flag;
}
void
@@ -1063,436 +1021,349 @@ program_dlsch_acknak(module_id_t module_idP, int CC_idP, int UE_idP,
frame_t frameP, sub_frame_t subframeP,
uint8_t cce_idx)
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = eNB->common_channels;
- UE_list_t *UE_list = &eNB->UE_list;
- rnti_t rnti = UE_RNTI(module_idP, UE_idP);
- nfapi_ul_config_request_body_t *ul_req;
- nfapi_ul_config_request_pdu_t *ul_config_pdu;
-
- int use_simultaneous_pucch_pusch = 0;
- nfapi_ul_config_ulsch_harq_information *ulsch_harq_information = NULL;
- nfapi_ul_config_harq_information *harq_information = NULL;
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = eNB->common_channels;
+ UE_list_t *UE_list = &eNB->UE_list;
+ rnti_t rnti = UE_RNTI(module_idP, UE_idP);
+ nfapi_ul_config_request_body_t *ul_req;
+ nfapi_ul_config_request_pdu_t *ul_config_pdu;
+ int use_simultaneous_pucch_pusch = 0;
+ nfapi_ul_config_ulsch_harq_information *ulsch_harq_information = NULL;
+ nfapi_ul_config_harq_information *harq_information = NULL;
#if defined(Rel10) || defined(Rel14)
- if ((UE_list->UE_template[CC_idP][UE_idP].physicalConfigDedicated->
- ext2)
- && (UE_list->UE_template[CC_idP][UE_idP].
- physicalConfigDedicated->ext2->pucch_ConfigDedicated_v1020)
- && (UE_list->UE_template[CC_idP][UE_idP].
- physicalConfigDedicated->ext2->pucch_ConfigDedicated_v1020->
- simultaneousPUCCH_PUSCH_r10)
- && (*UE_list->UE_template[CC_idP][UE_idP].
- physicalConfigDedicated->ext2->pucch_ConfigDedicated_v1020->
- simultaneousPUCCH_PUSCH_r10 ==
- PUCCH_ConfigDedicated_v1020__simultaneousPUCCH_PUSCH_r10_true))
- use_simultaneous_pucch_pusch = 1;
+ if ((UE_list->UE_template[CC_idP][UE_idP].physicalConfigDedicated->ext2)
+ && (UE_list->UE_template[CC_idP][UE_idP].physicalConfigDedicated->ext2->pucch_ConfigDedicated_v1020)
+ && (UE_list->UE_template[CC_idP][UE_idP].physicalConfigDedicated->ext2->pucch_ConfigDedicated_v1020->simultaneousPUCCH_PUSCH_r10)
+ && (*UE_list->UE_template[CC_idP][UE_idP].physicalConfigDedicated->ext2->pucch_ConfigDedicated_v1020->simultaneousPUCCH_PUSCH_r10 == PUCCH_ConfigDedicated_v1020__simultaneousPUCCH_PUSCH_r10_true))
+ use_simultaneous_pucch_pusch = 1;
#endif
- // pucch1 and pusch feedback is similar, namely in n+k subframes from now
- // This is used in the following "if/else" condition to check if there isn't or is already an UL grant in n+k
- int16_t ul_absSF =
- get_pucch1_absSF(&cc[CC_idP], subframeP + (10 * frameP));
-
- if ((ul_config_pdu = has_ul_grant(module_idP, CC_idP,
- ul_absSF, rnti)) == NULL) {
- // no UL grant so
- // Program ACK/NAK alone Format 1a/b or 3
-
- ul_req =
- &RC.mac[module_idP]->UL_req_tmp[CC_idP][ul_absSF %
- 10].
- ul_config_request_body;
- ul_config_pdu =
- &ul_req->ul_config_pdu_list[ul_req->number_of_pdus];
- // Do PUCCH
- fill_nfapi_uci_acknak(module_idP,
- CC_idP,
- rnti, (frameP * 10) + subframeP, cce_idx);
- } else {
- /* there is already an existing UL grant so update it if needed
- * on top of some other UL resource (PUSCH,combined SR/CQI/HARQ on PUCCH, etc)
- */
- switch (ul_config_pdu->pdu_type) {
-
- /* [ulsch] to [ulsch + harq] or [ulsch + harq on pucch] */
-
- case NFAPI_UL_CONFIG_ULSCH_PDU_TYPE:
- if (use_simultaneous_pucch_pusch == 1) {
- // Convert it to an NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE
- harq_information =
- &ul_config_pdu->ulsch_uci_harq_pdu.harq_information;
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE;
- LOG_D(MAC,
- "Frame %d, Subframe %d: Switched UCI HARQ to ULSCH UCI HARQ\n",
- frameP, subframeP);
- } else {
- // Convert it to an NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE
- ulsch_harq_information =
- &ul_config_pdu->ulsch_harq_pdu.harq_information;
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE;
- ul_config_pdu->ulsch_harq_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.tl.tag=NFAPI_UL_CONFIG_REQUEST_INITIAL_TRANSMISSION_PARAMETERS_REL8_TAG;
- ul_config_pdu->ulsch_harq_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.n_srs_initial = 0; // last symbol not punctured
- ul_config_pdu->ulsch_harq_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.initial_number_of_resource_blocks = ul_config_pdu->ulsch_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks; // we don't change the number of resource blocks across retransmissions yet
- LOG_D(MAC,
- "Frame %d, Subframe %d: Switched UCI HARQ to ULSCH HARQ\n",
- frameP, subframeP);
- }
- break;
- case NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE:
- AssertFatal(use_simultaneous_pucch_pusch == 1,
- "Cannot be NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE, simultaneous_pucch_pusch is active");
- break;
- case NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE:
- AssertFatal(use_simultaneous_pucch_pusch == 0,
- "Cannot be NFAPI_UL_CONFIG_ULSCH_UCI_PDU_TYPE, simultaneous_pucch_pusch is inactive\n");
- break;
-
- /* [ulsch + cqi] to [ulsch + cqi + harq] */
-
- case NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE:
- // Convert it to an NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE
- ulsch_harq_information =
- &ul_config_pdu->ulsch_cqi_harq_ri_pdu.harq_information;
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE;
- /* TODO: check this - when converting from nfapi_ul_config_ulsch_cqi_ri_pdu to
- * nfapi_ul_config_ulsch_cqi_harq_ri_pdu, shouldn't we copy initial_transmission_parameters
- * from the one to the other?
- * Those two types are not compatible. 'initial_transmission_parameters' is not at the
- * place in both.
- */
- ul_config_pdu->ulsch_cqi_harq_ri_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.tl.tag=NFAPI_UL_CONFIG_REQUEST_INITIAL_TRANSMISSION_PARAMETERS_REL8_TAG;
- ul_config_pdu->ulsch_cqi_harq_ri_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.n_srs_initial = 0; // last symbol not punctured
- ul_config_pdu->ulsch_cqi_harq_ri_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.initial_number_of_resource_blocks = ul_config_pdu->ulsch_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks; // we don't change the number of resource blocks across retransmissions yet
- break;
- case NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE:
- AssertFatal(use_simultaneous_pucch_pusch == 0,
- "Cannot be NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE, simultaneous_pucch_pusch is active\n");
- break;
-
- /* [ulsch + cqi on pucch] to [ulsch + cqi on pucch + harq on pucch] */
-
- case NFAPI_UL_CONFIG_ULSCH_UCI_CSI_PDU_TYPE:
- // convert it to an NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE
- harq_information =
- &ul_config_pdu->ulsch_csi_uci_harq_pdu.harq_information;
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE;
- break;
- case NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE:
- AssertFatal(use_simultaneous_pucch_pusch == 1,
- "Cannot be NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE, simultaneous_pucch_pusch is inactive\n");
- break;
-
- /* [sr] to [sr + harq] */
-
- case NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE:
- // convert to NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE;
- harq_information =
- &ul_config_pdu->uci_sr_harq_pdu.harq_information;
- break;
- case NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE:
- /* nothing to do */
- break;
-
- /* [cqi] to [cqi + harq] */
-
- case NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE:
- // convert to NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE;
- harq_information =
- &ul_config_pdu->uci_cqi_harq_pdu.harq_information;
- break;
- case NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE:
- /* nothing to do */
- break;
-
- /* [cqi + sr] to [cqr + sr + harq] */
-
- case NFAPI_UL_CONFIG_UCI_CQI_SR_PDU_TYPE:
- // convert to NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE
- ul_config_pdu->pdu_type =
- NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE;
- harq_information =
- &ul_config_pdu->uci_cqi_sr_harq_pdu.harq_information;
- break;
- case NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE:
- /* nothing to do */
- break;
- }
+ // pucch1 and pusch feedback is similar, namely in n+k subframes from now
+ // This is used in the following "if/else" condition to check if there isn't or is already an UL grant in n+k
+ int16_t ul_absSF = get_pucch1_absSF(&cc[CC_idP], subframeP + (10 * frameP));
+
+ if ((ul_config_pdu = has_ul_grant(module_idP, CC_idP,ul_absSF, rnti)) == NULL) {
+ // no UL grant so
+ // Program ACK/NAK alone Format 1a/b or 3
+
+ ul_req = &RC.mac[module_idP]->UL_req_tmp[CC_idP][ul_absSF %10].ul_config_request_body;
+ ul_config_pdu = &ul_req->ul_config_pdu_list[ul_req->number_of_pdus];
+ // Do PUCCH
+ fill_nfapi_uci_acknak(module_idP,
+ CC_idP,
+ rnti, (frameP * 10) + subframeP, cce_idx);
+ } else {
+ /* there is already an existing UL grant so update it if needed
+ * on top of some other UL resource (PUSCH,combined SR/CQI/HARQ on PUCCH, etc)
+ */
+ switch (ul_config_pdu->pdu_type) {
+
+ /* [ulsch] to [ulsch + harq] or [ulsch + harq on pucch] */
+
+ case NFAPI_UL_CONFIG_ULSCH_PDU_TYPE:
+ if (use_simultaneous_pucch_pusch == 1) {
+ // Convert it to an NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE
+ harq_information = &ul_config_pdu->ulsch_uci_harq_pdu.harq_information;
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE;
+ LOG_D(MAC,
+ "Frame %d, Subframe %d: Switched UCI HARQ to ULSCH UCI HARQ\n",
+ frameP, subframeP);
+ } else {
+ // Convert it to an NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE
+ ulsch_harq_information = &ul_config_pdu->ulsch_harq_pdu.harq_information;
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE;
+ ul_config_pdu->ulsch_harq_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_INITIAL_TRANSMISSION_PARAMETERS_REL8_TAG;
+ ul_config_pdu->ulsch_harq_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.n_srs_initial = 0; // last symbol not punctured
+ ul_config_pdu->ulsch_harq_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.initial_number_of_resource_blocks = ul_config_pdu->ulsch_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks; // we don't change the number of resource blocks across retransmissions yet
+ LOG_D(MAC,
+ "Frame %d, Subframe %d: Switched UCI HARQ to ULSCH HARQ\n",
+ frameP, subframeP);
+ }
+ break;
+ case NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE:
+ AssertFatal(use_simultaneous_pucch_pusch == 1,
+ "Cannot be NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE, simultaneous_pucch_pusch is active");
+ break;
+ case NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE:
+ AssertFatal(use_simultaneous_pucch_pusch == 0,
+ "Cannot be NFAPI_UL_CONFIG_ULSCH_UCI_PDU_TYPE, simultaneous_pucch_pusch is inactive\n");
+ break;
+
+ /* [ulsch + cqi] to [ulsch + cqi + harq] */
+
+ case NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE:
+ // Convert it to an NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE
+ ulsch_harq_information = &ul_config_pdu->ulsch_cqi_harq_ri_pdu.harq_information;
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE;
+ /* TODO: check this - when converting from nfapi_ul_config_ulsch_cqi_ri_pdu to
+ * nfapi_ul_config_ulsch_cqi_harq_ri_pdu, shouldn't we copy initial_transmission_parameters
+ * from the one to the other?
+ * Those two types are not compatible. 'initial_transmission_parameters' is not at the
+ * place in both.
+ */
+ ul_config_pdu->ulsch_cqi_harq_ri_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_INITIAL_TRANSMISSION_PARAMETERS_REL8_TAG;
+ ul_config_pdu->ulsch_cqi_harq_ri_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.n_srs_initial = 0; // last symbol not punctured
+ ul_config_pdu->ulsch_cqi_harq_ri_pdu.initial_transmission_parameters.initial_transmission_parameters_rel8.initial_number_of_resource_blocks = ul_config_pdu->ulsch_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks; // we don't change the number of resource blocks across retransmissions yet
+ break;
+ case NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE:
+ AssertFatal(use_simultaneous_pucch_pusch == 0,
+ "Cannot be NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE, simultaneous_pucch_pusch is active\n");
+ break;
+
+ /* [ulsch + cqi on pucch] to [ulsch + cqi on pucch + harq on pucch] */
+
+ case NFAPI_UL_CONFIG_ULSCH_UCI_CSI_PDU_TYPE:
+ // convert it to an NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE
+ harq_information = &ul_config_pdu->ulsch_csi_uci_harq_pdu.harq_information;
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE;
+ break;
+ case NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE:
+ AssertFatal(use_simultaneous_pucch_pusch == 1,
+ "Cannot be NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE, simultaneous_pucch_pusch is inactive\n");
+ break;
+
+ /* [sr] to [sr + harq] */
+
+ case NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE:
+ // convert to NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE;
+ harq_information = &ul_config_pdu->uci_sr_harq_pdu.harq_information;
+ break;
+ case NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE:
+ /* nothing to do */
+ break;
+ /* [cqi] to [cqi + harq] */
+ case NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE:
+ // convert to NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE;
+ harq_information = &ul_config_pdu->uci_cqi_harq_pdu.harq_information;
+ break;
+ case NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE:
+ /* nothing to do */
+ break;
+ /* [cqi + sr] to [cqr + sr + harq] */
+ case NFAPI_UL_CONFIG_UCI_CQI_SR_PDU_TYPE:
+ // convert to NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE;
+ harq_information = &ul_config_pdu->uci_cqi_sr_harq_pdu.harq_information;
+ break;
+ case NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE:
+ /* nothing to do */
+ break;
}
+ }
- if (ulsch_harq_information)
- fill_nfapi_ulsch_harq_information(module_idP, CC_idP,
- rnti, ulsch_harq_information);
+ if (ulsch_harq_information) fill_nfapi_ulsch_harq_information(module_idP, CC_idP, rnti, ulsch_harq_information);
- if (harq_information)
- fill_nfapi_harq_information(module_idP, CC_idP,
- rnti,
- (frameP * 10) + subframeP,
- harq_information, cce_idx);
+ if (harq_information) fill_nfapi_harq_information(module_idP, CC_idP,
+ rnti,
+ (frameP * 10) + subframeP,
+ harq_information, cce_idx);
}
uint8_t get_V_UL_DAI(module_id_t module_idP, int CC_idP, uint16_t rntiP)
{
- nfapi_hi_dci0_request_body_t *HI_DCI0_req =
- &RC.mac[module_idP]->HI_DCI0_req[CC_idP].hi_dci0_request_body;
- nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
- &HI_DCI0_req->hi_dci0_pdu_list[0];
-
- for (int i = 0; i < HI_DCI0_req->number_of_dci; i++) {
- if ((hi_dci0_pdu[i].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE) &&
- (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti == rntiP))
- return (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.
- dl_assignment_index);
- }
- return (4); // this is rule from Section 7.3 in 36.213
+ nfapi_hi_dci0_request_body_t *HI_DCI0_req = &RC.mac[module_idP]->HI_DCI0_req[CC_idP].hi_dci0_request_body;
+ nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu = &HI_DCI0_req->hi_dci0_pdu_list[0];
+
+ for (int i = 0; i < HI_DCI0_req->number_of_dci; i++) {
+ if ((hi_dci0_pdu[i].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE) &&
+ (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti == rntiP))
+ return (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.dl_assignment_index);
+ }
+ return (4); // this is rule from Section 7.3 in 36.213
}
void
-fill_nfapi_ulsch_harq_information(module_id_t module_idP,
- int CC_idP,
- uint16_t rntiP,
- nfapi_ul_config_ulsch_harq_information
- * harq_information)
-{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
- UE_list_t *UE_list = &eNB->UE_list;
-
- int UE_id = find_UE_id(module_idP, rntiP);
-
- PUSCH_ConfigDedicated_t *puschConfigDedicated;
- // PUSCH_ConfigDedicated_v1020_t *puschConfigDedicated_v1020;
- // PUSCH_ConfigDedicated_v1130_t *puschConfigDedicated_v1130;
- // PUSCH_ConfigDedicated_v1250_t *puschConfigDedicated_v1250;
-
- AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n");
- AssertFatal(UE_list != NULL, "UE_list is null\n");
- AssertFatal(UE_list->UE_template[CC_idP][UE_id].
- physicalConfigDedicated != NULL,
- "physicalConfigDedicated for rnti %x is null\n", rntiP);
- AssertFatal((puschConfigDedicated = (PUSCH_ConfigDedicated_t *)
- UE_list->UE_template[CC_idP][UE_id].
- physicalConfigDedicated->pusch_ConfigDedicated) != NULL,
- "physicalConfigDedicated->puschConfigDedicated for rnti %x is null\n",
- rntiP);
+fill_nfapi_ulsch_harq_information(module_id_t module_idP,
+ int CC_idP,
+ uint16_t rntiP,
+ nfapi_ul_config_ulsch_harq_information *harq_information)
+{
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
+
+ int UE_id = find_UE_id(module_idP, rntiP);
+
+ PUSCH_ConfigDedicated_t *puschConfigDedicated;
+ // PUSCH_ConfigDedicated_v1020_t *puschConfigDedicated_v1020;
+ // PUSCH_ConfigDedicated_v1130_t *puschConfigDedicated_v1130;
+ // PUSCH_ConfigDedicated_v1250_t *puschConfigDedicated_v1250;
+
+ AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n");
+ AssertFatal(UE_list != NULL, "UE_list is null\n");
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated != NULL,
+ "physicalConfigDedicated for rnti %x is null\n", rntiP);
+ AssertFatal((puschConfigDedicated = (PUSCH_ConfigDedicated_t *)
+ UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pusch_ConfigDedicated) != NULL,
+ "physicalConfigDedicated->puschConfigDedicated for rnti %x is null\n",
+ rntiP);
#if defined(Rel14) || defined(Rel14)
- /* if (UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext2) puschConfigDedicated_v1020 = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext2->pusch_ConfigDedicated_v1020;
- #endif
- #ifdef Rel14
- if (UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext4) puschConfigDedicated_v1130 = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext4->pusch_ConfigDedicated_v1130;
- if (UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext5) puschConfigDedicated_v1250 = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext5->pusch_ConfigDedicated_v1250;
- */
+ /* if (UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext2) puschConfigDedicated_v1020 = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext2->pusch_ConfigDedicated_v1020;
+ #endif
+ #ifdef Rel14
+ if (UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext4) puschConfigDedicated_v1130 = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext4->pusch_ConfigDedicated_v1130;
+ if (UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext5) puschConfigDedicated_v1250 = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->ext5->pusch_ConfigDedicated_v1250;
+ */
#endif
- harq_information->harq_information_rel10.delta_offset_harq =
- puschConfigDedicated->betaOffset_ACK_Index;
- AssertFatal(UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated != NULL,
- "pucch_ConfigDedicated is null!\n");
- if ((UE_list->UE_template[CC_idP][UE_id].
- physicalConfigDedicated->pucch_ConfigDedicated->
- tdd_AckNackFeedbackMode != NULL)
- && (*UE_list->UE_template[CC_idP][UE_id].
- physicalConfigDedicated->pucch_ConfigDedicated->
- tdd_AckNackFeedbackMode ==
- PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
- harq_information->harq_information_rel10.ack_nack_mode = 1; // multiplexing
- else
- harq_information->harq_information_rel10.ack_nack_mode = 0; // bundling
-
- switch (get_tmode(module_idP, CC_idP, UE_id)) {
- case 1:
- case 2:
- case 5:
- case 6:
- case 7:
- if (cc->tdd_Config == NULL) // FDD
- harq_information->harq_information_rel10.harq_size = 1;
- else {
- if (harq_information->harq_information_rel10.ack_nack_mode ==
- 1)
- harq_information->harq_information_rel10.harq_size =
- get_V_UL_DAI(module_idP, CC_idP, rntiP);
- else
- harq_information->harq_information_rel10.harq_size = 1;
- }
- break;
- default: // for any other TM we need 2 bits harq
- if (cc->tdd_Config == NULL) {
- harq_information->harq_information_rel10.harq_size = 2;
- } else {
- if (harq_information->harq_information_rel10.ack_nack_mode ==
- 1)
- harq_information->harq_information_rel10.harq_size =
- get_V_UL_DAI(module_idP, CC_idP, rntiP);
- else
- harq_information->harq_information_rel10.harq_size = 2;
- }
- break;
- } // get Tmode
+ harq_information->harq_information_rel10.delta_offset_harq = puschConfigDedicated->betaOffset_ACK_Index;
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated != NULL,
+ "pucch_ConfigDedicated is null!\n");
+ if ((UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
+ && (*UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode == PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
+ harq_information->harq_information_rel10.ack_nack_mode = 1; // multiplexing
+ else
+ harq_information->harq_information_rel10.ack_nack_mode = 0; // bundling
+
+ switch (get_tmode(module_idP, CC_idP, UE_id)) {
+ case 1:
+ case 2:
+ case 5:
+ case 6:
+ case 7:
+ if (cc->tdd_Config == NULL) // FDD
+ harq_information->harq_information_rel10.harq_size = 1;
+ else {
+ if (harq_information->harq_information_rel10.ack_nack_mode == 1)
+ harq_information->harq_information_rel10.harq_size = get_V_UL_DAI(module_idP, CC_idP, rntiP);
+ else
+ harq_information->harq_information_rel10.harq_size = 1;
+ }
+ break;
+ default: // for any other TM we need 2 bits harq
+ if (cc->tdd_Config == NULL) {
+ harq_information->harq_information_rel10.harq_size = 2;
+ } else {
+ if (harq_information->harq_information_rel10.ack_nack_mode == 1)
+ harq_information->harq_information_rel10.harq_size = get_V_UL_DAI(module_idP, CC_idP, rntiP);
+ else
+ harq_information->harq_information_rel10.harq_size = 2;
+ }
+ break;
+ } // get Tmode
}
void
-fill_nfapi_harq_information(module_id_t module_idP,
- int CC_idP,
- uint16_t rntiP,
- uint16_t absSFP,
- nfapi_ul_config_harq_information *
- harq_information, uint8_t cce_idxP)
+fill_nfapi_harq_information(module_id_t module_idP,
+ int CC_idP,
+ uint16_t rntiP,
+ uint16_t absSFP,
+ nfapi_ul_config_harq_information *harq_information,
+ uint8_t cce_idxP)
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
- UE_list_t *UE_list = &eNB->UE_list;
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
+ UE_list_t *UE_list = &eNB->UE_list;
- int UE_id = find_UE_id(module_idP, rntiP);
+ int UE_id = find_UE_id(module_idP, rntiP);
- AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\n");
- AssertFatal(UE_list != NULL, "UE_list is null\n");
+ AssertFatal(UE_id >= 0, "UE_id cannot be found, impossible\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].
- physicalConfigDedicated != NULL,
- "physicalConfigDedicated for rnti %x is null\n", rntiP);
+ /* TODO: revisit, don't use Assert, it's perfectly possible to
+ * have physicalConfigDedicated NULL here
+ */
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated != NULL,
+ "physicalConfigDedicated for rnti %x is null\n", rntiP);
#endif
- harq_information->harq_information_rel11.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL11_TAG;
- harq_information->harq_information_rel11.num_ant_ports = 1;
+ harq_information->harq_information_rel11.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL11_TAG;
+ harq_information->harq_information_rel11.num_ant_ports = 1;
- switch (get_tmode(module_idP, CC_idP, UE_id)) {
- case 1:
- case 2:
- case 5:
- case 6:
- case 7:
- if (cc->tdd_Config != NULL) {
- AssertFatal(UE_list->
- UE_template[CC_idP]
- [UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated != NULL,
- "pucch_ConfigDedicated is null for TDD!\n");
- if ((UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
- && (*UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated->tdd_AckNackFeedbackMode ==
- PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
- {
- harq_information->harq_information_rel10_tdd.harq_size = 2; // 2-bit ACK/NAK
- harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
- } else {
- harq_information->harq_information_rel10_tdd.harq_size = 1; // 1-bit ACK/NAK
- harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
- }
- harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
- harq_information->harq_information_rel10_tdd.n_pucch_1_0 =
- cc->radioResourceConfigCommon->pucch_ConfigCommon.
- n1PUCCH_AN + cce_idxP;
- harq_information->
- harq_information_rel10_tdd.number_of_pucch_resources = 1;
- } else {
- harq_information->harq_information_rel9_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG;
- harq_information->
- harq_information_rel9_fdd.number_of_pucch_resources = 1;
- harq_information->harq_information_rel9_fdd.harq_size = 1; // 1-bit ACK/NAK
- harq_information->harq_information_rel9_fdd.n_pucch_1_0 =
- cc->radioResourceConfigCommon->pucch_ConfigCommon.
- n1PUCCH_AN + cce_idxP;
- }
- break;
- default: // for any other TM we need 2 bits harq
- if (cc->tdd_Config != NULL) {
- AssertFatal(UE_list->
- UE_template[CC_idP]
- [UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated != NULL,
- "pucch_ConfigDedicated is null for TDD!\n");
- if ((UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
- && (*UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- pucch_ConfigDedicated->tdd_AckNackFeedbackMode ==
- PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
- {
- harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
- } else {
- harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
- }
- harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
- harq_information->harq_information_rel10_tdd.harq_size = 2;
- harq_information->harq_information_rel10_tdd.n_pucch_1_0 =
- cc->radioResourceConfigCommon->pucch_ConfigCommon.
- n1PUCCH_AN + cce_idxP;
- harq_information->
- harq_information_rel10_tdd.number_of_pucch_resources = 1;
+ switch (get_tmode(module_idP, CC_idP, UE_id)) {
+ case 1:
+ case 2:
+ case 5:
+ case 6:
+ case 7:
+ if (cc->tdd_Config != NULL) {
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated != NULL,
+ "pucch_ConfigDedicated is null for TDD!\n");
+ if ((UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
+ && (*UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode == PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing))
+ {
+ harq_information->harq_information_rel10_tdd.harq_size = 2; // 2-bit ACK/NAK
+ harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
} else {
- harq_information->harq_information_rel9_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG;
- harq_information->
- harq_information_rel9_fdd.number_of_pucch_resources = 1;
- harq_information->harq_information_rel9_fdd.ack_nack_mode = 0; // 1a/b
- harq_information->harq_information_rel9_fdd.harq_size = 2;
- harq_information->harq_information_rel9_fdd.n_pucch_1_0 =
- cc->radioResourceConfigCommon->pucch_ConfigCommon.
- n1PUCCH_AN + cce_idxP;
- }
- break;
- } // get Tmode
+ harq_information->harq_information_rel10_tdd.harq_size = 1; // 1-bit ACK/NAK
+ harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
+ }
+ harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
+ harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
+ harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1;
+ } else {
+ harq_information->harq_information_rel9_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG;
+ harq_information->harq_information_rel9_fdd.number_of_pucch_resources = 1;
+ harq_information->harq_information_rel9_fdd.harq_size = 1; // 1-bit ACK/NAK
+ harq_information->harq_information_rel9_fdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
+ }
+ break;
+ default: // for any other TM we need 2 bits harq
+ if (cc->tdd_Config != NULL) {
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated != NULL,
+ "pucch_ConfigDedicated is null for TDD!\n");
+ if ((UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode != NULL)
+ && (*UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->pucch_ConfigDedicated->tdd_AckNackFeedbackMode == PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing)) {
+ harq_information->harq_information_rel10_tdd.ack_nack_mode = 1; // multiplexing
+ } else {
+ harq_information->harq_information_rel10_tdd.ack_nack_mode = 0; // bundling
+ }
+ harq_information->harq_information_rel10_tdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG;
+ harq_information->harq_information_rel10_tdd.harq_size = 2;
+ harq_information->harq_information_rel10_tdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
+ harq_information->harq_information_rel10_tdd.number_of_pucch_resources = 1;
+ } else {
+ harq_information->harq_information_rel9_fdd.tl.tag = NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG;
+ harq_information->harq_information_rel9_fdd.number_of_pucch_resources = 1;
+ harq_information->harq_information_rel9_fdd.ack_nack_mode = 0; // 1a/b
+ harq_information->harq_information_rel9_fdd.harq_size = 2;
+ harq_information->harq_information_rel9_fdd.n_pucch_1_0 = cc->radioResourceConfigCommon->pucch_ConfigCommon.n1PUCCH_AN + cce_idxP;
+ }
+ break;
+ } // get Tmode
}
uint16_t
fill_nfapi_uci_acknak(module_id_t module_idP,
- int CC_idP,
- uint16_t rntiP, uint16_t absSFP, uint8_t cce_idxP)
-{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
-
- int ackNAK_absSF = get_pucch1_absSF(cc, absSFP);
- nfapi_ul_config_request_t *ul_req = &eNB->UL_req_tmp[CC_idP][ackNAK_absSF % 10];
- nfapi_ul_config_request_body_t *ul_req_body = &ul_req->ul_config_request_body;
- nfapi_ul_config_request_pdu_t *ul_config_pdu =
- &ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus];
-
- memset((void *) ul_config_pdu, 0,
- sizeof(nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE;
- ul_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_ul_config_uci_harq_pdu));
- ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
- ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.handle = 0; // don't know how to use this
- ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.rnti =
- rntiP;
-
- fill_nfapi_harq_information(module_idP, CC_idP,
- rntiP,
- absSFP,
- &ul_config_pdu->uci_harq_pdu.
- harq_information, cce_idxP);
- LOG_D(MAC,
- "Filled in UCI HARQ request for rnti %x SF %d.%d acknakSF %d.%d, cce_idxP %d-> n1_pucch %d\n",
- rntiP, absSFP / 10, absSFP % 10, ackNAK_absSF / 10,
- ackNAK_absSF % 10, cce_idxP,
- ul_config_pdu->uci_harq_pdu.
- harq_information.harq_information_rel9_fdd.n_pucch_1_0);
-
- ul_req_body->number_of_pdus++;
- ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
-
- ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
- ul_req->sfn_sf = (ackNAK_absSF/10) << 4 | ackNAK_absSF%10;
-
- return (((ackNAK_absSF / 10) << 4) + (ackNAK_absSF % 10));
+ int CC_idP,
+ uint16_t rntiP,
+ uint16_t absSFP,
+ uint8_t cce_idxP)
+{
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
+ int ackNAK_absSF = get_pucch1_absSF(cc, absSFP);
+ nfapi_ul_config_request_t *ul_req = &eNB->UL_req_tmp[CC_idP][ackNAK_absSF % 10];
+ nfapi_ul_config_request_body_t *ul_req_body = &ul_req->ul_config_request_body;
+ nfapi_ul_config_request_pdu_t *ul_config_pdu = &ul_req_body->ul_config_pdu_list[ul_req_body->number_of_pdus];
+
+ memset((void *) ul_config_pdu, 0, sizeof(nfapi_ul_config_request_pdu_t));
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE;
+ ul_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_ul_config_uci_harq_pdu));
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_UE_INFORMATION_REL8_TAG;
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.handle = 0; // don't know how to use this
+ ul_config_pdu->uci_harq_pdu.ue_information.ue_information_rel8.rnti = rntiP;
+
+ fill_nfapi_harq_information(module_idP, CC_idP,
+ rntiP,
+ absSFP,
+ &ul_config_pdu->uci_harq_pdu.harq_information, cce_idxP);
+ LOG_D(MAC,
+ "Filled in UCI HARQ request for rnti %x SF %d.%d acknakSF %d.%d, cce_idxP %d-> n1_pucch %d\n",
+ rntiP, absSFP / 10, absSFP % 10, ackNAK_absSF / 10,
+ ackNAK_absSF % 10, cce_idxP,
+ ul_config_pdu->uci_harq_pdu.
+ harq_information.harq_information_rel9_fdd.n_pucch_1_0);
+
+ ul_req_body->number_of_pdus++;
+ ul_req_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ ul_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
+ ul_req->sfn_sf = (ackNAK_absSF/10) << 4 | ackNAK_absSF%10;
+
+ return (((ackNAK_absSF / 10) << 4) + (ackNAK_absSF % 10));
}
void
@@ -1522,192 +1393,133 @@ fill_nfapi_dlsch_config(eNB_MAC_INST * eNB,
uint8_t num_bf_prb_per_subband,
uint8_t num_bf_vector)
{
- nfapi_dl_config_request_pdu_t *dl_config_pdu =
- &dl_req->dl_config_pdu_list[dl_req->number_pdu];
- memset((void *) dl_config_pdu, 0,
- sizeof(nfapi_dl_config_request_pdu_t));
-
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
- dl_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length = length;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = pdu_index;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = rnti;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type =
- resource_allocation_type;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.virtual_resource_block_assignment_flag =
- virtual_resource_block_assignment_flag;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding =
- resource_block_coding;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = modulation;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version =
- redundancy_version;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks =
- transport_blocks;
- dl_config_pdu->dlsch_pdu.
- dlsch_pdu_rel8.transport_block_to_codeword_swap_flag =
- transport_block_to_codeword_swap_flag;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme =
- transmission_scheme;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers =
- number_of_layers;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands =
- number_of_subbands;
- // dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = codebook_index;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity =
- ue_category_capacity;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = pa;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index =
- delta_power_offset_index;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = ngap;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = nprb;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode =
- transmission_mode;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband =
- num_bf_prb_per_subband;
- dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = num_bf_vector;
- dl_req->number_pdu++;
+ nfapi_dl_config_request_pdu_t *dl_config_pdu =
+ &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+ memset((void *) dl_config_pdu, 0,
+ sizeof(nfapi_dl_config_request_pdu_t));
+
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE;
+ dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dlsch_pdu));
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DLSCH_PDU_REL8_TAG;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.length = length;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index = pdu_index;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti = rnti;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type = resource_allocation_type;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = virtual_resource_block_assignment_flag;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding = resource_block_coding;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation = modulation;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version = redundancy_version;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks = transport_blocks;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag = transport_block_to_codeword_swap_flag;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme = transmission_scheme;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers = number_of_layers;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands = number_of_subbands;
+ // dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index = codebook_index;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity = ue_category_capacity;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa = pa;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index = delta_power_offset_index;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap = ngap;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb = nprb;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode = transmission_mode;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband = num_bf_prb_per_subband;
+ dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector = num_bf_vector;
+ dl_req->number_pdu++;
}
uint16_t
-fill_nfapi_tx_req(nfapi_tx_request_body_t * tx_req_body,
- uint16_t absSF, uint16_t pdu_length,
- uint16_t pdu_index, uint8_t * pdu)
+fill_nfapi_tx_req(nfapi_tx_request_body_t *tx_req_body,
+ uint16_t absSF,
+ uint16_t pdu_length,
+ uint16_t pdu_index,
+ uint8_t *pdu)
{
- nfapi_tx_request_pdu_t *TX_req =
- &tx_req_body->tx_pdu_list[tx_req_body->number_of_pdus];
- LOG_D(MAC, "Filling TX_req %d for pdu length %d\n",
- tx_req_body->number_of_pdus, pdu_length);
- TX_req->pdu_length = pdu_length;
- TX_req->pdu_index = pdu_index;
- TX_req->num_segments = 1;
- TX_req->segments[0].segment_length = pdu_length;
- TX_req->segments[0].segment_data = pdu;
- tx_req_body->tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
- tx_req_body->number_of_pdus++;
-
- return (((absSF / 10) << 4) + (absSF % 10));
+ nfapi_tx_request_pdu_t *TX_req = &tx_req_body->tx_pdu_list[tx_req_body->number_of_pdus];
+ LOG_D(MAC, "Filling TX_req %d for pdu length %d\n",
+ tx_req_body->number_of_pdus, pdu_length);
+
+ TX_req->pdu_length = pdu_length;
+ TX_req->pdu_index = pdu_index;
+ TX_req->num_segments = 1;
+ TX_req->segments[0].segment_length = pdu_length;
+ TX_req->segments[0].segment_data = pdu;
+ tx_req_body->tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
+ tx_req_body->number_of_pdus++;
+
+ return (((absSF / 10) << 4) + (absSF % 10));
}
void
-fill_nfapi_ulsch_config_request_rel8(nfapi_ul_config_request_pdu_t *
- ul_config_pdu, uint8_t cqi_req,
- COMMON_channels_t * cc,
- struct PhysicalConfigDedicated
- *physicalConfigDedicated,
- uint8_t tmode, uint32_t handle,
- uint16_t rnti,
- uint8_t resource_block_start,
- uint8_t
- number_of_resource_blocks,
- uint8_t mcs,
- uint8_t cyclic_shift_2_for_drms,
- uint8_t
- frequency_hopping_enabled_flag,
- uint8_t frequency_hopping_bits,
- uint8_t new_data_indication,
- uint8_t redundancy_version,
- uint8_t harq_process_number,
- uint8_t ul_tx_mode,
- uint8_t current_tx_nb,
- uint8_t n_srs, uint16_t size)
-{
- memset((void *) ul_config_pdu, 0,
- sizeof(nfapi_ul_config_request_pdu_t));
-
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_PDU_TYPE;
- ul_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_pdu));
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL8_TAG;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.handle = handle;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti = rnti;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.resource_block_start =
- resource_block_start;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks =
- number_of_resource_blocks;
- if (mcs < 11)
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 2;
- else if (mcs < 21)
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 4;
- else
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 6;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.cyclic_shift_2_for_drms =
- cyclic_shift_2_for_drms;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.
- frequency_hopping_enabled_flag = frequency_hopping_enabled_flag;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits =
- frequency_hopping_bits;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication =
- new_data_indication;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version =
- redundancy_version;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number =
- harq_process_number;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = ul_tx_mode;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = current_tx_nb;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = n_srs;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.size = size;
-
- if (cqi_req == 1) {
- // Add CQI portion
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE;
- ul_config_pdu->pdu_size =
- (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_cqi_ri_pdu));
- ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.tl.tag = NFAPI_UL_CONFIG_REQUEST_CQI_RI_INFORMATION_REL9_TAG;
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.report_type = 1;
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.
- aperiodic_cqi_pmi_ri_report.number_of_cc = 1;
- LOG_D(MAC, "report_type %d\n",
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.report_type);
-
- if (cc->p_eNB <= 2
- && (tmode == 3 || tmode == 4 || tmode == 8 || tmode == 9
- || tmode == 10))
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.
- aperiodic_cqi_pmi_ri_report.cc[0].ri_size = 1;
- else if (cc->p_eNB <= 2)
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.
- aperiodic_cqi_pmi_ri_report.cc[0].ri_size = 0;
- else if (cc->p_eNB == 4)
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.
- aperiodic_cqi_pmi_ri_report.cc[0].ri_size = 2;
-
- AssertFatal(physicalConfigDedicated->cqi_ReportConfig != NULL,
- "physicalConfigDedicated->cqi_ReportConfig is null!\n");
- AssertFatal(physicalConfigDedicated->
- cqi_ReportConfig->cqi_ReportModeAperiodic != NULL,
- "physicalConfigDedicated->cqi_ReportModeAperiodic is null!\n");
- AssertFatal(physicalConfigDedicated->pusch_ConfigDedicated != NULL,
- "physicalConfigDedicated->puschConfigDedicated is null!\n");
-
- for (int ri = 0;
- ri <
- (1 << ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.
- aperiodic_cqi_pmi_ri_report.cc[0].ri_size); ri++)
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.
- aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[ri] =
- get_dl_cqi_pmi_size_pusch(cc, tmode, 1 + ri,
- physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic);
-
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.delta_offset_cqi =
- physicalConfigDedicated->pusch_ConfigDedicated->
- betaOffset_CQI_Index;
- ul_config_pdu->ulsch_cqi_ri_pdu.
- cqi_ri_information.cqi_ri_information_rel9.delta_offset_ri =
- physicalConfigDedicated->pusch_ConfigDedicated->
- betaOffset_RI_Index;
- }
+fill_nfapi_ulsch_config_request_rel8(nfapi_ul_config_request_pdu_t *ul_config_pdu,
+ uint8_t cqi_req,
+ COMMON_channels_t *cc,
+ struct PhysicalConfigDedicated *physicalConfigDedicated,
+ uint8_t tmode,
+ uint32_t handle,
+ uint16_t rnti,
+ uint8_t resource_block_start,
+ uint8_t number_of_resource_blocks,
+ uint8_t mcs,
+ uint8_t cyclic_shift_2_for_drms,
+ uint8_t frequency_hopping_enabled_flag,
+ uint8_t frequency_hopping_bits,
+ uint8_t new_data_indication,
+ uint8_t redundancy_version,
+ uint8_t harq_process_number,
+ uint8_t ul_tx_mode,
+ uint8_t current_tx_nb,
+ uint8_t n_srs,
+ uint16_t size)
+{
+ memset((void *) ul_config_pdu, 0, sizeof(nfapi_ul_config_request_pdu_t));
+
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_PDU_TYPE;
+ ul_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_pdu));
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL8_TAG;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.handle = handle;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti = rnti;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.resource_block_start = resource_block_start;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.number_of_resource_blocks = number_of_resource_blocks;
+ if (mcs < 11) ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 2;
+ else if (mcs < 21) ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 4;
+ else ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.modulation_type = 6;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.cyclic_shift_2_for_drms = cyclic_shift_2_for_drms;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_enabled_flag = frequency_hopping_enabled_flag;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.frequency_hopping_bits = frequency_hopping_bits;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.new_data_indication = new_data_indication;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.redundancy_version = redundancy_version;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.harq_process_number = harq_process_number;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.ul_tx_mode = ul_tx_mode;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.current_tx_nb = current_tx_nb;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.n_srs = n_srs;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.size = size;
+
+ if (cqi_req == 1) {
+ // Add CQI portion
+ ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE;
+ ul_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_ul_config_ulsch_cqi_ri_pdu));
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.tl.tag = NFAPI_UL_CONFIG_REQUEST_CQI_RI_INFORMATION_REL9_TAG;
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.report_type = 1;
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.number_of_cc = 1;
+ LOG_D(MAC, "report_type %d\n",ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.report_type);
+
+ if (cc->p_eNB <= 2
+ && (tmode == 3 || tmode == 4 || tmode == 8 || tmode == 9 || tmode == 10))
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].ri_size = 1;
+ else if (cc->p_eNB <= 2) ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].ri_size = 0;
+ else if (cc->p_eNB == 4) ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].ri_size = 2;
+
+ AssertFatal(physicalConfigDedicated->cqi_ReportConfig != NULL,"physicalConfigDedicated->cqi_ReportConfig is null!\n");
+ AssertFatal(physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic != NULL,"physicalConfigDedicated->cqi_ReportModeAperiodic is null!\n");
+ AssertFatal(physicalConfigDedicated->pusch_ConfigDedicated != NULL,"physicalConfigDedicated->puschConfigDedicated is null!\n");
+
+ for (int ri = 0;
+ ri < (1 << ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].ri_size);
+ ri++)
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[ri] = get_dl_cqi_pmi_size_pusch(cc,tmode,1 + ri,physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic);
+
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.delta_offset_cqi = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_CQI_Index;
+ ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.delta_offset_ri = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_RI_Index;
+ }
}
#ifdef Rel14
@@ -1719,34 +1531,29 @@ fill_nfapi_ulsch_config_request_emtc(nfapi_ul_config_request_pdu_t *
uint16_t repetition_number,
uint16_t initial_transmission_sf_io)
{
- // Re13 fields
-
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL13_TAG;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.ue_type = ue_type;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.total_number_of_repetitions =
- total_number_of_repetitions;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.repetition_number =
- repetition_number;
- ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.initial_transmission_sf_io =
- initial_transmission_sf_io;
+ // Re13 fields
+
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.tl.tag = NFAPI_UL_CONFIG_REQUEST_ULSCH_PDU_REL13_TAG;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.ue_type = ue_type;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.total_number_of_repetitions = total_number_of_repetitions;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.repetition_number = repetition_number;
+ ul_config_pdu->ulsch_pdu.ulsch_pdu_rel13.initial_transmission_sf_io = initial_transmission_sf_io;
}
int get_numnarrowbands(long dl_Bandwidth)
{
- int nb_tab[6] = { 1, 2, 4, 8, 12, 16 };
+ int nb_tab[6] = { 1, 2, 4, 8, 12, 16 };
- AssertFatal(dl_Bandwidth < 7
- || dl_Bandwidth >= 0, "dl_Bandwidth not in [0..6]\n");
- return (nb_tab[dl_Bandwidth]);
+ AssertFatal(dl_Bandwidth < 7 || dl_Bandwidth >= 0, "dl_Bandwidth not in [0..6]\n");
+ return (nb_tab[dl_Bandwidth]);
}
int get_numnarrowbandbits(long dl_Bandwidth)
{
- int nbbits_tab[6] = { 0, 1, 2, 3, 4, 4 };
+ int nbbits_tab[6] = { 0, 1, 2, 3, 4, 4 };
- AssertFatal(dl_Bandwidth < 7
- || dl_Bandwidth >= 0, "dl_Bandwidth not in [0..6]\n");
- return (nbbits_tab[dl_Bandwidth]);
+ AssertFatal(dl_Bandwidth < 7 || dl_Bandwidth >= 0, "dl_Bandwidth not in [0..6]\n");
+ return (nbbits_tab[dl_Bandwidth]);
}
//This implements the frame/subframe condition for first subframe of MPDCCH transmission (Section 9.1.5 36.213, Rel 13/14)
@@ -1758,111 +1565,96 @@ mpdcch_sf_condition(eNB_MAC_INST * eNB, int CC_id, frame_t frameP,
sub_frame_t subframeP, int rmax,
MPDCCH_TYPES_t mpdcch_type, int UE_id)
{
- struct PRACH_ConfigSIB_v1310 *ext4_prach =
- eNB->common_channels[CC_id].radioResourceConfigCommon_BR->
- ext4->prach_ConfigCommon_v1310;
+ struct PRACH_ConfigSIB_v1310 *ext4_prach =
+ eNB->common_channels[CC_id].radioResourceConfigCommon_BR->
+ ext4->prach_ConfigCommon_v1310;
- int T;
- EPDCCH_SetConfig_r11_t *epdcch_setconfig_r11;
+ int T;
+ EPDCCH_SetConfig_r11_t *epdcch_setconfig_r11;
- switch (mpdcch_type) {
- case TYPE0:
- AssertFatal(1 == 0, "MPDCCH Type 0 not handled yet\n");
- break;
- case TYPE1:
- AssertFatal(1 == 0, "MPDCCH Type 1 not handled yet\n");
- break;
- case TYPE1A:
- AssertFatal(1 == 0, "MPDCCH Type 1A not handled yet\n");
- break;
- case TYPE2: // RAR
- AssertFatal(ext4_prach->mpdcch_startSF_CSS_RA_r13 != NULL,
- "mpdcch_startSF_CSS_RA_r13 is null\n");
- AssertFatal(rmax > 0, "rmax is 0!\b");
- if (eNB->common_channels[CC_id].tdd_Config == NULL) //FDD
- T = rmax *
- startSF_fdd_RA_times2[ext4_prach->
+ switch (mpdcch_type) {
+ case TYPE0:
+ AssertFatal(1 == 0, "MPDCCH Type 0 not handled yet\n");
+ break;
+ case TYPE1:
+ AssertFatal(1 == 0, "MPDCCH Type 1 not handled yet\n");
+ break;
+ case TYPE1A:
+ AssertFatal(1 == 0, "MPDCCH Type 1A not handled yet\n");
+ break;
+ case TYPE2: // RAR
+ AssertFatal(ext4_prach->mpdcch_startSF_CSS_RA_r13 != NULL,
+ "mpdcch_startSF_CSS_RA_r13 is null\n");
+ AssertFatal(rmax > 0, "rmax is 0!\b");
+ if (eNB->common_channels[CC_id].tdd_Config == NULL) //FDD
+ T = rmax *startSF_fdd_RA_times2[ext4_prach->
mpdcch_startSF_CSS_RA_r13->
choice.fdd_r13] >> 1;
- else //TDD
- T = rmax *
- startSF_tdd_RA[ext4_prach->
+ else //TDD
+ T = rmax *startSF_tdd_RA[ext4_prach->
mpdcch_startSF_CSS_RA_r13->choice.tdd_r13];
- break;
- case TYPE2A:
- AssertFatal(1 == 0, "MPDCCH Type 2A not handled yet\n");
- break;
- case TYPEUESPEC:
- epdcch_setconfig_r11 =
- eNB->UE_list.UE_template[CC_id][UE_id].
- physicalConfigDedicated->ext4->epdcch_Config_r11->config_r11.
- choice.setup.setConfigToAddModList_r11->list.array[0];
-
- AssertFatal(epdcch_setconfig_r11 != NULL,
- " epdcch_setconfig_r11 is null for UE specific \n");
- AssertFatal(epdcch_setconfig_r11->ext2 != NULL,
- " ext2 doesn't exist in epdcch config ' \n");
-
- if (eNB->common_channels[CC_id].tdd_Config == NULL) //FDD
- T = rmax *
- startSF_fdd_RA_times2[epdcch_setconfig_r11->
- ext2->mpdcch_config_r13->choice.
- setup.mpdcch_StartSF_UESS_r13.choice.
- fdd_r13] >> 1;
- else //TDD
- T = rmax *
- startSF_tdd_RA[epdcch_setconfig_r11->
- ext2->mpdcch_config_r13->choice.
- setup.mpdcch_StartSF_UESS_r13.choice.
- tdd_r13];
-
- break;
- default:
- return (0);
- }
+ break;
+ case TYPE2A:
+ AssertFatal(1 == 0, "MPDCCH Type 2A not handled yet\n");
+ break;
+ case TYPEUESPEC:
+ epdcch_setconfig_r11 =
+ eNB->UE_list.UE_template[CC_id][UE_id].physicalConfigDedicated->ext4->epdcch_Config_r11->config_r11.choice.setup.setConfigToAddModList_r11->list.array[0];
+
+ AssertFatal(epdcch_setconfig_r11 != NULL,
+ " epdcch_setconfig_r11 is null for UE specific \n");
+ AssertFatal(epdcch_setconfig_r11->ext2 != NULL,
+ " ext2 doesn't exist in epdcch config ' \n");
+
+ if (eNB->common_channels[CC_id].tdd_Config == NULL) //FDD
+ T = rmax *startSF_fdd_RA_times2[epdcch_setconfig_r11->ext2->mpdcch_config_r13->choice.setup.mpdcch_StartSF_UESS_r13.choice.fdd_r13] >> 1;
+ else //TDD
+ T = rmax *startSF_tdd_RA[epdcch_setconfig_r11->ext2->mpdcch_config_r13->choice.setup.mpdcch_StartSF_UESS_r13.choice.tdd_r13];
+ break;
+ default:
+ return (0);
+ }
- AssertFatal(T > 0, "T is 0!\n");
- if (((10 * frameP) + subframeP) % T == 0)
- return (1);
- else
- return (0);
+ AssertFatal(T > 0, "T is 0!\n");
+ if (((10 * frameP) + subframeP) % T == 0) return (1);
+ else return (0);
}
int narrowband_to_first_rb(COMMON_channels_t * cc, int nb_index)
{
- switch (cc->mib->message.dl_Bandwidth) {
- case 0: // 6 PRBs, N_NB=1, i_0=0
- return (0);
- break;
- case 3: // 50 PRBs, N_NB=8, i_0=1
- return ((int) (1 + (6 * nb_index)));
- break;
- case 5: // 100 PRBs, N_NB=16, i_0=2
- return ((int) (2 + (6 * nb_index)));
- break;
- case 1: // 15 PRBs N_NB=2, i_0=1
- if (nb_index > 0)
- return (1);
- else
- return (0);
- break;
- case 2: // 25 PRBs, N_NB=4, i_0=0
- if (nb_index > 1)
- return (1 + (6 * nb_index));
- else
- return ((6 * nb_index));
- break;
- case 4: // 75 PRBs, N_NB=12, i_0=1
- if (nb_index > 5)
- return (2 + (6 * nb_index));
- else
- return (1 + (6 * nb_index));
- break;
- default:
- AssertFatal(1 == 0, "Impossible dl_Bandwidth %d\n",
- (int) cc->mib->message.dl_Bandwidth);
- break;
- }
+ switch (cc->mib->message.dl_Bandwidth) {
+ case 0: // 6 PRBs, N_NB=1, i_0=0
+ return (0);
+ break;
+ case 3: // 50 PRBs, N_NB=8, i_0=1
+ return ((int) (1 + (6 * nb_index)));
+ break;
+ case 5: // 100 PRBs, N_NB=16, i_0=2
+ return ((int) (2 + (6 * nb_index)));
+ break;
+ case 1: // 15 PRBs N_NB=2, i_0=1
+ if (nb_index > 0)
+ return (1);
+ else
+ return (0);
+ break;
+ case 2: // 25 PRBs, N_NB=4, i_0=0
+ if (nb_index > 1)
+ return (1 + (6 * nb_index));
+ else
+ return ((6 * nb_index));
+ break;
+ case 4: // 75 PRBs, N_NB=12, i_0=1
+ if (nb_index > 5)
+ return (2 + (6 * nb_index));
+ else
+ return (1 + (6 * nb_index));
+ break;
+ default:
+ AssertFatal(1 == 0, "Impossible dl_Bandwidth %d\n",
+ (int) cc->mib->message.dl_Bandwidth);
+ break;
+ }
}
#endif
@@ -1870,23 +1662,23 @@ int narrowband_to_first_rb(COMMON_channels_t * cc, int nb_index)
void init_ue_sched_info(void)
//------------------------------------------------------------------------------
{
- module_id_t i, j, k;
-
- for (i = 0; i < NUMBER_OF_eNB_MAX; i++) {
- for (k = 0; k < MAX_NUM_CCs; k++) {
- for (j = 0; j < NUMBER_OF_UE_MAX; j++) {
- // init DL
- eNB_dlsch_info[i][k][j].weight = 0;
- eNB_dlsch_info[i][k][j].subframe = 0;
- eNB_dlsch_info[i][k][j].serving_num = 0;
- eNB_dlsch_info[i][k][j].status = S_DL_NONE;
- // init UL
- eNB_ulsch_info[i][k][j].subframe = 0;
- eNB_ulsch_info[i][k][j].serving_num = 0;
- eNB_ulsch_info[i][k][j].status = S_UL_NONE;
- }
- }
+ module_id_t i, j, k;
+
+ for (i = 0; i < NUMBER_OF_eNB_MAX; i++) {
+ for (k = 0; k < MAX_NUM_CCs; k++) {
+ for (j = 0; j < NUMBER_OF_UE_MAX; j++) {
+ // init DL
+ eNB_dlsch_info[i][k][j].weight = 0;
+ eNB_dlsch_info[i][k][j].subframe = 0;
+ eNB_dlsch_info[i][k][j].serving_num = 0;
+ eNB_dlsch_info[i][k][j].status = S_DL_NONE;
+ // init UL
+ eNB_ulsch_info[i][k][j].subframe = 0;
+ eNB_ulsch_info[i][k][j].serving_num = 0;
+ eNB_ulsch_info[i][k][j].status = S_UL_NONE;
+ }
}
+ }
}
@@ -1895,54 +1687,54 @@ void init_ue_sched_info(void)
unsigned char get_ue_weight(module_id_t module_idP, int CC_idP, int ue_idP)
//------------------------------------------------------------------------------
{
- return (eNB_dlsch_info[module_idP][CC_idP][ue_idP].weight);
+ return (eNB_dlsch_info[module_idP][CC_idP][ue_idP].weight);
}
//------------------------------------------------------------------------------
int find_UE_id(module_id_t mod_idP, rnti_t rntiP)
//------------------------------------------------------------------------------
{
- int UE_id;
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
-
- for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
- if (UE_list->active[UE_id] != TRUE)
- continue;
- if (UE_list->UE_template[UE_PCCID(mod_idP, UE_id)][UE_id].rnti ==
- rntiP) {
- return (UE_id);
- }
+ int UE_id;
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+
+ for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
+ if (UE_list->active[UE_id] != TRUE)
+ continue;
+ if (UE_list->UE_template[UE_PCCID(mod_idP, UE_id)][UE_id].rnti ==
+ rntiP) {
+ return (UE_id);
}
+ }
- return (-1);
+ return (-1);
}
//------------------------------------------------------------------------------
int find_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP)
//------------------------------------------------------------------------------
{
- int RA_id;
- AssertFatal(RC.mac[mod_idP], "RC.mac[%d] is null\n", mod_idP);
+ int RA_id;
+ AssertFatal(RC.mac[mod_idP], "RC.mac[%d] is null\n", mod_idP);
- RA_t *ra = (RA_t *) & RC.mac[mod_idP]->common_channels[CC_idP].ra[0];
+ RA_t *ra = (RA_t *) & RC.mac[mod_idP]->common_channels[CC_idP].ra[0];
- for (RA_id = 0; RA_id < NB_RA_PROC_MAX; RA_id++) {
- LOG_D(MAC,
- "Checking RA_id %d for %x : state %d\n",
- RA_id, rntiP, ra[RA_id].state);
+ for (RA_id = 0; RA_id < NB_RA_PROC_MAX; RA_id++) {
+ LOG_D(MAC,
+ "Checking RA_id %d for %x : state %d\n",
+ RA_id, rntiP, ra[RA_id].state);
- if (ra[RA_id].state != IDLE &&
- ra[RA_id].rnti == rntiP)
- return (RA_id);
- }
- return (-1);
+ if (ra[RA_id].state != IDLE &&
+ ra[RA_id].rnti == rntiP)
+ return (RA_id);
+ }
+ return (-1);
}
//------------------------------------------------------------------------------
int UE_num_active_CC(UE_list_t * listP, int ue_idP)
//------------------------------------------------------------------------------
{
- return (listP->numactiveCCs[ue_idP]);
+ return (listP->numactiveCCs[ue_idP]);
}
//------------------------------------------------------------------------------
@@ -1962,13 +1754,13 @@ rnti_t UE_RNTI(module_id_t mod_idP, int ue_idP)
RC.mac[mod_idP]->
UE_list.UE_template[UE_PCCID(mod_idP, ue_idP)][ue_idP].rnti;
- if (rnti > 0) {
- return (rnti);
- }
+ if (rnti > 0) {
+ return (rnti);
+ }
- LOG_D(MAC, "[eNB %d] Couldn't find RNTI for UE %d\n", mod_idP, ue_idP);
- //display_backtrace();
- return (NOT_A_RNTI);
+ LOG_D(MAC, "[eNB %d] Couldn't find RNTI for UE %d\n", mod_idP, ue_idP);
+ //display_backtrace();
+ return (NOT_A_RNTI);
}
//------------------------------------------------------------------------------
@@ -1979,864 +1771,729 @@ boolean_t is_UE_active(module_id_t mod_idP, int ue_idP)
return (RC.mac[mod_idP]->UE_list.active[ue_idP]);
}
-/*
-uint8_t find_active_UEs(module_id_t module_idP,int CC_id){
-
- module_id_t ue_mod_id = 0;
- rnti_t rnti = 0;
- uint8_t nb_active_ue = 0;
-
- for (ue_mod_id=0;ue_mod_id<NUMBER_OF_UE_MAX;ue_mod_id++) {
-
- if (((rnti=eNB_mac_inst[module_idP][CC_id].UE_template[ue_mod_id].rnti) !=0)&&(eNB_mac_inst[module_idP][CC_id].UE_template[ue_mod_id].ul_active==TRUE)){
-
- if (mac_xface->get_eNB_UE_stats(module_idP,rnti) != NULL){ // check at the phy enb_ue state for this rnti
- nb_active_ue++;
- }
- else { // this ue is removed at the phy => remove it at the mac as well
- mac_remove_ue(module_idP, CC_id, ue_mod_id);
- }
- }
- }
- return(nb_active_ue);
-}
-*/
-
-
-// get aggregation (L) form phy for a give UE
unsigned char
get_aggregation(uint8_t bw_index, uint8_t cqi, uint8_t dci_fmt)
{
- unsigned char aggregation = 3;
+ unsigned char aggregation = 3;
- switch (dci_fmt) {
- case format0:
- aggregation = cqi2fmt0_agg[bw_index][cqi];
- break;
- case format1:
- case format1A:
- case format1B:
- case format1D:
- aggregation = cqi2fmt1x_agg[bw_index][cqi];
- break;
- case format2:
- case format2A:
- case format2B:
- case format2C:
- case format2D:
- aggregation = cqi2fmt2x_agg[bw_index][cqi];
- break;
- case format1C:
- case format1E_2A_M10PRB:
- case format3:
- case format3A:
- case format4:
- default:
- LOG_W(MAC, "unsupported DCI format %d\n", dci_fmt);
- }
+ switch (dci_fmt) {
+ case format0:
+ aggregation = cqi2fmt0_agg[bw_index][cqi];
+ break;
+ case format1:
+ case format1A:
+ case format1B:
+ case format1D:
+ aggregation = cqi2fmt1x_agg[bw_index][cqi];
+ break;
+ case format2:
+ case format2A:
+ case format2B:
+ case format2C:
+ case format2D:
+ aggregation = cqi2fmt2x_agg[bw_index][cqi];
+ break;
+ case format1C:
+ case format1E_2A_M10PRB:
+ case format3:
+ case format3A:
+ case format4:
+ default:
+ LOG_W(MAC, "unsupported DCI format %d\n", dci_fmt);
+ }
- LOG_D(MAC, "Aggregation level %d (cqi %d, bw_index %d, format %d)\n", 1 << aggregation, cqi, bw_index, dci_fmt);
+ LOG_D(MAC, "Aggregation level %d (cqi %d, bw_index %d, format %d)\n", 1 << aggregation, cqi, bw_index, dci_fmt);
- return 1 << aggregation;
+ return 1 << aggregation;
}
void dump_ue_list(UE_list_t * listP, int ul_flag)
{
- int j;
+ int j;
- if (ul_flag == 0) {
- for (j = listP->head; j >= 0; j = listP->next[j]) {
- LOG_T(MAC, "node %d => %d\n", j, listP->next[j]);
- }
- } else {
- for (j = listP->head_ul; j >= 0; j = listP->next_ul[j]) {
- LOG_T(MAC, "node %d => %d\n", j, listP->next_ul[j]);
- }
+ if (ul_flag == 0) {
+ for (j = listP->head; j >= 0; j = listP->next[j]) {
+ LOG_T(MAC, "node %d => %d\n", j, listP->next[j]);
+ }
+ } else {
+ for (j = listP->head_ul; j >= 0; j = listP->next_ul[j]) {
+ LOG_T(MAC, "node %d => %d\n", j, listP->next_ul[j]);
}
+ }
}
int add_new_ue(module_id_t mod_idP, int cc_idP, rnti_t rntiP, int harq_pidP
#ifdef Rel14
, uint8_t rach_resource_type
#endif
- )
-{
- int UE_id;
- int i, j;
-
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
-
- LOG_D(MAC,
- "[eNB %d, CC_id %d] Adding UE with rnti %x (next avail %d, num_UEs %d)\n",
- mod_idP, cc_idP, rntiP, UE_list->avail, UE_list->num_UEs);
- dump_ue_list(UE_list, 0);
-
- for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
- if (UE_list->active[i] == TRUE)
- continue;
- UE_id = i;
- memset(&UE_list->UE_template[cc_idP][UE_id], 0,
- sizeof(UE_TEMPLATE));
- UE_list->UE_template[cc_idP][UE_id].rnti = rntiP;
- UE_list->UE_template[cc_idP][UE_id].configured = FALSE;
- UE_list->numactiveCCs[UE_id] = 1;
- UE_list->numactiveULCCs[UE_id] = 1;
- UE_list->pCC_id[UE_id] = cc_idP;
- UE_list->ordered_CCids[0][UE_id] = cc_idP;
- UE_list->ordered_ULCCids[0][UE_id] = cc_idP;
- UE_list->num_UEs++;
- UE_list->active[UE_id] = TRUE;
+ )
+{
+ int UE_id;
+ int i, j;
+
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+
+ LOG_D(MAC,
+ "[eNB %d, CC_id %d] Adding UE with rnti %x (next avail %d, num_UEs %d)\n",
+ mod_idP, cc_idP, rntiP, UE_list->avail, UE_list->num_UEs);
+ dump_ue_list(UE_list, 0);
+
+ for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
+ if (UE_list->active[i] == TRUE)
+ continue;
+ UE_id = i;
+ memset(&UE_list->UE_template[cc_idP][UE_id], 0,
+ sizeof(UE_TEMPLATE));
+ UE_list->UE_template[cc_idP][UE_id].rnti = rntiP;
+ UE_list->UE_template[cc_idP][UE_id].configured = FALSE;
+ UE_list->numactiveCCs[UE_id] = 1;
+ UE_list->numactiveULCCs[UE_id] = 1;
+ UE_list->pCC_id[UE_id] = cc_idP;
+ UE_list->ordered_CCids[0][UE_id] = cc_idP;
+ UE_list->ordered_ULCCids[0][UE_id] = cc_idP;
+ UE_list->num_UEs++;
+ UE_list->active[UE_id] = TRUE;
#if defined(USRP_REC_PLAY) // not specific to record/playback ?
- UE_list->UE_template[cc_idP][UE_id].pre_assigned_mcs_ul = 0;
+ UE_list->UE_template[cc_idP][UE_id].pre_assigned_mcs_ul = 0;
#endif
#ifdef Rel14
- UE_list->UE_template[cc_idP][UE_id].rach_resource_type =
- rach_resource_type;
+ UE_list->UE_template[cc_idP][UE_id].rach_resource_type =
+ rach_resource_type;
#endif
- memset((void *) &UE_list->UE_sched_ctrl[UE_id], 0,
- sizeof(UE_sched_ctrl));
- memset((void *) &UE_list->eNB_UE_stats[cc_idP][UE_id], 0,
- sizeof(eNB_UE_STATS));
+ memset((void *) &UE_list->UE_sched_ctrl[UE_id], 0,
+ sizeof(UE_sched_ctrl));
+ memset((void *) &UE_list->eNB_UE_stats[cc_idP][UE_id], 0,
+ sizeof(eNB_UE_STATS));
UE_list->UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 0;
- UE_list->UE_sched_ctrl[UE_id].ta_update = 31;
- for (j = 0; j < 8; j++) {
- UE_list->UE_template[cc_idP][UE_id].oldNDI[j] = (j == 0) ? 1 : 0; // 1 because first transmission is with format1A (Msg4) for harq_pid 0
- UE_list->UE_template[cc_idP][UE_id].oldNDI_UL[j] = (j == harq_pidP) ? 0 : 1; // 1st transmission is with Msg3;
- UE_list->UE_sched_ctrl[UE_id].round[cc_idP][j] = 8;
- UE_list->UE_sched_ctrl[UE_id].round_UL[cc_idP][j] = 0;
- }
+ UE_list->UE_sched_ctrl[UE_id].ta_update = 31;
- eNB_ulsch_info[mod_idP][cc_idP][UE_id].status = S_UL_WAITING;
- eNB_dlsch_info[mod_idP][cc_idP][UE_id].status = S_DL_WAITING;
- LOG_D(MAC, "[eNB %d] Add UE_id %d on Primary CC_id %d: rnti %x\n",
- mod_idP, UE_id, cc_idP, rntiP);
- dump_ue_list(UE_list, 0);
- return (UE_id);
+ for (j = 0; j < 8; j++) {
+ UE_list->UE_template[cc_idP][UE_id].oldNDI[j] = (j == 0) ? 1 : 0; // 1 because first transmission is with format1A (Msg4) for harq_pid 0
+ UE_list->UE_template[cc_idP][UE_id].oldNDI_UL[j] = (j == harq_pidP) ? 0 : 1; // 1st transmission is with Msg3;
+ UE_list->UE_sched_ctrl[UE_id].round[cc_idP][j] = 8;
+ UE_list->UE_sched_ctrl[UE_id].round_UL[cc_idP][j] = 0;
}
- printf("MAC: cannot add new UE for rnti %x\n", rntiP);
- LOG_E(MAC,
- "error in add_new_ue(), could not find space in UE_list, Dumping UE list\n");
+ eNB_ulsch_info[mod_idP][cc_idP][UE_id].status = S_UL_WAITING;
+ eNB_dlsch_info[mod_idP][cc_idP][UE_id].status = S_DL_WAITING;
+ LOG_D(MAC, "[eNB %d] Add UE_id %d on Primary CC_id %d: rnti %x\n",
+ mod_idP, UE_id, cc_idP, rntiP);
dump_ue_list(UE_list, 0);
- return (-1);
+ return (UE_id);
+ }
+
+ printf("MAC: cannot add new UE for rnti %x\n", rntiP);
+ LOG_E(MAC,
+ "error in add_new_ue(), could not find space in UE_list, Dumping UE list\n");
+ dump_ue_list(UE_list, 0);
+ return (-1);
}
//------------------------------------------------------------------------------
int rrc_mac_remove_ue(module_id_t mod_idP, rnti_t rntiP)
//------------------------------------------------------------------------------
{
- int i;
- int j;
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- int UE_id = find_UE_id(mod_idP,rntiP);
- int pCC_id;
-
- if (UE_id == -1) {
- LOG_W(MAC,"rrc_mac_remove_ue: UE %x not found\n", rntiP);
- return 0;
- }
-
- pCC_id = UE_PCCID(mod_idP,UE_id);
-
- LOG_I(MAC,"Removing UE %d from Primary CC_id %d (rnti %x)\n",UE_id,pCC_id, rntiP);
- dump_ue_list(UE_list,0);
-
- UE_list->active[UE_id] = FALSE;
- UE_list->num_UEs--;
-
- if (UE_list->head == UE_id) UE_list->head=UE_list->next[UE_id];
- else UE_list->next[prev(UE_list,UE_id,0)]=UE_list->next[UE_id];
- if (UE_list->head_ul == UE_id) UE_list->head_ul=UE_list->next_ul[UE_id];
- else UE_list->next_ul[prev(UE_list,UE_id,0)]=UE_list->next_ul[UE_id];
-
- // clear all remaining pending transmissions
- /* UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID0] = 0;
- UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID1] = 0;
- UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID2] = 0;
- UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID3] = 0;
-
- UE_list->UE_template[pCC_id][UE_id].ul_SR = 0;
- UE_list->UE_template[pCC_id][UE_id].rnti = NOT_A_RNTI;
- UE_list->UE_template[pCC_id][UE_id].ul_active = FALSE;
- */
- memset (&UE_list->UE_template[pCC_id][UE_id],0,sizeof(UE_TEMPLATE));
-
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_rbs_used = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_rbs_used_retx = 0;
- for ( j = 0; j < NB_RB_MAX; j++ ) {
- UE_list->eNB_UE_stats[pCC_id][UE_id].num_pdu_tx[j] = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].num_bytes_tx[j] = 0;
- }
- UE_list->eNB_UE_stats[pCC_id][UE_id].num_retransmission = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_sdu_bytes = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_pdu_bytes = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_num_pdus = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_rbs_used_rx = 0;
- for ( j = 0; j < NB_RB_MAX; j++ ) {
- UE_list->eNB_UE_stats[pCC_id][UE_id].num_pdu_rx[j] = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].num_bytes_rx[j] = 0;
- }
- UE_list->eNB_UE_stats[pCC_id][UE_id].num_errors_rx = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_pdu_bytes_rx = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_num_pdus_rx = 0;
- UE_list->eNB_UE_stats[pCC_id][UE_id].total_num_errors_rx = 0;
-
- eNB_ulsch_info[mod_idP][pCC_id][UE_id].rnti = NOT_A_RNTI;
- eNB_ulsch_info[mod_idP][pCC_id][UE_id].status = S_UL_NONE;
- eNB_dlsch_info[mod_idP][pCC_id][UE_id].rnti = NOT_A_RNTI;
- eNB_dlsch_info[mod_idP][pCC_id][UE_id].status = S_DL_NONE;
-
- eNB_ulsch_info[mod_idP][pCC_id][UE_id].serving_num = 0;
- eNB_dlsch_info[mod_idP][pCC_id][UE_id].serving_num = 0;
-
- // check if this has an RA process active
- RA_t *ra;
- for (i = 0; i < NB_RA_PROC_MAX; i++) {
- ra = (RA_t *) & RC.mac[mod_idP]->common_channels[pCC_id].ra[i];
- if (ra->rnti == rntiP) {
- ra->state = IDLE;
- ra->timing_offset = 0;
- ra->RRC_timer = 20;
- ra->rnti = 0;
- //break;
- }
- }
+ int i;
+ int j;
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ int UE_id = find_UE_id(mod_idP,rntiP);
+ int pCC_id;
+
+ if (UE_id == -1) {
+ LOG_W(MAC,"rrc_mac_remove_ue: UE %x not found\n", rntiP);
return 0;
+ }
+
+ pCC_id = UE_PCCID(mod_idP,UE_id);
+
+ LOG_I(MAC,"Removing UE %d from Primary CC_id %d (rnti %x)\n",UE_id,pCC_id, rntiP);
+ dump_ue_list(UE_list,0);
+
+ UE_list->active[UE_id] = FALSE;
+ UE_list->num_UEs--;
+
+ if (UE_list->head == UE_id) UE_list->head=UE_list->next[UE_id];
+ else UE_list->next[prev(UE_list,UE_id,0)]=UE_list->next[UE_id];
+ if (UE_list->head_ul == UE_id) UE_list->head_ul=UE_list->next_ul[UE_id];
+ else UE_list->next_ul[prev(UE_list,UE_id,0)]=UE_list->next_ul[UE_id];
+
+ // clear all remaining pending transmissions
+ /* UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID0] = 0;
+ UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID1] = 0;
+ UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID2] = 0;
+ UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID3] = 0;
+
+ UE_list->UE_template[pCC_id][UE_id].ul_SR = 0;
+ UE_list->UE_template[pCC_id][UE_id].rnti = NOT_A_RNTI;
+ UE_list->UE_template[pCC_id][UE_id].ul_active = FALSE;
+ */
+ memset (&UE_list->UE_template[pCC_id][UE_id],0,sizeof(UE_TEMPLATE));
+
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_rbs_used = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_rbs_used_retx = 0;
+ for ( j = 0; j < NB_RB_MAX; j++ ) {
+ UE_list->eNB_UE_stats[pCC_id][UE_id].num_pdu_tx[j] = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].num_bytes_tx[j] = 0;
+ }
+ UE_list->eNB_UE_stats[pCC_id][UE_id].num_retransmission = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_sdu_bytes = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_pdu_bytes = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_num_pdus = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_rbs_used_rx = 0;
+ for ( j = 0; j < NB_RB_MAX; j++ ) {
+ UE_list->eNB_UE_stats[pCC_id][UE_id].num_pdu_rx[j] = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].num_bytes_rx[j] = 0;
+ }
+ UE_list->eNB_UE_stats[pCC_id][UE_id].num_errors_rx = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_pdu_bytes_rx = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_num_pdus_rx = 0;
+ UE_list->eNB_UE_stats[pCC_id][UE_id].total_num_errors_rx = 0;
+
+ eNB_ulsch_info[mod_idP][pCC_id][UE_id].rnti = NOT_A_RNTI;
+ eNB_ulsch_info[mod_idP][pCC_id][UE_id].status = S_UL_NONE;
+ eNB_dlsch_info[mod_idP][pCC_id][UE_id].rnti = NOT_A_RNTI;
+ eNB_dlsch_info[mod_idP][pCC_id][UE_id].status = S_DL_NONE;
+
+ eNB_ulsch_info[mod_idP][pCC_id][UE_id].serving_num = 0;
+ eNB_dlsch_info[mod_idP][pCC_id][UE_id].serving_num = 0;
+
+ // check if this has an RA process active
+ RA_t *ra;
+ for (i = 0; i < NB_RA_PROC_MAX; i++) {
+ ra = (RA_t *) & RC.mac[mod_idP]->common_channels[pCC_id].ra[i];
+ if (ra->rnti == rntiP) {
+ ra->state = IDLE;
+ ra->timing_offset = 0;
+ ra->RRC_timer = 20;
+ ra->rnti = 0;
+ //break;
+ }
+ }
+
+ return 0;
}
int prev(UE_list_t * listP, int nodeP, int ul_flag)
{
- int j;
+ int j;
- if (ul_flag == 0) {
- if (nodeP == listP->head) {
- return (nodeP);
- }
+ if (ul_flag == 0) {
+ if (nodeP == listP->head) {
+ return (nodeP);
+ }
- for (j = listP->head; j >= 0; j = listP->next[j]) {
- if (listP->next[j] == nodeP) {
- return (j);
- }
- }
- } else {
- if (nodeP == listP->head_ul) {
- return (nodeP);
- }
+ for (j = listP->head; j >= 0; j = listP->next[j]) {
+ if (listP->next[j] == nodeP) {
+ return (j);
+ }
+ }
+ } else {
+ if (nodeP == listP->head_ul) {
+ return (nodeP);
+ }
- for (j = listP->head_ul; j >= 0; j = listP->next_ul[j]) {
- if (listP->next_ul[j] == nodeP) {
- return (j);
- }
- }
+ for (j = listP->head_ul; j >= 0; j = listP->next_ul[j]) {
+ if (listP->next_ul[j] == nodeP) {
+ return (j);
+ }
}
+ }
- LOG_E(MAC,
- "error in prev(), could not find previous to %d in UE_list %s, should never happen, Dumping UE list\n",
- nodeP, (ul_flag == 0) ? "DL" : "UL");
- dump_ue_list(listP, ul_flag);
+ LOG_E(MAC,
+ "error in prev(), could not find previous to %d in UE_list %s, should never happen, Dumping UE list\n",
+ nodeP, (ul_flag == 0) ? "DL" : "UL");
+ dump_ue_list(listP, ul_flag);
- return (-1);
+ return (-1);
}
void swap_UEs(UE_list_t * listP, int nodeiP, int nodejP, int ul_flag)
{
- int prev_i, prev_j, next_i, next_j;
+ int prev_i, prev_j, next_i, next_j;
- LOG_T(MAC, "Swapping UE %d,%d\n", nodeiP, nodejP);
- dump_ue_list(listP, ul_flag);
+ LOG_T(MAC, "Swapping UE %d,%d\n", nodeiP, nodejP);
+ dump_ue_list(listP, ul_flag);
- prev_i = prev(listP, nodeiP, ul_flag);
- prev_j = prev(listP, nodejP, ul_flag);
+ prev_i = prev(listP, nodeiP, ul_flag);
+ prev_j = prev(listP, nodejP, ul_flag);
- AssertFatal((prev_i >= 0) && (prev_j >= 0), "swap_UEs: problem");
+ AssertFatal((prev_i >= 0) && (prev_j >= 0), "swap_UEs: problem");
- if (ul_flag == 0) {
- next_i = listP->next[nodeiP];
- next_j = listP->next[nodejP];
- } else {
- next_i = listP->next_ul[nodeiP];
- next_j = listP->next_ul[nodejP];
- }
+ if (ul_flag == 0) {
+ next_i = listP->next[nodeiP];
+ next_j = listP->next[nodejP];
+ } else {
+ next_i = listP->next_ul[nodeiP];
+ next_j = listP->next_ul[nodejP];
+ }
- LOG_T(MAC, "[%s] next_i %d, next_i, next_j %d, head %d \n",
- (ul_flag == 0) ? "DL" : "UL", next_i, next_j, listP->head);
-
- if (ul_flag == 0) {
-
- if (next_i == nodejP) { // case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...
- LOG_T(MAC,
- "Case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...\n");
-
- listP->next[nodeiP] = next_j;
- listP->next[nodejP] = nodeiP;
-
- if (nodeiP == listP->head) { // case i j n(j)
- listP->head = nodejP;
- } else {
- listP->next[prev_i] = nodejP;
- }
- } else if (next_j == nodeiP) { // case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...
- LOG_T(MAC,
- "Case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...\n");
- listP->next[nodejP] = next_i;
- listP->next[nodeiP] = nodejP;
-
- if (nodejP == listP->head) { // case j i n(i)
- listP->head = nodeiP;
- } else {
- listP->next[prev_j] = nodeiP;
- }
- } else { // case ... p(i) i n(i) ... p(j) j n(j) ...
- listP->next[nodejP] = next_i;
- listP->next[nodeiP] = next_j;
-
- if (nodeiP == listP->head) {
- LOG_T(MAC, "changing head to %d\n", nodejP);
- listP->head = nodejP;
- listP->next[prev_j] = nodeiP;
- } else if (nodejP == listP->head) {
- LOG_D(MAC, "changing head to %d\n", nodeiP);
- listP->head = nodeiP;
- listP->next[prev_i] = nodejP;
- } else {
- listP->next[prev_i] = nodejP;
- listP->next[prev_j] = nodeiP;
- }
- }
- } else { // ul_flag
-
- if (next_i == nodejP) { // case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...
- LOG_T(MAC,
- "[UL] Case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...\n");
-
- listP->next_ul[nodeiP] = next_j;
- listP->next_ul[nodejP] = nodeiP;
-
- if (nodeiP == listP->head_ul) { // case i j n(j)
- listP->head_ul = nodejP;
- } else {
- listP->next_ul[prev_i] = nodejP;
- }
- } else if (next_j == nodeiP) { // case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...
- LOG_T(MAC,
- "[UL]Case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...\n");
- listP->next_ul[nodejP] = next_i;
- listP->next_ul[nodeiP] = nodejP;
-
- if (nodejP == listP->head_ul) { // case j i n(i)
- listP->head_ul = nodeiP;
- } else {
- listP->next_ul[prev_j] = nodeiP;
- }
- } else { // case ... p(i) i n(i) ... p(j) j n(j) ...
-
- listP->next_ul[nodejP] = next_i;
- listP->next_ul[nodeiP] = next_j;
-
- if (nodeiP == listP->head_ul) {
- LOG_T(MAC, "[UL]changing head to %d\n", nodejP);
- listP->head_ul = nodejP;
- listP->next_ul[prev_j] = nodeiP;
- } else if (nodejP == listP->head_ul) {
- LOG_T(MAC, "[UL]changing head to %d\n", nodeiP);
- listP->head_ul = nodeiP;
- listP->next_ul[prev_i] = nodejP;
- } else {
- listP->next_ul[prev_i] = nodejP;
- listP->next_ul[prev_j] = nodeiP;
- }
- }
- }
+ LOG_T(MAC, "[%s] next_i %d, next_i, next_j %d, head %d \n",
+ (ul_flag == 0) ? "DL" : "UL", next_i, next_j, listP->head);
- LOG_T(MAC, "After swap\n");
- dump_ue_list(listP, ul_flag);
-}
+ if (ul_flag == 0) {
-/*
- #if defined(Rel10) || defined(Rel14)
- unsigned char generate_mch_header( unsigned char *mac_header,
- unsigned char num_sdus,
- unsigned short *sdu_lengths,
- unsigned char *sdu_lcids,
- unsigned char msi,
- unsigned char short_padding,
- unsigned short post_padding) {
-
- SCH_SUBHEADER_FIXED *mac_header_ptr = (SCH_SUBHEADER_FIXED *)mac_header;
- uint8_t first_element=0,last_size=0,i;
- uint8_t mac_header_control_elements[2*num_sdus],*ce_ptr;
-
- ce_ptr = &mac_header_control_elements[0];
-
- if ((short_padding == 1) || (short_padding == 2)) {
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = SHORT_PADDING;
- first_element=1;
- last_size=1;
- }
- if (short_padding == 2) {
- mac_header_ptr->E = 1;
- mac_header_ptr++;
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = SHORT_PADDING;
- last_size=1;
- }
+ if (next_i == nodejP) { // case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...
+ LOG_T(MAC,
+ "Case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...\n");
- // SUBHEADER for MSI CE
- if (msi != 0) {// there is MSI MAC Control Element
- if (first_element>0) {
- mac_header_ptr->E = 1;
- mac_header_ptr+=last_size;
- }
- else {
- first_element = 1;
- }
- if (num_sdus*2 < 128) {
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->R = 0;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->E = 0;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->F = 0;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->LCID = MCH_SCHDL_INFO;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->L = num_sdus*2;
- last_size=2;
- }
- else {
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->R = 0;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->E = 0;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->F = 1;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->LCID = MCH_SCHDL_INFO;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->L = (num_sdus*2)&0x7fff;
- last_size=3;
- }
- // Create the MSI MAC Control Element here
- }
+ listP->next[nodeiP] = next_j;
+ listP->next[nodejP] = nodeiP;
- // SUBHEADER for MAC SDU (MCCH+MTCHs)
- for (i=0;i<num_sdus;i++) {
- if (first_element>0) {
- mac_header_ptr->E = 1;
- mac_header_ptr+=last_size;
- }
- else {
- first_element = 1;
- }
- if (sdu_lengths[i] < 128) {
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->R = 0;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->E = 0;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->F = 0;
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->LCID = sdu_lcids[i];
- ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->L = (unsigned char)sdu_lengths[i];
- last_size=2;
- }
- else {
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->R = 0;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->E = 0;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->F = 1;
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->LCID = sdu_lcids[i];
- ((SCH_SUBHEADER_LONG *)mac_header_ptr)->L = (unsigned short) sdu_lengths[i]&0x7fff;
- last_size=3;
- }
- }
+ if (nodeiP == listP->head) { // case i j n(j)
+ listP->head = nodejP;
+ } else {
+ listP->next[prev_i] = nodejP;
+ }
+ } else if (next_j == nodeiP) { // case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...
+ LOG_T(MAC,
+ "Case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...\n");
+ listP->next[nodejP] = next_i;
+ listP->next[nodeiP] = nodejP;
+
+ if (nodejP == listP->head) { // case j i n(i)
+ listP->head = nodeiP;
+ } else {
+ listP->next[prev_j] = nodeiP;
+ }
+ } else { // case ... p(i) i n(i) ... p(j) j n(j) ...
+ listP->next[nodejP] = next_i;
+ listP->next[nodeiP] = next_j;
+
+ if (nodeiP == listP->head) {
+ LOG_T(MAC, "changing head to %d\n", nodejP);
+ listP->head = nodejP;
+ listP->next[prev_j] = nodeiP;
+ } else if (nodejP == listP->head) {
+ LOG_D(MAC, "changing head to %d\n", nodeiP);
+ listP->head = nodeiP;
+ listP->next[prev_i] = nodejP;
+ } else {
+ listP->next[prev_i] = nodejP;
+ listP->next[prev_j] = nodeiP;
+ }
+ }
+ } else { // ul_flag
- if (post_padding>0) {// we have lots of padding at the end of the packet
- mac_header_ptr->E = 1;
- mac_header_ptr+=last_size;
- // add a padding element
- mac_header_ptr->R = 0;
- mac_header_ptr->E = 0;
- mac_header_ptr->LCID = SHORT_PADDING;
- mac_header_ptr++;
- }
- else { // no end of packet padding
- // last SDU subhead is of fixed type (sdu length implicitly to be computed at UE)
- mac_header_ptr++;
- }
+ if (next_i == nodejP) { // case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...
+ LOG_T(MAC,
+ "[UL] Case ... p(i) i j n(j) ... => ... p(j) j i n(i) ...\n");
- // Copy MSI Control Element to the end of the MAC Header if it presents
- if ((ce_ptr-mac_header_control_elements) > 0) {
- // printf("Copying %d bytes for control elements\n",ce_ptr-mac_header_control_elements);
- memcpy((void*)mac_header_ptr,mac_header_control_elements,ce_ptr-mac_header_control_elements);
- mac_header_ptr+=(unsigned char)(ce_ptr-mac_header_control_elements);
- }
+ listP->next_ul[nodeiP] = next_j;
+ listP->next_ul[nodejP] = nodeiP;
- return((unsigned char*)mac_header_ptr - mac_header);
+ if (nodeiP == listP->head_ul) { // case i j n(j)
+ listP->head_ul = nodejP;
+ } else {
+ listP->next_ul[prev_i] = nodejP;
+ }
+ } else if (next_j == nodeiP) { // case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...
+ LOG_T(MAC,
+ "[UL]Case ... p(j) j i n(i) ... => ... p(i) i j n(j) ...\n");
+ listP->next_ul[nodejP] = next_i;
+ listP->next_ul[nodeiP] = nodejP;
+
+ if (nodejP == listP->head_ul) { // case j i n(i)
+ listP->head_ul = nodeiP;
+ } else {
+ listP->next_ul[prev_j] = nodeiP;
+ }
+ } else { // case ... p(i) i n(i) ... p(j) j n(j) ...
+
+ listP->next_ul[nodejP] = next_i;
+ listP->next_ul[nodeiP] = next_j;
+
+ if (nodeiP == listP->head_ul) {
+ LOG_T(MAC, "[UL]changing head to %d\n", nodejP);
+ listP->head_ul = nodejP;
+ listP->next_ul[prev_j] = nodeiP;
+ } else if (nodejP == listP->head_ul) {
+ LOG_T(MAC, "[UL]changing head to %d\n", nodeiP);
+ listP->head_ul = nodeiP;
+ listP->next_ul[prev_i] = nodejP;
+ } else {
+ listP->next_ul[prev_i] = nodejP;
+ listP->next_ul[prev_j] = nodeiP;
+ }
+ }
}
- #endif
- */
+
+ LOG_T(MAC, "After swap\n");
+ dump_ue_list(listP, ul_flag);
+}
// This has to be updated to include BSR information
uint8_t
UE_is_to_be_scheduled(module_id_t module_idP, int CC_id, uint8_t UE_id)
{
- UE_TEMPLATE *UE_template =
- &RC.mac[module_idP]->UE_list.UE_template[CC_id][UE_id];
- UE_sched_ctrl *UE_sched_ctl =
- &RC.mac[module_idP]->UE_list.UE_sched_ctrl[UE_id];
-
- // do not schedule UE if UL is not working
- if (UE_sched_ctl->ul_failure_timer > 0)
- return (0);
- if (UE_sched_ctl->ul_out_of_sync > 0)
- return (0);
-
- LOG_D(MAC, "[eNB %d][PUSCH] Checking UL requirements UE %d/%x\n",
- module_idP, UE_id, UE_RNTI(module_idP, UE_id));
-
- if ((UE_template->bsr_info[LCGID0] > 0) || (UE_template->bsr_info[LCGID1] > 0) || (UE_template->bsr_info[LCGID2] > 0) || (UE_template->bsr_info[LCGID3] > 0) || (UE_template->ul_SR > 0) || // uplink scheduling request
- ((UE_sched_ctl->ul_inactivity_timer > 20) && (UE_sched_ctl->ul_scheduled == 0)) || // every 2 frames when RRC_CONNECTED
- ((UE_sched_ctl->ul_inactivity_timer > 10) && (UE_sched_ctl->ul_scheduled == 0) && (mac_eNB_get_rrc_status(module_idP, UE_RNTI(module_idP, UE_id)) < RRC_CONNECTED))) // every Frame when not RRC_CONNECTED
+ UE_TEMPLATE *UE_template =
+ &RC.mac[module_idP]->UE_list.UE_template[CC_id][UE_id];
+ UE_sched_ctrl *UE_sched_ctl =
+ &RC.mac[module_idP]->UE_list.UE_sched_ctrl[UE_id];
+
+ // do not schedule UE if UL is not working
+ if (UE_sched_ctl->ul_failure_timer > 0)
+ return (0);
+ if (UE_sched_ctl->ul_out_of_sync > 0)
+ return (0);
+
+ LOG_D(MAC, "[eNB %d][PUSCH] Checking UL requirements UE %d/%x\n",
+ module_idP, UE_id, UE_RNTI(module_idP, UE_id));
+
+ if ((UE_template->scheduled_ul_bytes < UE_template->estimated_ul_buffer) ||
+ (UE_template->ul_SR > 0) || // uplink scheduling request
+ ((UE_sched_ctl->ul_inactivity_timer > 20) && (UE_sched_ctl->ul_scheduled == 0)) || // every 2 frames when RRC_CONNECTED
+ ((UE_sched_ctl->ul_inactivity_timer > 10) && (UE_sched_ctl->ul_scheduled == 0) && (mac_eNB_get_rrc_status(module_idP, UE_RNTI(module_idP, UE_id)) < RRC_CONNECTED))) // every Frame when not RRC_CONNECTED
{
- LOG_D(MAC,
- "[eNB %d][PUSCH] UE %d/%x should be scheduled (BSR0 %d,SR %d)\n",
- module_idP, UE_id, UE_RNTI(module_idP, UE_id),
- UE_template->bsr_info[LCGID0], UE_template->ul_SR);
- return (1);
+ LOG_D(MAC,
+ "[eNB %d][PUSCH] UE %d/%x should be scheduled (BSR0 estimated size %d, SR %d)\n",
+ module_idP, UE_id, UE_RNTI(module_idP, UE_id),
+ UE_template->ul_buffer_info[LCGID0], UE_template->ul_SR);
+ return (1);
} else {
- return (0);
- }
+ return (0);
+ }
}
uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP)
{
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
-
- struct PhysicalConfigDedicated *physicalConfigDedicated =
- eNB->UE_list.physicalConfigDedicated[CC_idP][UE_idP];
-
- if (physicalConfigDedicated == NULL) { // RRCConnectionSetup not received by UE yet
- AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
- cc->p_eNB);
- return (cc->p_eNB);
- } else {
- AssertFatal(physicalConfigDedicated->antennaInfo != NULL,
- "antennaInfo is null for CCId %d, UEid %d\n", CC_idP,
- UE_idP);
-
- AssertFatal(physicalConfigDedicated->antennaInfo->present !=
- PhysicalConfigDedicated__antennaInfo_PR_NOTHING,
- "antennaInfo (mod_id %d, CC_id %d) is set to NOTHING\n",
- module_idP, CC_idP);
-
- if (physicalConfigDedicated->antennaInfo->present ==
- PhysicalConfigDedicated__antennaInfo_PR_explicitValue) {
- return (physicalConfigDedicated->antennaInfo->
- choice.explicitValue.transmissionMode);
- } else if (physicalConfigDedicated->antennaInfo->present ==
- PhysicalConfigDedicated__antennaInfo_PR_defaultValue) {
- AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
- cc->p_eNB);
- return (cc->p_eNB);
- } else
- AssertFatal(1 == 0, "Shouldn't be here\n");
- }
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
+
+ struct PhysicalConfigDedicated *physicalConfigDedicated =
+ eNB->UE_list.physicalConfigDedicated[CC_idP][UE_idP];
+
+ if (physicalConfigDedicated == NULL) { // RRCConnectionSetup not received by UE yet
+ AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
+ cc->p_eNB);
+ return (cc->p_eNB);
+ } else {
+ AssertFatal(physicalConfigDedicated->antennaInfo != NULL,
+ "antennaInfo is null for CCId %d, UEid %d\n", CC_idP,
+ UE_idP);
+
+ AssertFatal(physicalConfigDedicated->antennaInfo->present !=
+ PhysicalConfigDedicated__antennaInfo_PR_NOTHING,
+ "antennaInfo (mod_id %d, CC_id %d) is set to NOTHING\n",
+ module_idP, CC_idP);
+
+ if (physicalConfigDedicated->antennaInfo->present ==
+ PhysicalConfigDedicated__antennaInfo_PR_explicitValue) {
+ return (physicalConfigDedicated->antennaInfo->
+ choice.explicitValue.transmissionMode);
+ } else if (physicalConfigDedicated->antennaInfo->present ==
+ PhysicalConfigDedicated__antennaInfo_PR_defaultValue) {
+ AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
+ cc->p_eNB);
+ return (cc->p_eNB);
+ } else
+ AssertFatal(1 == 0, "Shouldn't be here\n");
+ }
}
int8_t
get_ULharq(module_id_t module_idP, int CC_idP, uint16_t frameP,
uint8_t subframeP)
{
- uint8_t ret = -1;
- eNB_MAC_INST *eNB = RC.mac[module_idP];
- COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
-
- if (cc->tdd_Config == NULL) { // FDD
- ret = (((frameP << 1) + subframeP) & 7);
- } else {
- switch (cc->tdd_Config->subframeAssignment) {
- case 1:
- if ((subframeP == 2) ||
- (subframeP == 3) || (subframeP == 7) || (subframeP == 8))
- switch (subframeP) {
- case 2:
- case 3:
- ret = (subframeP - 2);
- break;
-
- case 7:
- case 8:
- ret = (subframeP - 5);
- break;
-
- default:
- AssertFatal(1 == 0,
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframeP,
- (int) cc->tdd_Config->subframeAssignment);
- break;
- }
-
- break;
+ uint8_t ret = -1;
+ eNB_MAC_INST *eNB = RC.mac[module_idP];
+ COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
+ if (cc->tdd_Config == NULL) { // FDD
+ ret = (((frameP << 1) + subframeP) & 7);
+ } else {
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 1:
+ if ((subframeP == 2) ||
+ (subframeP == 3) || (subframeP == 7) || (subframeP == 8))
+ switch (subframeP) {
case 2:
- AssertFatal((subframeP == 2) || (subframeP == 7),
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframeP,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframeP / 7);
- break;
-
case 3:
- AssertFatal((subframeP > 1) && (subframeP < 5),
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframeP,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframeP - 2);
- break;
-
- case 4:
- AssertFatal((subframeP > 1) && (subframeP < 4),
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframeP,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframeP - 2);
- break;
-
- case 5:
- AssertFatal(subframeP == 2,
- "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
- subframeP,
- (int) cc->tdd_Config->subframeAssignment);
- ret = (subframeP - 2);
- break;
+ ret = (subframeP - 2);
+ break;
+
+ case 7:
+ case 8:
+ ret = (subframeP - 5);
+ break;
default:
- AssertFatal(1 == 0,
- "subframe2_harq_pid, Unsupported TDD mode %d\n",
- (int) cc->tdd_Config->subframeAssignment);
- break;
+ AssertFatal(1 == 0,
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframeP,
+ (int) cc->tdd_Config->subframeAssignment);
+ break;
}
+
+ break;
+
+ case 2:
+ AssertFatal((subframeP == 2) || (subframeP == 7),
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframeP,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframeP / 7);
+ break;
+
+ case 3:
+ AssertFatal((subframeP > 1) && (subframeP < 5),
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframeP,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframeP - 2);
+ break;
+
+ case 4:
+ AssertFatal((subframeP > 1) && (subframeP < 4),
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframeP,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframeP - 2);
+ break;
+
+ case 5:
+ AssertFatal(subframeP == 2,
+ "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+ subframeP,
+ (int) cc->tdd_Config->subframeAssignment);
+ ret = (subframeP - 2);
+ break;
+
+ default:
+ AssertFatal(1 == 0,
+ "subframe2_harq_pid, Unsupported TDD mode %d\n",
+ (int) cc->tdd_Config->subframeAssignment);
+ break;
}
+ }
- AssertFatal(ret != -1,
- "invalid harq_pid(%d) at SFN/SF = %d/%d\n", (int8_t) ret,
- frameP, subframeP);
- return ret;
+ AssertFatal(ret != -1,
+ "invalid harq_pid(%d) at SFN/SF = %d/%d\n", (int8_t) ret,
+ frameP, subframeP);
+ return ret;
}
uint16_t getRIV(uint16_t N_RB_DL, uint16_t RBstart, uint16_t Lcrbs)
{
- uint16_t RIV;
+ uint16_t RIV;
- if (Lcrbs <= (1 + (N_RB_DL >> 1)))
- RIV = (N_RB_DL * (Lcrbs - 1)) + RBstart;
- else
- RIV = (N_RB_DL * (N_RB_DL + 1 - Lcrbs)) + (N_RB_DL - 1 - RBstart);
+ if (Lcrbs <= (1 + (N_RB_DL >> 1)))
+ RIV = (N_RB_DL * (Lcrbs - 1)) + RBstart;
+ else
+ RIV = (N_RB_DL * (N_RB_DL + 1 - Lcrbs)) + (N_RB_DL - 1 - RBstart);
- return (RIV);
+ return (RIV);
}
uint32_t
allocate_prbs(int UE_id, unsigned char nb_rb, int N_RB_DL,
uint32_t * rballoc)
{
- int i;
- uint32_t rballoc_dci = 0;
- unsigned char nb_rb_alloc = 0;
-
- for (i = 0; i < (N_RB_DL - 2); i += 2) {
- if (((*rballoc >> i) & 3) == 0) {
- *rballoc |= (3 << i);
- rballoc_dci |= (1 << ((12 - i) >> 1));
- nb_rb_alloc += 2;
- }
+ int i;
+ uint32_t rballoc_dci = 0;
+ unsigned char nb_rb_alloc = 0;
- if (nb_rb_alloc == nb_rb) {
- return (rballoc_dci);
- }
+ for (i = 0; i < (N_RB_DL - 2); i += 2) {
+ if (((*rballoc >> i) & 3) == 0) {
+ *rballoc |= (3 << i);
+ rballoc_dci |= (1 << ((12 - i) >> 1));
+ nb_rb_alloc += 2;
}
- if ((N_RB_DL & 1) == 1) {
- if ((*rballoc >> (N_RB_DL - 1) & 1) == 0) {
- *rballoc |= (1 << (N_RB_DL - 1));
- rballoc_dci |= 1;
- }
+ if (nb_rb_alloc == nb_rb) {
+ return (rballoc_dci);
+ }
+ }
+
+ if ((N_RB_DL & 1) == 1) {
+ if ((*rballoc >> (N_RB_DL - 1) & 1) == 0) {
+ *rballoc |= (1 << (N_RB_DL - 1));
+ rballoc_dci |= 1;
}
+ }
- return (rballoc_dci);
+ return (rballoc_dci);
}
int get_bw_index(module_id_t module_id, uint8_t CC_id)
{
- int bw_index = 0;
+ int bw_index = 0;
- int N_RB_DL =
- to_prb(RC.mac[module_id]->common_channels[CC_id].mib->
- message.dl_Bandwidth);
+ int N_RB_DL =
+ to_prb(RC.mac[module_id]->common_channels[CC_id].mib->
+ message.dl_Bandwidth);
- switch (N_RB_DL) {
- case 6: // 1.4 MHz
- bw_index = 0;
- break;
+ switch (N_RB_DL) {
+ case 6: // 1.4 MHz
+ bw_index = 0;
+ break;
- case 25: // 5HMz
- bw_index = 1;
- break;
+ case 25: // 5HMz
+ bw_index = 1;
+ break;
- case 50: // 10HMz
- bw_index = 2;
- break;
+ case 50: // 10HMz
+ bw_index = 2;
+ break;
- case 100: // 20HMz
- bw_index = 3;
- break;
+ case 100: // 20HMz
+ bw_index = 3;
+ break;
- default:
- bw_index = 1;
- LOG_W(MAC,
- "[eNB %d] N_RB_DL %d unknown for CC_id %d, setting bw_index to 1\n",
- module_id, N_RB_DL, CC_id);
- break;
- }
+ default:
+ bw_index = 1;
+ LOG_W(MAC,
+ "[eNB %d] N_RB_DL %d unknown for CC_id %d, setting bw_index to 1\n",
+ module_id, N_RB_DL, CC_id);
+ break;
+ }
- return bw_index;
+ return bw_index;
}
int get_min_rb_unit(module_id_t module_id, uint8_t CC_id)
{
- int min_rb_unit = 0;
- int N_RB_DL =
- to_prb(RC.mac[module_id]->common_channels[CC_id].mib->
- message.dl_Bandwidth);
+ int min_rb_unit = 0;
+ int N_RB_DL =
+ to_prb(RC.mac[module_id]->common_channels[CC_id].mib->
+ message.dl_Bandwidth);
- switch (N_RB_DL) {
- case 6: // 1.4 MHz
- min_rb_unit = 1;
- break;
+ switch (N_RB_DL) {
+ case 6: // 1.4 MHz
+ min_rb_unit = 1;
+ break;
- case 25: // 5HMz
- min_rb_unit = 2;
- break;
+ case 25: // 5HMz
+ min_rb_unit = 2;
+ break;
- case 50: // 10HMz
- min_rb_unit = 3;
- break;
+ case 50: // 10HMz
+ min_rb_unit = 3;
+ break;
- case 100: // 20HMz
- min_rb_unit = 4;
- break;
+ case 100: // 20HMz
+ min_rb_unit = 4;
+ break;
- default:
- min_rb_unit = 2;
- LOG_W(MAC,
- "[eNB %d] N_DL_RB %d unknown for CC_id %d, setting min_rb_unit to 2\n",
- module_id, N_RB_DL, CC_id);
- break;
- }
+ default:
+ min_rb_unit = 2;
+ LOG_W(MAC,
+ "[eNB %d] N_DL_RB %d unknown for CC_id %d, setting min_rb_unit to 2\n",
+ module_id, N_RB_DL, CC_id);
+ break;
+ }
- return min_rb_unit;
+ return min_rb_unit;
}
uint32_t
allocate_prbs_sub(int nb_rb, int N_RB_DL, int N_RBG, uint8_t * rballoc)
{
- int check = 0; //check1=0,check2=0;
- uint32_t rballoc_dci = 0;
- //uint8_t number_of_subbands=13;
-
- LOG_T(MAC, "*****Check1RBALLOC****: %d%d%d%d (nb_rb %d,N_RBG %d)\n",
- rballoc[3], rballoc[2], rballoc[1], rballoc[0], nb_rb, N_RBG);
-
- while ((nb_rb > 0) && (check < N_RBG)) {
- //printf("rballoc[%d] %d\n",check,rballoc[check]);
- if (rballoc[check] == 1) {
- rballoc_dci |= (1 << ((N_RBG - 1) - check));
-
- switch (N_RB_DL) {
- case 6:
- nb_rb--;
- break;
-
- case 25:
- if ((check == N_RBG - 1)) {
- nb_rb--;
- } else {
- nb_rb -= 2;
- }
-
- break;
-
- case 50:
- if ((check == N_RBG - 1)) {
- nb_rb -= 2;
- } else {
- nb_rb -= 3;
- }
-
- break;
-
- case 100:
- nb_rb -= 4;
- break;
- }
+ int check = 0; //check1=0,check2=0;
+ uint32_t rballoc_dci = 0;
+ //uint8_t number_of_subbands=13;
+
+ LOG_T(MAC, "*****Check1RBALLOC****: %d%d%d%d (nb_rb %d,N_RBG %d)\n",
+ rballoc[3], rballoc[2], rballoc[1], rballoc[0], nb_rb, N_RBG);
+
+ while ((nb_rb > 0) && (check < N_RBG)) {
+ //printf("rballoc[%d] %d\n",check,rballoc[check]);
+ if (rballoc[check] == 1) {
+ rballoc_dci |= (1 << ((N_RBG - 1) - check));
+
+ switch (N_RB_DL) {
+ case 6:
+ nb_rb--;
+ break;
+
+ case 25:
+ if ((check == N_RBG - 1)) {
+ nb_rb--;
+ } else {
+ nb_rb -= 2;
+ }
+
+ break;
+
+ case 50:
+ if ((check == N_RBG - 1)) {
+ nb_rb -= 2;
+ } else {
+ nb_rb -= 3;
}
- // printf("rb_alloc %x\n",rballoc_dci);
- check = check + 1;
- // check1 = check1+2;
+
+ break;
+
+ case 100:
+ nb_rb -= 4;
+ break;
+ }
}
+ // printf("rb_alloc %x\n",rballoc_dci);
+ check = check + 1;
+ // check1 = check1+2;
+ }
- // rballoc_dci = (rballoc_dci)&(0x1fff);
- LOG_T(MAC, "*********RBALLOC : %x\n", rballoc_dci);
- // exit(-1);
- return (rballoc_dci);
+ // rballoc_dci = (rballoc_dci)&(0x1fff);
+ LOG_T(MAC, "*********RBALLOC : %x\n", rballoc_dci);
+ // exit(-1);
+ return (rballoc_dci);
}
int get_subbandsize(uint8_t dl_Bandwidth)
{
- uint8_t ss[6] = { 6, 4, 4, 6, 8, 8 };
+ uint8_t ss[6] = { 6, 4, 4, 6, 8, 8 };
- AssertFatal(dl_Bandwidth < 6, "dl_Bandwidth %d is out of bounds\n",
- dl_Bandwidth);
+ AssertFatal(dl_Bandwidth < 6, "dl_Bandwidth %d is out of bounds\n",
+ dl_Bandwidth);
- return (ss[dl_Bandwidth]);
+ return (ss[dl_Bandwidth]);
}
int get_nb_subband(int N_RB_DL)
{
- int nb_sb = 0;
+ int nb_sb = 0;
- switch (N_RB_DL) {
- case 6:
- nb_sb = 0;
- break;
+ switch (N_RB_DL) {
+ case 6:
+ nb_sb = 0;
+ break;
- case 15:
- nb_sb = 4; // sb_size =4
+ case 15:
+ nb_sb = 4; // sb_size =4
- case 25:
- nb_sb = 7; // sb_size =4, 1 sb with 1PRB, 6 with 2 RBG, each has 2 PRBs
- break;
+ case 25:
+ nb_sb = 7; // sb_size =4, 1 sb with 1PRB, 6 with 2 RBG, each has 2 PRBs
+ break;
- case 50: // sb_size =6
- nb_sb = 9;
- break;
+ case 50: // sb_size =6
+ nb_sb = 9;
+ break;
- case 75: // sb_size =8
- nb_sb = 10;
- break;
+ case 75: // sb_size =8
+ nb_sb = 10;
+ break;
- case 100: // sb_size =8 , 1 sb with 1 RBG + 12 sb with 2RBG, each RBG has 4 PRBs
- nb_sb = 13;
- break;
+ case 100: // sb_size =8 , 1 sb with 1 RBG + 12 sb with 2RBG, each RBG has 4 PRBs
+ nb_sb = 13;
+ break;
- default:
- nb_sb = 0;
- break;
- }
+ default:
+ nb_sb = 0;
+ break;
+ }
- return nb_sb;
+ return nb_sb;
}
void init_CCE_table(int module_idP, int CC_idP)
{
- memset(RC.mac[module_idP]->CCE_table[CC_idP], 0, 800 * sizeof(int));
+ memset(RC.mac[module_idP]->CCE_table[CC_idP], 0, 800 * sizeof(int));
}
@@ -2847,711 +2504,626 @@ get_nCCE_offset(int *CCE_table,
const int common_dci,
const unsigned short rnti, const unsigned char subframe)
{
- int search_space_free, m, nb_candidates = 0, l, i;
- unsigned int Yk;
- /*
- printf("CCE Allocation: ");
- for (i=0;i<nCCE;i++)
- printf("%d.",CCE_table[i]);
- printf("\n");
- */
- if (common_dci == 1) {
- // check CCE(0 ... L-1)
- nb_candidates = (L == 4) ? 4 : 2;
- nb_candidates = min(nb_candidates, nCCE / L);
-
- // printf("Common DCI nb_candidates %d, L %d\n",nb_candidates,L);
-
- for (m = nb_candidates - 1; m >= 0; m--) {
+ int search_space_free, m, nb_candidates = 0, l, i;
+ unsigned int Yk;
+ /*
+ printf("CCE Allocation: ");
+ for (i=0;i<nCCE;i++)
+ printf("%d.",CCE_table[i]);
+ printf("\n");
+ */
+ if (common_dci == 1) {
+ // check CCE(0 ... L-1)
+ nb_candidates = (L == 4) ? 4 : 2;
+ nb_candidates = min(nb_candidates, nCCE / L);
- search_space_free = 1;
- for (l = 0; l < L; l++) {
+ // printf("Common DCI nb_candidates %d, L %d\n",nb_candidates,L);
- // printf("CCE_table[%d] %d\n",(m*L)+l,CCE_table[(m*L)+l]);
- if (CCE_table[(m * L) + l] == 1) {
- search_space_free = 0;
- break;
- }
- }
+ for (m = nb_candidates - 1; m >= 0; m--) {
- if (search_space_free == 1) {
+ search_space_free = 1;
+ for (l = 0; l < L; l++) {
- // printf("returning %d\n",m*L);
-
- for (l = 0; l < L; l++)
- CCE_table[(m * L) + l] = 1;
- return (m * L);
- }
+ // printf("CCE_table[%d] %d\n",(m*L)+l,CCE_table[(m*L)+l]);
+ if (CCE_table[(m * L) + l] == 1) {
+ search_space_free = 0;
+ break;
}
+ }
- return (-1);
+ if (search_space_free == 1) {
- } else { // Find first available in ue specific search space
- // according to procedure in Section 9.1.1 of 36.213 (v. 8.6)
- // compute Yk
- Yk = (unsigned int) rnti;
+ // printf("returning %d\n",m*L);
+
+ for (l = 0; l < L; l++)
+ CCE_table[(m * L) + l] = 1;
+ return (m * L);
+ }
+ }
- for (i = 0; i <= subframe; i++)
- Yk = (Yk * 39827) % 65537;
+ return (-1);
- Yk = Yk % (nCCE / L);
+ } else { // Find first available in ue specific search space
+ // according to procedure in Section 9.1.1 of 36.213 (v. 8.6)
+ // compute Yk
+ Yk = (unsigned int) rnti;
- switch (L) {
- case 1:
- case 2:
- nb_candidates = 6;
- break;
+ for (i = 0; i <= subframe; i++)
+ Yk = (Yk * 39827) % 65537;
- case 4:
- case 8:
- nb_candidates = 2;
- break;
+ Yk = Yk % (nCCE / L);
- default:
- DevParam(L, nCCE, rnti);
- break;
- }
+ switch (L) {
+ case 1:
+ case 2:
+ nb_candidates = 6;
+ break;
- LOG_D(MAC, "rnti %x, Yk = %d, nCCE %d (nCCE/L %d),nb_cand %d\n",
- rnti, Yk, nCCE, nCCE / L, nb_candidates);
+ case 4:
+ case 8:
+ nb_candidates = 2;
+ break;
- for (m = 0; m < nb_candidates; m++) {
- search_space_free = 1;
+ default:
+ DevParam(L, nCCE, rnti);
+ break;
+ }
- for (l = 0; l < L; l++) {
- int cce = (((Yk + m) % (nCCE / L)) * L) + l;
- if (cce >= nCCE || CCE_table[cce] == 1) {
- search_space_free = 0;
- break;
- }
- }
+ LOG_D(MAC, "rnti %x, Yk = %d, nCCE %d (nCCE/L %d),nb_cand %d\n",
+ rnti, Yk, nCCE, nCCE / L, nb_candidates);
- if (search_space_free == 1) {
- for (l = 0; l < L; l++)
- CCE_table[(((Yk + m) % (nCCE / L)) * L) + l] = 1;
+ for (m = 0; m < nb_candidates; m++) {
+ search_space_free = 1;
- return (((Yk + m) % (nCCE / L)) * L);
- }
+ for (l = 0; l < L; l++) {
+ int cce = (((Yk + m) % (nCCE / L)) * L) + l;
+ if (cce >= nCCE || CCE_table[cce] == 1) {
+ search_space_free = 0;
+ break;
}
+ }
+
+ if (search_space_free == 1) {
+ for (l = 0; l < L; l++)
+ CCE_table[(((Yk + m) % (nCCE / L)) * L) + l] = 1;
- return (-1);
+ return (((Yk + m) % (nCCE / L)) * L);
+ }
}
+
+ return (-1);
+ }
}
void
dump_CCE_table(int *CCE_table, const int nCCE,
const unsigned short rnti, const int subframe, int L)
{
- int nb_candidates = 0, i;
- unsigned int Yk;
-
- printf("CCE 0: ");
- for (i = 0; i < nCCE; i++) {
- printf("%1d.", CCE_table[i]);
- if ((i & 7) == 7)
- printf("\n CCE %d: ", i);
- }
+ int nb_candidates = 0, i;
+ unsigned int Yk;
- Yk = (unsigned int) rnti;
+ printf("CCE 0: ");
+ for (i = 0; i < nCCE; i++) {
+ printf("%1d.", CCE_table[i]);
+ if ((i & 7) == 7)
+ printf("\n CCE %d: ", i);
+ }
- for (i = 0; i <= subframe; i++)
- Yk = (Yk * 39827) % 65537;
+ Yk = (unsigned int) rnti;
- Yk = Yk % (nCCE / L);
+ for (i = 0; i <= subframe; i++)
+ Yk = (Yk * 39827) % 65537;
- switch (L) {
- case 1:
- case 2:
- nb_candidates = 6;
- break;
+ Yk = Yk % (nCCE / L);
- case 4:
- case 8:
- nb_candidates = 2;
- break;
+ switch (L) {
+ case 1:
+ case 2:
+ nb_candidates = 6;
+ break;
- default:
- DevParam(L, nCCE, rnti);
- break;
- }
+ case 4:
+ case 8:
+ nb_candidates = 2;
+ break;
+
+ default:
+ DevParam(L, nCCE, rnti);
+ break;
+ }
- printf("rnti %x, Yk*L = %d, nCCE %d (nCCE/L %d),nb_cand*L %d\n", rnti,
- Yk * L, nCCE, nCCE / L, nb_candidates * L);
+ printf("rnti %x, Yk*L = %d, nCCE %d (nCCE/L %d),nb_cand*L %d\n", rnti,
+ Yk * L, nCCE, nCCE / L, nb_candidates * L);
}
uint16_t
getnquad(COMMON_channels_t * cc, uint8_t num_pdcch_symbols, uint8_t mi)
{
- uint16_t Nreg = 0;
+ uint16_t Nreg = 0;
- AssertFatal(cc != NULL, "cc is null\n");
- AssertFatal(cc->mib != NULL, "cc->mib is null\n");
+ AssertFatal(cc != NULL, "cc is null\n");
+ AssertFatal(cc->mib != NULL, "cc->mib is null\n");
- int N_RB_DL = to_prb(cc->mib->message.dl_Bandwidth);
- int phich_resource = get_phich_resource_times6(cc);
+ int N_RB_DL = to_prb(cc->mib->message.dl_Bandwidth);
+ int phich_resource = get_phich_resource_times6(cc);
- uint8_t Ngroup_PHICH = (phich_resource * N_RB_DL) / 48;
+ uint8_t Ngroup_PHICH = (phich_resource * N_RB_DL) / 48;
- if (((phich_resource * N_RB_DL) % 48) > 0)
- Ngroup_PHICH++;
+ if (((phich_resource * N_RB_DL) % 48) > 0)
+ Ngroup_PHICH++;
- if (cc->Ncp == 1) {
- Ngroup_PHICH <<= 1;
- }
+ if (cc->Ncp == 1) {
+ Ngroup_PHICH <<= 1;
+ }
- Ngroup_PHICH *= mi;
+ Ngroup_PHICH *= mi;
- if ((num_pdcch_symbols > 0) && (num_pdcch_symbols < 4))
- switch (N_RB_DL) {
- case 6:
- Nreg = 12 + (num_pdcch_symbols - 1) * 18;
- break;
+ if ((num_pdcch_symbols > 0) && (num_pdcch_symbols < 4))
+ switch (N_RB_DL) {
+ case 6:
+ Nreg = 12 + (num_pdcch_symbols - 1) * 18;
+ break;
- case 25:
- Nreg = 50 + (num_pdcch_symbols - 1) * 75;
- break;
+ case 25:
+ Nreg = 50 + (num_pdcch_symbols - 1) * 75;
+ break;
- case 50:
- Nreg = 100 + (num_pdcch_symbols - 1) * 150;
- break;
+ case 50:
+ Nreg = 100 + (num_pdcch_symbols - 1) * 150;
+ break;
- case 100:
- Nreg = 200 + (num_pdcch_symbols - 1) * 300;
- break;
+ case 100:
+ Nreg = 200 + (num_pdcch_symbols - 1) * 300;
+ break;
- default:
- return (0);
- }
- // printf("Nreg %d (%d)\n",Nreg,Nreg - 4 - (3*Ngroup_PHICH));
- return (Nreg - 4 - (3 * Ngroup_PHICH));
+ default:
+ return (0);
+ }
+ // printf("Nreg %d (%d)\n",Nreg,Nreg - 4 - (3*Ngroup_PHICH));
+ return (Nreg - 4 - (3 * Ngroup_PHICH));
}
uint16_t
getnCCE(COMMON_channels_t * cc, uint8_t num_pdcch_symbols, uint8_t mi)
{
- AssertFatal(cc != NULL, "cc is null\n");
- return (getnquad(cc, num_pdcch_symbols, mi) / 9);
+ AssertFatal(cc != NULL, "cc is null\n");
+ return (getnquad(cc, num_pdcch_symbols, mi) / 9);
}
uint8_t getmi(COMMON_channels_t * cc, int subframe)
{
- AssertFatal(cc != NULL, "cc is null\n");
+ AssertFatal(cc != NULL, "cc is null\n");
- // for FDD
- if (cc->tdd_Config == NULL) // FDD
- return 1;
+ // for FDD
+ if (cc->tdd_Config == NULL) // FDD
+ return 1;
- // for TDD
- switch (cc->tdd_Config->subframeAssignment) {
- case 0:
- if ((subframe == 0) || (subframe == 5))
- return (2);
- else
- return (1);
+ // for TDD
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 0:
+ if ((subframe == 0) || (subframe == 5))
+ return (2);
+ else
+ return (1);
- break;
+ break;
- case 1:
- if ((subframe == 0) || (subframe == 5))
- return (0);
- else
- return (1);
+ case 1:
+ if ((subframe == 0) || (subframe == 5))
+ return (0);
+ else
+ return (1);
- break;
+ break;
- case 2:
- if ((subframe == 3) || (subframe == 8))
- return (1);
- else
- return (0);
+ case 2:
+ if ((subframe == 3) || (subframe == 8))
+ return (1);
+ else
+ return (0);
- break;
+ break;
- case 3:
- if ((subframe == 0) || (subframe == 8) || (subframe == 9))
- return (1);
- else
- return (0);
+ case 3:
+ if ((subframe == 0) || (subframe == 8) || (subframe == 9))
+ return (1);
+ else
+ return (0);
- break;
+ break;
- case 4:
- if ((subframe == 8) || (subframe == 9))
- return (1);
- else
- return (0);
+ case 4:
+ if ((subframe == 8) || (subframe == 9))
+ return (1);
+ else
+ return (0);
- break;
+ break;
- case 5:
- if (subframe == 8)
- return (1);
- else
- return (0);
+ case 5:
+ if (subframe == 8)
+ return (1);
+ else
+ return (0);
- break;
+ break;
- case 6:
- return (1);
- break;
+ case 6:
+ return (1);
+ break;
- default:
- return (0);
- }
+ default:
+ return (0);
+ }
}
uint16_t
get_nCCE_max(COMMON_channels_t * cc, int num_pdcch_symbols, int subframe)
{
- AssertFatal(cc != NULL, "cc is null\n");
- return (getnCCE(cc, num_pdcch_symbols, getmi(cc, subframe)));
+ AssertFatal(cc != NULL, "cc is null\n");
+ return (getnCCE(cc, num_pdcch_symbols, getmi(cc, subframe)));
}
// Allocate the CCEs
int
allocate_CCEs(int module_idP, int CC_idP, int subframeP, int test_onlyP)
{
- int *CCE_table = RC.mac[module_idP]->CCE_table[CC_idP];
- nfapi_dl_config_request_body_t *DL_req =
- &RC.mac[module_idP]->DL_req[CC_idP].dl_config_request_body;
- nfapi_hi_dci0_request_body_t *HI_DCI0_req =
- &RC.mac[module_idP]->HI_DCI0_req[CC_idP].hi_dci0_request_body;
- nfapi_dl_config_request_pdu_t *dl_config_pdu =
- &DL_req->dl_config_pdu_list[0];
- nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
- &HI_DCI0_req->hi_dci0_pdu_list[0];
- int nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->common_channels[CC_idP], 1,
- subframeP);
- int fCCE;
- int i, j, idci;
- int nCCE = 0;
-
- LOG_D(MAC,
- "Allocate CCEs subframe %d, test %d : (DL PDU %d, DL DCI %d, UL %d)\n",
- subframeP, test_onlyP, DL_req->number_pdu, DL_req->number_dci,
- HI_DCI0_req->number_of_dci);
- DL_req->number_pdcch_ofdm_symbols = 1;
-
- try_again:
- init_CCE_table(module_idP, CC_idP);
- nCCE = 0;
-
- for (i = 0, idci = 0; i < DL_req->number_pdu; i++) {
- // allocate DL common DCIs first
- if ((dl_config_pdu[i].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
- && (dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti_type ==
- 2)) {
- LOG_D(MAC,
- "Trying to allocate COMMON DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
- idci, DL_req->number_dci + HI_DCI0_req->number_of_dci,
- DL_req->number_dci, HI_DCI0_req->number_of_dci,
- dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- dl_config_pdu[i].dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level, nCCE, nCCE_max,
- DL_req->number_pdcch_ofdm_symbols);
-
- if (nCCE +
- (dl_config_pdu[i].dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level) > nCCE_max) {
- if (DL_req->number_pdcch_ofdm_symbols == 3)
- goto failed;
- LOG_D(MAC,
- "Can't fit DCI allocations with %d PDCCH symbols, increasing by 1\n",
- DL_req->number_pdcch_ofdm_symbols);
- DL_req->number_pdcch_ofdm_symbols++;
- nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->
- common_channels[CC_idP],
- DL_req->number_pdcch_ofdm_symbols,
- subframeP);
- goto try_again;
- }
- // number of CCEs left can potentially hold this allocation
- fCCE = get_nCCE_offset(CCE_table,
- dl_config_pdu[i].
- dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level, nCCE_max, 1,
- dl_config_pdu[i].
- dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- subframeP);
- if (fCCE == -1) {
- if (DL_req->number_pdcch_ofdm_symbols == 3) {
- LOG_D(MAC,
- "subframe %d: Dropping Allocation for RNTI %x\n",
- subframeP,
- dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.
- rnti);
- for (j = 0; j <= i; j++) {
- if (dl_config_pdu[j].pdu_type ==
- NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
- LOG_D(MAC,
- "DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
- j,
- DL_req->number_dci +
- HI_DCI0_req->number_of_dci,
- DL_req->number_dci,
- HI_DCI0_req->number_of_dci,
- dl_config_pdu[j].
- dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- dl_config_pdu[j].
- dci_dl_pdu.dci_dl_pdu_rel8.dci_format,
- dl_config_pdu[j].
- dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level, nCCE, nCCE_max,
- DL_req->number_pdcch_ofdm_symbols);
- }
- //dump_CCE_table(CCE_table,nCCE_max,subframeP,dci_alloc->rnti,1<<dci_alloc->L);
- goto failed;
- }
- LOG_D(MAC,
- "Can't fit DCI allocations with %d PDCCH symbols (rnti condition), increasing by 1\n",
- DL_req->number_pdcch_ofdm_symbols);
-
- DL_req->number_pdcch_ofdm_symbols++;
- nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->
- common_channels[CC_idP],
- DL_req->number_pdcch_ofdm_symbols,
- subframeP);
- goto try_again;
- } // fCCE==-1
-
- // the allocation is feasible, rnti rule passes
- nCCE +=
+ int *CCE_table = RC.mac[module_idP]->CCE_table[CC_idP];
+ nfapi_dl_config_request_body_t *DL_req =
+ &RC.mac[module_idP]->DL_req[CC_idP].dl_config_request_body;
+ nfapi_hi_dci0_request_body_t *HI_DCI0_req =
+ &RC.mac[module_idP]->HI_DCI0_req[CC_idP].hi_dci0_request_body;
+ nfapi_dl_config_request_pdu_t *dl_config_pdu =
+ &DL_req->dl_config_pdu_list[0];
+ nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
+ &HI_DCI0_req->hi_dci0_pdu_list[0];
+ int nCCE_max =
+ get_nCCE_max(&RC.mac[module_idP]->common_channels[CC_idP], 1,
+ subframeP);
+ int fCCE;
+ int i, j, idci;
+ int nCCE = 0;
+
+ LOG_D(MAC,
+ "Allocate CCEs subframe %d, test %d : (DL PDU %d, DL DCI %d, UL %d)\n",
+ subframeP, test_onlyP, DL_req->number_pdu, DL_req->number_dci,
+ HI_DCI0_req->number_of_dci);
+ DL_req->number_pdcch_ofdm_symbols = 1;
+
+ try_again:
+ init_CCE_table(module_idP, CC_idP);
+ nCCE = 0;
+
+ for (i = 0, idci = 0; i < DL_req->number_pdu; i++) {
+ // allocate DL common DCIs first
+ if ((dl_config_pdu[i].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
+ && (dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti_type ==
+ 2)) {
+ LOG_D(MAC,
+ "Trying to allocate COMMON DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+ idci, DL_req->number_dci + HI_DCI0_req->number_of_dci,
+ DL_req->number_dci, HI_DCI0_req->number_of_dci,
+ dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ dl_config_pdu[i].dci_dl_pdu.
+ dci_dl_pdu_rel8.aggregation_level, nCCE, nCCE_max,
+ DL_req->number_pdcch_ofdm_symbols);
+
+ if (nCCE +
+ (dl_config_pdu[i].dci_dl_pdu.
+ dci_dl_pdu_rel8.aggregation_level) > nCCE_max) {
+ if (DL_req->number_pdcch_ofdm_symbols == 3)
+ goto failed;
+ LOG_D(MAC,
+ "Can't fit DCI allocations with %d PDCCH symbols, increasing by 1\n",
+ DL_req->number_pdcch_ofdm_symbols);
+ DL_req->number_pdcch_ofdm_symbols++;
+ nCCE_max =
+ get_nCCE_max(&RC.mac[module_idP]->
+ common_channels[CC_idP],
+ DL_req->number_pdcch_ofdm_symbols,
+ subframeP);
+ goto try_again;
+ }
+ // number of CCEs left can potentially hold this allocation
+ fCCE = get_nCCE_offset(CCE_table,
+ dl_config_pdu[i].
+ dci_dl_pdu.dci_dl_pdu_rel8.
+ aggregation_level, nCCE_max, 1,
+ dl_config_pdu[i].
+ dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ subframeP);
+ if (fCCE == -1) {
+ if (DL_req->number_pdcch_ofdm_symbols == 3) {
+ LOG_D(MAC,
+ "subframe %d: Dropping Allocation for RNTI %x\n",
+ subframeP,
dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level;
- LOG_D(MAC, "Allocating at nCCE %d\n", fCCE);
- if (test_onlyP == 0) {
- dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.cce_idx = fCCE;
- LOG_D(MAC,
- "Allocate COMMON DCI CCEs subframe %d, test %d => L %d fCCE %d\n",
- subframeP, test_onlyP,
- dl_config_pdu[i].dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level, fCCE);
- }
- idci++;
+ rnti);
+ for (j = 0; j <= i; j++) {
+ if (dl_config_pdu[j].pdu_type ==
+ NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
+ LOG_D(MAC,
+ "DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+ j,
+ DL_req->number_dci +
+ HI_DCI0_req->number_of_dci,
+ DL_req->number_dci,
+ HI_DCI0_req->number_of_dci,
+ dl_config_pdu[j].
+ dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ dl_config_pdu[j].
+ dci_dl_pdu.dci_dl_pdu_rel8.dci_format,
+ dl_config_pdu[j].
+ dci_dl_pdu.dci_dl_pdu_rel8.
+ aggregation_level, nCCE, nCCE_max,
+ DL_req->number_pdcch_ofdm_symbols);
+ }
+ //dump_CCE_table(CCE_table,nCCE_max,subframeP,dci_alloc->rnti,1<<dci_alloc->L);
+ goto failed;
}
- } // for i = 0 ... num_DL_DCIs
-
- // no try to allocate UL DCIs
- for (i = 0; i < HI_DCI0_req->number_of_dci + HI_DCI0_req->number_of_hi;
- i++) {
-
- // allocate UL DCIs
- if (hi_dci0_pdu[i].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE) {
-
- LOG_D(MAC,
- "Trying to allocate format 0 DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
- idci, DL_req->number_dci + HI_DCI0_req->number_of_dci,
- DL_req->number_dci, HI_DCI0_req->number_of_dci,
- hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti,
- hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.aggregation_level,
- nCCE, nCCE_max, DL_req->number_pdcch_ofdm_symbols);
-
- if (nCCE +
- (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.aggregation_level) >
- nCCE_max) {
- if (DL_req->number_pdcch_ofdm_symbols == 3)
- goto failed;
- LOG_D(MAC,
- "Can't fit DCI allocations with %d PDCCH symbols, increasing by 1\n",
- DL_req->number_pdcch_ofdm_symbols);
-
- DL_req->number_pdcch_ofdm_symbols++;
- nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->
- common_channels[CC_idP],
- DL_req->number_pdcch_ofdm_symbols,
- subframeP);
- goto try_again;
- }
- // number of CCEs left can potentially hold this allocation
- fCCE = get_nCCE_offset(CCE_table,
- hi_dci0_pdu[i].dci_pdu.
- dci_pdu_rel8.aggregation_level,
- nCCE_max, 0,
- hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.
- rnti, subframeP);
- if (fCCE == -1) {
- if (DL_req->number_pdcch_ofdm_symbols == 3) {
- LOG_D(MAC,
- "subframe %d: Dropping Allocation for RNTI %x\n",
- subframeP,
- hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti);
- for (j = 0; j <= i; j++) {
- if (hi_dci0_pdu[j].pdu_type ==
- NFAPI_HI_DCI0_DCI_PDU_TYPE)
- LOG_D(MAC,
- "DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
- j,
- DL_req->number_dci +
- HI_DCI0_req->number_of_dci,
- DL_req->number_dci,
- HI_DCI0_req->number_of_dci,
- hi_dci0_pdu[j].dci_pdu.dci_pdu_rel8.rnti,
- hi_dci0_pdu[j].dci_pdu.dci_pdu_rel8.
- dci_format,
- hi_dci0_pdu[j].dci_pdu.
- dci_pdu_rel8.aggregation_level, nCCE,
- nCCE_max,
- DL_req->number_pdcch_ofdm_symbols);
- }
- //dump_CCE_table(CCE_table,nCCE_max,subframeP,dci_alloc->rnti,1<<dci_alloc->L);
- goto failed;
- }
- LOG_D(MAC,
- "Can't fit DCI allocations with %d PDCCH symbols (rnti condition), increasing by 1\n",
- DL_req->number_pdcch_ofdm_symbols);
-
- DL_req->number_pdcch_ofdm_symbols++;
- nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->
+ LOG_D(MAC,
+ "Can't fit DCI allocations with %d PDCCH symbols (rnti condition), increasing by 1\n",
+ DL_req->number_pdcch_ofdm_symbols);
+
+ DL_req->number_pdcch_ofdm_symbols++;
+ nCCE_max = get_nCCE_max(&RC.mac[module_idP]->
common_channels[CC_idP],
DL_req->number_pdcch_ofdm_symbols,
subframeP);
- goto try_again;
- } // fCCE==-1
-
- // the allocation is feasible, rnti rule passes
- nCCE += hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.aggregation_level;
- LOG_D(MAC, "Allocating at nCCE %d\n", fCCE);
- if (test_onlyP == 0) {
- hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.cce_index = fCCE;
- LOG_D(MAC, "Allocate CCEs subframe %d, test %d\n",
- subframeP, test_onlyP);
- }
- idci++;
+ goto try_again;
+ } // fCCE==-1
+
+ // the allocation is feasible, rnti rule passes
+ nCCE += dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level;
+ LOG_D(MAC, "Allocating at nCCE %d\n", fCCE);
+ if (test_onlyP == 0) {
+ dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.cce_idx = fCCE;
+ LOG_D(MAC,
+ "Allocate COMMON DCI CCEs subframe %d, test %d => L %d fCCE %d\n",
+ subframeP, test_onlyP,
+ dl_config_pdu[i].dci_dl_pdu.
+ dci_dl_pdu_rel8.aggregation_level, fCCE);
+ }
+ idci++;
+ }
+ } // for i = 0 ... num_DL_DCIs
+
+ // no try to allocate UL DCIs
+ for (i = 0; i < HI_DCI0_req->number_of_dci + HI_DCI0_req->number_of_hi;
+ i++) {
+
+ // allocate UL DCIs
+ if (hi_dci0_pdu[i].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE) {
+
+ LOG_D(MAC,
+ "Trying to allocate format 0 DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+ idci, DL_req->number_dci + HI_DCI0_req->number_of_dci,
+ DL_req->number_dci, HI_DCI0_req->number_of_dci,
+ hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti,
+ hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.aggregation_level,
+ nCCE, nCCE_max, DL_req->number_pdcch_ofdm_symbols);
+
+ if (nCCE + (hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.aggregation_level) > nCCE_max) {
+ if (DL_req->number_pdcch_ofdm_symbols == 3)
+ goto failed;
+ LOG_D(MAC,
+ "Can't fit DCI allocations with %d PDCCH symbols, increasing by 1\n",
+ DL_req->number_pdcch_ofdm_symbols);
+
+ DL_req->number_pdcch_ofdm_symbols++;
+ nCCE_max =
+ get_nCCE_max(&RC.mac[module_idP]->common_channels[CC_idP],
+ DL_req->number_pdcch_ofdm_symbols,
+ subframeP);
+ goto try_again;
+ }
+ // number of CCEs left can potentially hold this allocation
+ fCCE = get_nCCE_offset(CCE_table,
+ hi_dci0_pdu[i].dci_pdu.
+ dci_pdu_rel8.aggregation_level,
+ nCCE_max, 0,
+ hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.
+ rnti, subframeP);
+ if (fCCE == -1) {
+ if (DL_req->number_pdcch_ofdm_symbols == 3) {
+ LOG_D(MAC,
+ "subframe %d: Dropping Allocation for RNTI %x\n",
+ subframeP,
+ hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti);
+ for (j = 0; j <= i; j++) {
+ if (hi_dci0_pdu[j].pdu_type ==
+ NFAPI_HI_DCI0_DCI_PDU_TYPE)
+ LOG_D(MAC,
+ "DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+ j,
+ DL_req->number_dci + HI_DCI0_req->number_of_dci,
+ DL_req->number_dci,
+ HI_DCI0_req->number_of_dci,
+ hi_dci0_pdu[j].dci_pdu.dci_pdu_rel8.rnti,
+ hi_dci0_pdu[j].dci_pdu.dci_pdu_rel8.
+ dci_format,
+ hi_dci0_pdu[j].dci_pdu.
+ dci_pdu_rel8.aggregation_level, nCCE,
+ nCCE_max,
+ DL_req->number_pdcch_ofdm_symbols);
+ }
+ //dump_CCE_table(CCE_table,nCCE_max,subframeP,dci_alloc->rnti,1<<dci_alloc->L);
+ goto failed;
}
- } // for i = 0 ... num_UL_DCIs
-
- for (i = 0; i < DL_req->number_pdu; i++) {
- // allocate DL UE specific DCIs
- if ((dl_config_pdu[i].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
- && (dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti_type ==
- 1)) {
- LOG_D(MAC,
- "Trying to allocate DL UE-SPECIFIC DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
- idci, DL_req->number_dci + HI_DCI0_req->number_of_dci,
- DL_req->number_dci, HI_DCI0_req->number_of_dci,
- dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- dl_config_pdu[i].dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level, nCCE, nCCE_max,
- DL_req->number_pdcch_ofdm_symbols);
-
- if (nCCE +
- (dl_config_pdu[i].dci_dl_pdu.
- dci_dl_pdu_rel8.aggregation_level) > nCCE_max) {
- if (DL_req->number_pdcch_ofdm_symbols == 3)
- goto failed;
- LOG_D(MAC,
- "Can't fit DCI allocations with %d PDCCH symbols, increasing by 1\n",
- DL_req->number_pdcch_ofdm_symbols);
-
- DL_req->number_pdcch_ofdm_symbols++;
- nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->
- common_channels[CC_idP],
- DL_req->number_pdcch_ofdm_symbols,
- subframeP);
- goto try_again;
- }
- // number of CCEs left can potentially hold this allocation
- fCCE = get_nCCE_offset(CCE_table,
- dl_config_pdu[i].
- dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level, nCCE_max, 0,
- dl_config_pdu[i].
- dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- subframeP);
- if (fCCE == -1) {
- if (DL_req->number_pdcch_ofdm_symbols == 3) {
- LOG_I(MAC,
- "subframe %d: Dropping Allocation for RNTI %x\n",
- subframeP,
- dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.
- rnti);
- for (j = 0; j <= i; j++) {
- if (dl_config_pdu[j].pdu_type ==
- NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
- LOG_I(MAC,
- "DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
- j,
- DL_req->number_dci +
- HI_DCI0_req->number_of_dci,
- DL_req->number_dci,
- HI_DCI0_req->number_of_dci,
- dl_config_pdu[j].
- dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- dl_config_pdu[j].
- dci_dl_pdu.dci_dl_pdu_rel8.dci_format,
- dl_config_pdu[j].
- dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level, nCCE, nCCE_max,
- DL_req->number_pdcch_ofdm_symbols);
- }
- //dump_CCE_table(CCE_table,nCCE_max,subframeP,dci_alloc->rnti,1<<dci_alloc->L);
- goto failed;
- }
- LOG_D(MAC,
- "Can't fit DCI allocations with %d PDCCH symbols (rnti condition), increasing by 1\n",
- DL_req->number_pdcch_ofdm_symbols);
-
- DL_req->number_pdcch_ofdm_symbols++;
- nCCE_max =
- get_nCCE_max(&RC.mac[module_idP]->
- common_channels[CC_idP],
- DL_req->number_pdcch_ofdm_symbols,
- subframeP);
- goto try_again;
- } // fCCE==-1
-
- // the allocation is feasible, rnti rule passes
- nCCE +=
+ LOG_D(MAC,
+ "Can't fit DCI allocations with %d PDCCH symbols (rnti condition), increasing by 1\n",
+ DL_req->number_pdcch_ofdm_symbols);
+
+ DL_req->number_pdcch_ofdm_symbols++;
+ nCCE_max =
+ get_nCCE_max(&RC.mac[module_idP]->common_channels[CC_idP],
+ DL_req->number_pdcch_ofdm_symbols,
+ subframeP);
+ goto try_again;
+ } // fCCE==-1
+
+ // the allocation is feasible, rnti rule passes
+ nCCE += hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.aggregation_level;
+ LOG_D(MAC, "Allocating at nCCE %d\n", fCCE);
+ if (test_onlyP == 0) {
+ hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.cce_index = fCCE;
+ LOG_D(MAC, "Allocate CCEs subframe %d, test %d\n",
+ subframeP, test_onlyP);
+ }
+ idci++;
+ }
+ } // for i = 0 ... num_UL_DCIs
+
+ for (i = 0; i < DL_req->number_pdu; i++) {
+ // allocate DL UE specific DCIs
+ if ((dl_config_pdu[i].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
+ && (dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti_type ==
+ 1)) {
+ LOG_D(MAC,
+ "Trying to allocate DL UE-SPECIFIC DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+ idci, DL_req->number_dci + HI_DCI0_req->number_of_dci,
+ DL_req->number_dci, HI_DCI0_req->number_of_dci,
+ dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ dl_config_pdu[i].dci_dl_pdu.
+ dci_dl_pdu_rel8.aggregation_level, nCCE, nCCE_max,
+ DL_req->number_pdcch_ofdm_symbols);
+
+ if (nCCE + (dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level) > nCCE_max) {
+ if (DL_req->number_pdcch_ofdm_symbols == 3)
+ goto failed;
+ LOG_D(MAC,
+ "Can't fit DCI allocations with %d PDCCH symbols, increasing by 1\n",
+ DL_req->number_pdcch_ofdm_symbols);
+
+ DL_req->number_pdcch_ofdm_symbols++;
+ nCCE_max = get_nCCE_max(&RC.mac[module_idP]->common_channels[CC_idP],
+ DL_req->number_pdcch_ofdm_symbols,
+ subframeP);
+ goto try_again;
+ }
+ // number of CCEs left can potentially hold this allocation
+ fCCE = get_nCCE_offset(CCE_table,
+ dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level, nCCE_max, 0,
+ dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ subframeP);
+ if (fCCE == -1) {
+ if (DL_req->number_pdcch_ofdm_symbols == 3) {
+ LOG_I(MAC,
+ "subframe %d: Dropping Allocation for RNTI %x\n",
+ subframeP,
dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level;
- LOG_D(MAC, "Allocating at nCCE %d\n", fCCE);
- if (test_onlyP == 0) {
- dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.cce_idx = fCCE;
- LOG_D(MAC, "Allocate CCEs subframe %d, test %d\n",
- subframeP, test_onlyP);
- }
- idci++;
+ rnti);
+ for (j = 0; j <= i; j++) {
+ if (dl_config_pdu[j].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
+ LOG_I(MAC,
+ "DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+ j,
+ DL_req->number_dci + HI_DCI0_req->number_of_dci,
+ DL_req->number_dci,
+ HI_DCI0_req->number_of_dci,
+ dl_config_pdu[j].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ dl_config_pdu[j].dci_dl_pdu.dci_dl_pdu_rel8.dci_format,
+ dl_config_pdu[j].dci_dl_pdu.dci_dl_pdu_rel8.
+ aggregation_level,
+ nCCE,
+ nCCE_max,
+ DL_req->number_pdcch_ofdm_symbols);
+ }
+ //dump_CCE_table(CCE_table,nCCE_max,subframeP,dci_alloc->rnti,1<<dci_alloc->L);
+ goto failed;
}
- } // for i = 0 ... num_DL_DCIs
-
- return 0;
-
- failed:
- return -1;
-}
+ LOG_D(MAC,
+ "Can't fit DCI allocations with %d PDCCH symbols (rnti condition), increasing by 1\n",
+ DL_req->number_pdcch_ofdm_symbols);
+
+ DL_req->number_pdcch_ofdm_symbols++;
+ nCCE_max =
+ get_nCCE_max(&RC.mac[module_idP]->common_channels[CC_idP],
+ DL_req->number_pdcch_ofdm_symbols,
+ subframeP);
+ goto try_again;
+ } // fCCE==-1
+
+ // the allocation is feasible, rnti rule passes
+ nCCE += dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level;
+ LOG_D(MAC, "Allocating at nCCE %d\n", fCCE);
+ if (test_onlyP == 0) {
+ dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.cce_idx = fCCE;
+ LOG_D(MAC, "Allocate CCEs subframe %d, test %d\n",
+ subframeP, test_onlyP);
+ }
+ idci++;
+ }
+ } // for i = 0 ... num_DL_DCIs
-/*
-uint8_t get_ul_req_index(module_id_t module_idP, int CC_idP, sub_frame_t subframeP)
-{
- if (RC.mac[module_idP]->common_channels[CC_idP].tdd_Config == NULL)
- return(0);
+ return 0;
- switch (RC.mac[module_idP]->common_channels[CC_idP].tdd_Config->subframeAssignment) {
- case 0:
- case 1:
- case 2:
- case 6:
- return(0);
- case 3:
- // 1,5,6 -> 2, prog. 8, buffer 0
- // 7,8 -> 3, prog. 9, buffer 1
- // 9,0 -> 4, prog. 0, buffer 0
- if ((subframeP == 7) || (subframeP == 8)) return(1);
- else return(0);
- case 4:
- // 0,1,4,5 -> 2, prog. 8, buffer 0
- // 6,7,8,9 -> 3, prog. 9, buffer 1
- if (subframeP<6) return(0);
- else return(1);
- return(1);
- break;
- case 5:
- // 9(-1),0,1,3,4,5,6,7,8,9 -> 2, prog 8, buffer 0
- return(0);
- break;
- default:
- AssertFatal(1==0,"Should not get here, why is tdd_Config->subframeAssignment = %d\n",(int)RC.mac[module_idP]->common_channels[CC_idP].tdd_Config->subframeAssignment);
- break;
- }
- return(0);
+ failed:
+ return -1;
}
-*/
nfapi_ul_config_request_pdu_t *has_ul_grant(module_id_t module_idP,
int CC_idP, uint16_t absSFP,
uint16_t rnti)
{
- nfapi_ul_config_request_body_t *ul_req;
- nfapi_ul_config_request_pdu_t *ul_config_pdu;
-
- ul_req =
- &RC.mac[module_idP]->UL_req_tmp[CC_idP][absSFP %
- 10].ul_config_request_body;
- ul_config_pdu = &ul_req->ul_config_pdu_list[0];
- LOG_D(MAC,
- "Checking for rnti %x UL grant in subframeP %d (num pdu %d)\n",
- rnti, absSFP % 10, ul_req->number_of_pdus);
-
- for (int i = 0; i < ul_req->number_of_pdus; i++) {
- LOG_D(MAC, "PDU %d : type %d,rnti %x\n", i,
- ul_config_pdu[i].pdu_type, rnti);
- if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_cqi_ri_pdu.ulsch_pdu.
- ulsch_pdu_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.
- rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_cqi_harq_ri_pdu.
- ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
-
- if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE)
- && (ul_config_pdu[i].uci_cqi_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE)
- && (ul_config_pdu[i].uci_sr_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].uci_harq_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].uci_sr_harq_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].uci_cqi_harq_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_UCI_CQI_SR_PDU_TYPE)
- && (ul_config_pdu[i].uci_cqi_sr_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].uci_cqi_sr_harq_pdu.
- ue_information.ue_information_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
-
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_ULSCH_UCI_CSI_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_uci_csi_pdu.
- ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_uci_harq_pdu.
- ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- if ((ul_config_pdu[i].pdu_type ==
- NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE)
- && (ul_config_pdu[i].ulsch_csi_uci_harq_pdu.
- ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
- return (&ul_config_pdu[i]);
- }
+ nfapi_ul_config_request_body_t *ul_req;
+ nfapi_ul_config_request_pdu_t *ul_config_pdu;
+
+ ul_req = &RC.mac[module_idP]->UL_req_tmp[CC_idP][absSFP % 10].ul_config_request_body;
+ ul_config_pdu = &ul_req->ul_config_pdu_list[0];
+ LOG_D(MAC,
+ "Checking for rnti %x UL grant in subframeP %d (num pdu %d)\n",
+ rnti, absSFP % 10, ul_req->number_of_pdus);
+
+ for (int i = 0; i < ul_req->number_of_pdus; i++) {
+ LOG_D(MAC, "PDU %d : type %d,rnti %x\n", i,ul_config_pdu[i].pdu_type, rnti);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CQI_RI_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_cqi_ri_pdu.ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_cqi_harq_ri_pdu.ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_CQI_PDU_TYPE)
+ && (ul_config_pdu[i].uci_cqi_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE)
+ && (ul_config_pdu[i].uci_sr_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].uci_harq_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_SR_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].uci_sr_harq_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_CQI_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].uci_cqi_harq_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_CQI_SR_PDU_TYPE)
+ && (ul_config_pdu[i].uci_cqi_sr_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_UCI_CQI_SR_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].uci_cqi_sr_harq_pdu.ue_information.ue_information_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_UCI_CSI_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_uci_csi_pdu.ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_UCI_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_uci_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ if ((ul_config_pdu[i].pdu_type == NFAPI_UL_CONFIG_ULSCH_CSI_UCI_HARQ_PDU_TYPE)
+ && (ul_config_pdu[i].ulsch_csi_uci_harq_pdu.ulsch_pdu.ulsch_pdu_rel8.rnti == rnti))
+ return (&ul_config_pdu[i]);
+ }
- return (NULL); // no ul grant at all for this UE
+ return (NULL); // no ul grant at all for this UE
}
boolean_t
@@ -3560,65 +3132,54 @@ CCE_allocation_infeasible(int module_idP,
int format_flag,
int subframe, int aggregation, int rnti)
{
- nfapi_dl_config_request_body_t *DL_req =
- &RC.mac[module_idP]->DL_req[CC_idP].dl_config_request_body;
- nfapi_dl_config_request_pdu_t *dl_config_pdu =
- &DL_req->dl_config_pdu_list[DL_req->number_pdu];
- nfapi_hi_dci0_request_body_t *HI_DCI0_req =
- &RC.mac[module_idP]->HI_DCI0_req[CC_idP].hi_dci0_request_body;
- nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
- &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci +
- HI_DCI0_req->number_of_hi];
- int ret;
- boolean_t res = FALSE;
-
- if (format_flag != 2) { // DL DCI
- if (DL_req->number_pdu == MAX_NUM_DL_PDU) {
- LOG_W(MAC,
- "Subframe %d: FAPI DL structure is full, skip scheduling UE %d\n",
- subframe, rnti);
- } else {
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type =
- (format_flag == 0) ? 2 : 1;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level =
- aggregation;
- DL_req->number_pdu++;
- LOG_D(MAC,
- "Subframe %d: Checking CCE feasibility format %d : (%x,%d) (%x,%d,%d)\n",
- subframe, format_flag, rnti, aggregation,
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti,
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
- aggregation_level,
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type);
- ret = allocate_CCEs(module_idP, CC_idP, subframe, 0);
- if (ret == -1)
- res = TRUE;
- DL_req->number_pdu--;
- }
- } else { // ue-specific UL DCI
- if (HI_DCI0_req->number_of_dci + HI_DCI0_req->number_of_hi ==
- MAX_NUM_HI_DCI0_PDU) {
- LOG_W(MAC,
- "Subframe %d: FAPI UL structure is full, skip scheduling UE %d\n",
- subframe, rnti);
- } else {
- hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_DCI_PDU_TYPE;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_DCI_PDU_REL8_TAG;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level =
- aggregation;
- HI_DCI0_req->number_of_dci++;
- ret = allocate_CCEs(module_idP, CC_idP, subframe, 0);
- if (ret == -1)
- res = TRUE;
- HI_DCI0_req->number_of_dci--;
- }
+ nfapi_dl_config_request_body_t *DL_req = &RC.mac[module_idP]->DL_req[CC_idP].dl_config_request_body;
+ nfapi_dl_config_request_pdu_t *dl_config_pdu = &DL_req->dl_config_pdu_list[DL_req->number_pdu];
+ nfapi_hi_dci0_request_body_t *HI_DCI0_req = &RC.mac[module_idP]->HI_DCI0_req[CC_idP].hi_dci0_request_body;
+ nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu = &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci + HI_DCI0_req->number_of_hi];
+ int ret;
+ boolean_t res = FALSE;
+
+ if (format_flag != 2) { // DL DCI
+ if (DL_req->number_pdu == MAX_NUM_DL_PDU) {
+ LOG_W(MAC,
+ "Subframe %d: FAPI DL structure is full, skip scheduling UE %d\n",
+ subframe, rnti);
+ } else {
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_CONFIG_REQUEST_DCI_DL_PDU_REL8_TAG;
+ dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = (format_flag == 0) ? 2 : 1;
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = aggregation;
+ DL_req->number_pdu++;
+ LOG_D(MAC,
+ "Subframe %d: Checking CCE feasibility format %d : (%x,%d) (%x,%d,%d)\n",
+ subframe, format_flag, rnti, aggregation,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.
+ aggregation_level,
+ dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type);
+ ret = allocate_CCEs(module_idP, CC_idP, subframe, 0);
+ if (ret == -1) res = TRUE;
+ DL_req->number_pdu--;
+ }
+ } else { // ue-specific UL DCI
+ if (HI_DCI0_req->number_of_dci + HI_DCI0_req->number_of_hi == MAX_NUM_HI_DCI0_PDU) {
+ LOG_W(MAC,
+ "Subframe %d: FAPI UL structure is full, skip scheduling UE %d\n",
+ subframe, rnti);
+ } else {
+ hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_DCI_PDU_TYPE;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_DCI_PDU_REL8_TAG;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level = aggregation;
+ HI_DCI0_req->number_of_dci++;
+ ret = allocate_CCEs(module_idP, CC_idP, subframe, 0);
+ if (ret == -1) res = TRUE;
+ HI_DCI0_req->number_of_dci--;
}
+ }
- return res;
+ return res;
}
void
@@ -3626,338 +3187,328 @@ extract_harq(module_id_t mod_idP, int CC_idP, int UE_id,
frame_t frameP, sub_frame_t subframeP,
void *harq_indication, int format)
{
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
- rnti_t rnti = UE_RNTI(mod_idP, UE_id);
- COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
- nfapi_harq_indication_fdd_rel13_t *harq_indication_fdd;
- nfapi_harq_indication_tdd_rel13_t *harq_indication_tdd;
- uint16_t num_ack_nak;
- int numCC = UE_list->numactiveCCs[UE_id];
- int pCCid = UE_list->pCC_id[UE_id];
- int spatial_bundling = 0;
- int tmode[5];
- int i, j;
- uint8_t *pdu;
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+ rnti_t rnti = UE_RNTI(mod_idP, UE_id);
+ COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
+ nfapi_harq_indication_fdd_rel13_t *harq_indication_fdd;
+ nfapi_harq_indication_tdd_rel13_t *harq_indication_tdd;
+ uint16_t num_ack_nak;
+ int numCC = UE_list->numactiveCCs[UE_id];
+ int pCCid = UE_list->pCC_id[UE_id];
+ int spatial_bundling = 0;
+ int tmode[5];
+ int i, j;
+ uint8_t *pdu;
#ifdef Rel14
- if (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated != NULL &&
- UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->pucch_ConfigDedicated != NULL &&
- (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7)
- && (UE_list->UE_template[pCCid][UE_id].
- physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13)
- &&
- (((UE_list->UE_template[pCCid][UE_id].
- physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13->
- spatialBundlingPUCCH_r13)
- && (format == 0))
- ||
- ((UE_list->UE_template[pCCid][UE_id].
- physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13->
- spatialBundlingPUSCH_r13)
- && (format == 1))))
- spatial_bundling = 1;
+ if (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated != NULL &&
+ UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->pucch_ConfigDedicated != NULL &&
+ (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7)
+ && (UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13)
+ && (((UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13->spatialBundlingPUCCH_r13) && (format == 0))
+ || ((UE_list->UE_template[pCCid][UE_id].physicalConfigDedicated->ext7->pucch_ConfigDedicated_r13->spatialBundlingPUSCH_r13)
+ && (format == 1))))
+ spatial_bundling = 1;
#endif
- for (i = 0; i < numCC; i++)
- tmode[i] = get_tmode(mod_idP, i, UE_id);
-
- if (cc->tdd_Config) {
- harq_indication_tdd =
- (nfapi_harq_indication_tdd_rel13_t *) harq_indication;
- // pdu = &harq_indication_tdd->harq_tb_n[0];
-
- num_ack_nak = harq_indication_tdd->number_of_ack_nack;
-
- switch (harq_indication_tdd->mode) {
- case 0: // Format 1a/b
- AssertFatal(numCC == 1,
- "numCC %d > 1, should not be using Format1a/b\n",
- numCC);
- break;
- case 1: // Channel Selection
- break;
- case 2: // Format 3
- break;
- case 3: // Format 4
- break;
- case 4: // Format 5
- break;
- }
- } else {
- harq_indication_fdd =
- (nfapi_harq_indication_fdd_rel13_t *) harq_indication;
- num_ack_nak = harq_indication_fdd->number_of_ack_nack;
- pdu = &harq_indication_fdd->harq_tb_n[0];
-
- uint8_t harq_pid = ((10 * frameP) + subframeP + 10236) & 7;
-
- LOG_D(MAC,"frame %d subframe %d harq_pid %d mode %d tmode[0] %d num_ack_nak %d round %d\n",frameP,subframeP,harq_pid,harq_indication_fdd->mode,tmode[0],num_ack_nak,sched_ctl->round[CC_idP][harq_pid]);
-
- switch (harq_indication_fdd->mode) {
- case 0: // Format 1a/b (10.1.2.1)
- AssertFatal(numCC == 1,
- "numCC %d > 1, should not be using Format1a/b\n",
- numCC);
- if (tmode[0] == 1 || tmode[0] == 2 || tmode[0] == 5 || tmode[0] == 6 || tmode[0] == 7) { // NOTE: have to handle the case of TM9-10 with 1 antenna port
- // single ACK/NAK bit
- AssertFatal(num_ack_nak == 1,
- "num_ack_nak %d > 1 for 1 CC and single-layer transmission frame:%d subframe:%d\n",
- num_ack_nak,frameP,subframeP);
- AssertFatal(sched_ctl->round[CC_idP][harq_pid] < 8,
- "Got ACK/NAK for inactive harq_pid %d for UE %d/%x\n",
- harq_pid, UE_id, rnti);
- AssertFatal(pdu[0] == 1 || pdu[0] == 2
- || pdu[0] == 4,
- "Received ACK/NAK %d which is not 1 or 2 for harq_pid %d from UE %d/%x\n",
- pdu[0], harq_pid, UE_id, rnti);
- LOG_D(MAC, "Received %d for harq_pid %d\n", pdu[0],
- harq_pid);
-
- if (pdu[0] == 1) { // ACK
- sched_ctl->round[CC_idP][harq_pid] = 8; // release HARQ process
- sched_ctl->tbcnt[CC_idP][harq_pid] = 0;
- } else if (pdu[0] == 2 || pdu[0] == 4) // NAK (treat DTX as NAK)
- sched_ctl->round[CC_idP][harq_pid]++; // increment round
- } else {
- // one or two ACK/NAK bits
- AssertFatal(num_ack_nak > 2,
- "num_ack_nak %d > 2 for 1 CC and TM3/4/8/9/10\n",
- num_ack_nak);
- if ((num_ack_nak == 2)
- && (sched_ctl->round[CC_idP][harq_pid] < 8)
- && (sched_ctl->tbcnt[CC_idP][harq_pid] == 1)
- && (pdu[0] == 1) && (pdu[1] == 1)) {
- sched_ctl->round[CC_idP][harq_pid] = 8;
- sched_ctl->tbcnt[CC_idP][harq_pid] = 0;
- }
- if ((num_ack_nak == 2)
- && (sched_ctl->round[CC_idP][harq_pid] < 8)
- && (sched_ctl->tbcnt[CC_idP][harq_pid] == 1)
- && (pdu[0] == 2) && (pdu[1] == 2))
- sched_ctl->round[CC_idP][harq_pid]++;
- else if (((num_ack_nak == 2)
- && (sched_ctl->round[CC_idP][harq_pid] < 8)
- && (sched_ctl->tbcnt[0][harq_pid] == 2)
- && (pdu[0] == 1) && (pdu[1] == 2))
- || ((num_ack_nak == 2)
- && (sched_ctl->round[CC_idP][harq_pid] < 8)
- && (sched_ctl->tbcnt[CC_idP][harq_pid] == 2)
- && (pdu[0] == 2) && (pdu[1] == 1))) {
- sched_ctl->round[CC_idP][harq_pid]++;
- sched_ctl->tbcnt[CC_idP][harq_pid] = 1;
- } else if ((num_ack_nak == 2)
- && (sched_ctl->round[CC_idP][harq_pid] < 8)
- && (sched_ctl->tbcnt[CC_idP][harq_pid] == 2)
- && (pdu[0] == 2) && (pdu[1] == 2))
- sched_ctl->round[CC_idP][harq_pid]++;
- else
- AssertFatal(1 == 0,
- "Illegal ACK/NAK/round combination (%d,%d,%d,%d,%d) for harq_pid %d, UE %d/%x\n",
- num_ack_nak,
- sched_ctl->round[CC_idP][harq_pid],
- sched_ctl->round[CC_idP][harq_pid], pdu[0],
- pdu[1], harq_pid, UE_id, rnti);
- }
- break;
- case 1: // FDD Channel Selection (10.1.2.2.1), must be received for 2 serving cells
- AssertFatal(numCC == 2,
- "Should not receive harq indication with channel selection with %d active CCs\n",
- numCC);
-
- if ((num_ack_nak == 2)
- && (sched_ctl->round[pCCid][harq_pid] < 8)
- && (sched_ctl->round[1 - pCCid][harq_pid] < 8)
- && (sched_ctl->tbcnt[pCCid][harq_pid] == 1)
- && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 1)) {
- AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
- pdu[0]);
- AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
- pdu[1]);
- if (pdu[0] == 1)
- sched_ctl->round[pCCid][harq_pid] = 8;
- else
- sched_ctl->round[pCCid][harq_pid]++;
- if (pdu[1] == 1)
- sched_ctl->round[1 - pCCid][harq_pid] = 8;
- else
- sched_ctl->round[1 - pCCid][harq_pid]++;
- } // A=2
- else if ((num_ack_nak == 3)
- && (sched_ctl->round[pCCid][harq_pid] < 8)
- && (sched_ctl->tbcnt[pCCid][harq_pid] == 2)
- && (sched_ctl->round[1 - pCCid][harq_pid] < 8)
- && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 1)) {
- AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
- pdu[0]);
- AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
- pdu[1]);
- AssertFatal(pdu[2] <= 3, "pdu[2] %d is not ACK/NAK/DTX\n",
- pdu[2]);
- AssertFatal(sched_ctl->tbcnt[pCCid][harq_pid] == 2,
- "sched_ctl->tbcnt[%d][%d] != 2 for UE %d/%x\n",
- pCCid, harq_pid, UE_id, rnti);
- AssertFatal(sched_ctl->tbcnt[1 - pCCid][harq_pid] == 1,
- "sched_ctl->tbcnt[%d][%d] != 1 for UE %d/%x\n",
- 1 - pCCid, harq_pid, UE_id, rnti);
- if ((pdu[0] == 1) && (pdu[1] == 1)) { // both ACK
- sched_ctl->round[pCCid][harq_pid] = 8;
- sched_ctl->tbcnt[pCCid][harq_pid] = 0;
- } else if (((pdu[0] == 2) && (pdu[1] == 1)) ||
- ((pdu[0] == 1) && (pdu[1] == 2))) {
- sched_ctl->round[pCCid][harq_pid]++;
- sched_ctl->tbcnt[pCCid][harq_pid] = 1;
- } else
- sched_ctl->round[pCCid][harq_pid]++;
-
- if (pdu[2] == 1)
- sched_ctl->round[1 - pCCid][harq_pid] = 8;
- else
- sched_ctl->round[1 - pCCid][harq_pid]++;
- } // A=3 primary cell has 2 TBs
- else if ((num_ack_nak == 3)
- && (sched_ctl->round[1 - pCCid][harq_pid] < 8)
- && (sched_ctl->round[pCCid][harq_pid] < 8)
- && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 2)
- && (sched_ctl->tbcnt[pCCid][harq_pid] == 1)) {
- AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
- pdu[0]);
- AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
- pdu[1]);
- AssertFatal(pdu[2] <= 3, "pdu[2] %d is not ACK/NAK/DTX\n",
- pdu[2]);
- AssertFatal(sched_ctl->tbcnt[1 - pCCid][harq_pid] == 2,
- "sched_ctl->tbcnt[%d][%d] != 2 for UE %d/%x\n",
- 1 - pCCid, harq_pid, UE_id, rnti);
- AssertFatal(sched_ctl->tbcnt[pCCid][harq_pid] == 1,
- "sched_ctl->tbcnt[%d][%d] != 1 for UE %d/%x\n",
- pCCid, harq_pid, UE_id, rnti);
- if ((pdu[0] == 1) && (pdu[1] == 1)) { // both ACK
- sched_ctl->round[1 - pCCid][harq_pid] = 8;
- sched_ctl->tbcnt[1 - pCCid][harq_pid] = 0;
- } else if (((pdu[0] >= 2) && (pdu[1] == 1))
- || ((pdu[0] == 1) && (pdu[1] >= 2))) { // one ACK
- sched_ctl->round[1 - pCCid][harq_pid]++;
- sched_ctl->tbcnt[1 - pCCid][harq_pid] = 1;
- } else // both NAK/DTX
- sched_ctl->round[1 - pCCid][harq_pid]++;
-
- if (pdu[2] == 1)
- sched_ctl->round[pCCid][harq_pid] = 8;
- else
- sched_ctl->round[pCCid][harq_pid]++;
- } // A=3 secondary cell has 2 TBs
+ for (i = 0; i < numCC; i++)
+ tmode[i] = get_tmode(mod_idP, i, UE_id);
+
+ if (cc->tdd_Config) {
+ harq_indication_tdd = (nfapi_harq_indication_tdd_rel13_t *) harq_indication;
+ // pdu = &harq_indication_tdd->harq_tb_n[0];
+
+ num_ack_nak = harq_indication_tdd->number_of_ack_nack;
+
+ switch (harq_indication_tdd->mode) {
+ case 0: // Format 1a/b
+ AssertFatal(numCC == 1,
+ "numCC %d > 1, should not be using Format1a/b\n",
+ numCC);
+ break;
+ case 1: // Channel Selection
+ break;
+ case 2: // Format 3
+ break;
+ case 3: // Format 4
+ break;
+ case 4: // Format 5
+ break;
+ }
+ } else {
+ harq_indication_fdd = (nfapi_harq_indication_fdd_rel13_t *) harq_indication;
+ num_ack_nak = harq_indication_fdd->number_of_ack_nack;
+ pdu = &harq_indication_fdd->harq_tb_n[0];
+
+ uint8_t harq_pid = ((10 * frameP) + subframeP + 10236) & 7;
+
+ LOG_D(MAC,"frame %d subframe %d harq_pid %d mode %d tmode[0] %d num_ack_nak %d round %d\n",frameP,subframeP,harq_pid,harq_indication_fdd->mode,tmode[0],num_ack_nak,sched_ctl->round[CC_idP][harq_pid]);
+
+ switch (harq_indication_fdd->mode) {
+ case 0: // Format 1a/b (10.1.2.1)
+ AssertFatal(numCC == 1,
+ "numCC %d > 1, should not be using Format1a/b\n",
+ numCC);
+ if (tmode[0] == 1 || tmode[0] == 2 || tmode[0] == 5 || tmode[0] == 6 || tmode[0] == 7) { // NOTE: have to handle the case of TM9-10 with 1 antenna port
+ // single ACK/NAK bit
+ AssertFatal(num_ack_nak == 1,
+ "num_ack_nak %d > 1 for 1 CC and single-layer transmission frame:%d subframe:%d\n",
+ num_ack_nak,frameP,subframeP);
+ AssertFatal(sched_ctl->round[CC_idP][harq_pid] < 8,
+ "Got ACK/NAK for inactive harq_pid %d for UE %d/%x\n",
+ harq_pid, UE_id, rnti);
+ AssertFatal(pdu[0] == 1 || pdu[0] == 2
+ || pdu[0] == 4,
+ "Received ACK/NAK %d which is not 1 or 2 for harq_pid %d from UE %d/%x\n",
+ pdu[0], harq_pid, UE_id, rnti);
+ LOG_D(MAC, "Received %d for harq_pid %d\n", pdu[0],
+ harq_pid);
+
+ if (pdu[0] == 1) { // ACK
+ sched_ctl->round[CC_idP][harq_pid] = 8; // release HARQ process
+ sched_ctl->tbcnt[CC_idP][harq_pid] = 0;
+ } else if (pdu[0] == 2 || pdu[0] == 4) // NAK (treat DTX as NAK)
+ sched_ctl->round[CC_idP][harq_pid]++; // increment round
+ } else {
+ // one or two ACK/NAK bits
+ AssertFatal(num_ack_nak <= 2,
+ "num_ack_nak %d > 2 for 1 CC and TM3/4/8/9/10\n",
+ num_ack_nak);
+ if ((num_ack_nak == 2)
+ && (sched_ctl->round[CC_idP][harq_pid] < 8)
+ && (sched_ctl->tbcnt[CC_idP][harq_pid] == 1)
+ && (pdu[0] == 1) && (pdu[1] == 1)) {
+ sched_ctl->round[CC_idP][harq_pid] = 8;
+ sched_ctl->tbcnt[CC_idP][harq_pid] = 0;
+ }
+ if ((num_ack_nak == 2)
+ && (sched_ctl->round[CC_idP][harq_pid] < 8)
+ && (sched_ctl->tbcnt[CC_idP][harq_pid] == 1)
+ && (pdu[0] == 2) && (pdu[1] == 2))
+ sched_ctl->round[CC_idP][harq_pid]++;
+ else if (((num_ack_nak == 2)
+ && (sched_ctl->round[CC_idP][harq_pid] < 8)
+ && (sched_ctl->tbcnt[0][harq_pid] == 2)
+ && (pdu[0] == 1) && (pdu[1] == 2))
+ || ((num_ack_nak == 2)
+ && (sched_ctl->round[CC_idP][harq_pid] < 8)
+ && (sched_ctl->tbcnt[CC_idP][harq_pid] == 2)
+ && (pdu[0] == 2) && (pdu[1] == 1))) {
+ sched_ctl->round[CC_idP][harq_pid]++;
+ sched_ctl->tbcnt[CC_idP][harq_pid] = 1;
+ } else if ((num_ack_nak == 2)
+ && (sched_ctl->round[CC_idP][harq_pid] < 8)
+ && (sched_ctl->tbcnt[CC_idP][harq_pid] == 2)
+ && (pdu[0] == 2) && (pdu[1] == 2))
+ sched_ctl->round[CC_idP][harq_pid]++;
+ else
+ AssertFatal(1 == 0,
+ "Illegal ACK/NAK/round combination (%d,%d,%d,%d,%d) for harq_pid %d, UE %d/%x\n",
+ num_ack_nak,
+ sched_ctl->round[CC_idP][harq_pid],
+ sched_ctl->round[CC_idP][harq_pid], pdu[0],
+ pdu[1], harq_pid, UE_id, rnti);
+ }
+ break;
+ case 1: // FDD Channel Selection (10.1.2.2.1), must be received for 2 serving cells
+ AssertFatal(numCC == 2,
+ "Should not receive harq indication with channel selection with %d active CCs\n",
+ numCC);
+
+ if ((num_ack_nak == 2)
+ && (sched_ctl->round[pCCid][harq_pid] < 8)
+ && (sched_ctl->round[1 - pCCid][harq_pid] < 8)
+ && (sched_ctl->tbcnt[pCCid][harq_pid] == 1)
+ && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 1)) {
+ AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
+ pdu[0]);
+ AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
+ pdu[1]);
+ if (pdu[0] == 1)
+ sched_ctl->round[pCCid][harq_pid] = 8;
+ else
+ sched_ctl->round[pCCid][harq_pid]++;
+ if (pdu[1] == 1)
+ sched_ctl->round[1 - pCCid][harq_pid] = 8;
+ else
+ sched_ctl->round[1 - pCCid][harq_pid]++;
+ } // A=2
+ else if ((num_ack_nak == 3)
+ && (sched_ctl->round[pCCid][harq_pid] < 8)
+ && (sched_ctl->tbcnt[pCCid][harq_pid] == 2)
+ && (sched_ctl->round[1 - pCCid][harq_pid] < 8)
+ && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 1)) {
+ AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
+ pdu[0]);
+ AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
+ pdu[1]);
+ AssertFatal(pdu[2] <= 3, "pdu[2] %d is not ACK/NAK/DTX\n",
+ pdu[2]);
+ AssertFatal(sched_ctl->tbcnt[pCCid][harq_pid] == 2,
+ "sched_ctl->tbcnt[%d][%d] != 2 for UE %d/%x\n",
+ pCCid, harq_pid, UE_id, rnti);
+ AssertFatal(sched_ctl->tbcnt[1 - pCCid][harq_pid] == 1,
+ "sched_ctl->tbcnt[%d][%d] != 1 for UE %d/%x\n",
+ 1 - pCCid, harq_pid, UE_id, rnti);
+ if ((pdu[0] == 1) && (pdu[1] == 1)) { // both ACK
+ sched_ctl->round[pCCid][harq_pid] = 8;
+ sched_ctl->tbcnt[pCCid][harq_pid] = 0;
+ } else if (((pdu[0] == 2) && (pdu[1] == 1)) ||
+ ((pdu[0] == 1) && (pdu[1] == 2))) {
+ sched_ctl->round[pCCid][harq_pid]++;
+ sched_ctl->tbcnt[pCCid][harq_pid] = 1;
+ } else
+ sched_ctl->round[pCCid][harq_pid]++;
+
+ if (pdu[2] == 1)
+ sched_ctl->round[1 - pCCid][harq_pid] = 8;
+ else
+ sched_ctl->round[1 - pCCid][harq_pid]++;
+ } // A=3 primary cell has 2 TBs
+ else if ((num_ack_nak == 3)
+ && (sched_ctl->round[1 - pCCid][harq_pid] < 8)
+ && (sched_ctl->round[pCCid][harq_pid] < 8)
+ && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 2)
+ && (sched_ctl->tbcnt[pCCid][harq_pid] == 1)) {
+ AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
+ pdu[0]);
+ AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
+ pdu[1]);
+ AssertFatal(pdu[2] <= 3, "pdu[2] %d is not ACK/NAK/DTX\n",
+ pdu[2]);
+ AssertFatal(sched_ctl->tbcnt[1 - pCCid][harq_pid] == 2,
+ "sched_ctl->tbcnt[%d][%d] != 2 for UE %d/%x\n",
+ 1 - pCCid, harq_pid, UE_id, rnti);
+ AssertFatal(sched_ctl->tbcnt[pCCid][harq_pid] == 1,
+ "sched_ctl->tbcnt[%d][%d] != 1 for UE %d/%x\n",
+ pCCid, harq_pid, UE_id, rnti);
+ if ((pdu[0] == 1) && (pdu[1] == 1)) { // both ACK
+ sched_ctl->round[1 - pCCid][harq_pid] = 8;
+ sched_ctl->tbcnt[1 - pCCid][harq_pid] = 0;
+ } else if (((pdu[0] >= 2) && (pdu[1] == 1))
+ || ((pdu[0] == 1) && (pdu[1] >= 2))) { // one ACK
+ sched_ctl->round[1 - pCCid][harq_pid]++;
+ sched_ctl->tbcnt[1 - pCCid][harq_pid] = 1;
+ } else // both NAK/DTX
+ sched_ctl->round[1 - pCCid][harq_pid]++;
+
+ if (pdu[2] == 1)
+ sched_ctl->round[pCCid][harq_pid] = 8;
+ else
+ sched_ctl->round[pCCid][harq_pid]++;
+ } // A=3 secondary cell has 2 TBs
#if MAX_NUM_CCs>1
- else if ((num_ack_nak == 4)
- && (sched_ctl->round[0][harq_pid] < 8)
- && (sched_ctl->round[1][harq_pid] < 8)
- && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 2)
- && (sched_ctl->tbcnt[pCCid][harq_pid] == 2)) {
- AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
- pdu[0]);
- AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
- pdu[1]);
- AssertFatal(pdu[2] <= 3, "pdu[2] %d is not ACK/NAK/DTX\n",
- pdu[2]);
- AssertFatal(pdu[3] <= 3, "pdu[3] %d is not ACK/NAK/DTX\n",
- pdu[3]);
- AssertFatal(sched_ctl->tbcnt[0][harq_pid] == 2,
- "sched_ctl->tbcnt[0][%d] != 2 for UE %d/%x\n",
- harq_pid, UE_id, rnti);
- AssertFatal(sched_ctl->tbcnt[1][harq_pid] == 2,
- "sched_ctl->tbcnt[1][%d] != 2 for UE %d/%x\n",
- harq_pid, UE_id, rnti);
- if ((pdu[0] == 1) && (pdu[1] == 1)) { // both ACK
- sched_ctl->round[0][harq_pid] = 8;
- sched_ctl->tbcnt[0][harq_pid] = 0;
- } else if (((pdu[0] >= 2) && (pdu[1] == 1))
- || ((pdu[0] == 1) && (pdu[1] >= 2))) { // one ACK
- sched_ctl->round[0][harq_pid]++;
- sched_ctl->tbcnt[0][harq_pid] = 1;
- } else // both NAK/DTX
- sched_ctl->round[0][harq_pid]++;
-
- if ((pdu[2] == 1) && (pdu[3] == 1)) { // both ACK
- sched_ctl->round[1][harq_pid] = 8;
- sched_ctl->tbcnt[1][harq_pid] = 0;
- } else if (((pdu[2] >= 2) && (pdu[3] == 1))
- || ((pdu[2] == 1) && (pdu[3] >= 2))) { // one ACK
- sched_ctl->round[1][harq_pid]++;
- sched_ctl->tbcnt[1][harq_pid] = 1;
- } else // both NAK/DTX
- sched_ctl->round[1][harq_pid]++;
- } // A=4 both serving cells have 2 TBs
+ else if ((num_ack_nak == 4)
+ && (sched_ctl->round[0][harq_pid] < 8)
+ && (sched_ctl->round[1][harq_pid] < 8)
+ && (sched_ctl->tbcnt[1 - pCCid][harq_pid] == 2)
+ && (sched_ctl->tbcnt[pCCid][harq_pid] == 2)) {
+ AssertFatal(pdu[0] <= 3, "pdu[0] %d is not ACK/NAK/DTX\n",
+ pdu[0]);
+ AssertFatal(pdu[1] <= 3, "pdu[1] %d is not ACK/NAK/DTX\n",
+ pdu[1]);
+ AssertFatal(pdu[2] <= 3, "pdu[2] %d is not ACK/NAK/DTX\n",
+ pdu[2]);
+ AssertFatal(pdu[3] <= 3, "pdu[3] %d is not ACK/NAK/DTX\n",
+ pdu[3]);
+ AssertFatal(sched_ctl->tbcnt[0][harq_pid] == 2,
+ "sched_ctl->tbcnt[0][%d] != 2 for UE %d/%x\n",
+ harq_pid, UE_id, rnti);
+ AssertFatal(sched_ctl->tbcnt[1][harq_pid] == 2,
+ "sched_ctl->tbcnt[1][%d] != 2 for UE %d/%x\n",
+ harq_pid, UE_id, rnti);
+ if ((pdu[0] == 1) && (pdu[1] == 1)) { // both ACK
+ sched_ctl->round[0][harq_pid] = 8;
+ sched_ctl->tbcnt[0][harq_pid] = 0;
+ } else if (((pdu[0] >= 2) && (pdu[1] == 1))
+ || ((pdu[0] == 1) && (pdu[1] >= 2))) { // one ACK
+ sched_ctl->round[0][harq_pid]++;
+ sched_ctl->tbcnt[0][harq_pid] = 1;
+ } else // both NAK/DTX
+ sched_ctl->round[0][harq_pid]++;
+
+ if ((pdu[2] == 1) && (pdu[3] == 1)) { // both ACK
+ sched_ctl->round[1][harq_pid] = 8;
+ sched_ctl->tbcnt[1][harq_pid] = 0;
+ } else if (((pdu[2] >= 2) && (pdu[3] == 1))
+ || ((pdu[2] == 1) && (pdu[3] >= 2))) { // one ACK
+ sched_ctl->round[1][harq_pid]++;
+ sched_ctl->tbcnt[1][harq_pid] = 1;
+ } else // both NAK/DTX
+ sched_ctl->round[1][harq_pid]++;
+ } // A=4 both serving cells have 2 TBs
#endif
- break;
- case 2: // Format 3
- AssertFatal(numCC > 2,
- "Should not receive harq indication with FDD format 3 with %d < 3 active CCs\n",
- numCC);
- for (i = 0, j = 0; i < numCC; i++) {
- if ((sched_ctl->round[i][harq_pid] < 8)) {
- if (tmode[i] == 1 || tmode[i] == 2 || tmode[0] == 5
- || tmode[0] == 6 || tmode[0] == 7) {
- if (pdu[j] == 1) {
- sched_ctl->round[i][harq_pid] = 8;
- sched_ctl->tbcnt[i][harq_pid] = 0;
- } else if (pdu[j] == 2)
- sched_ctl->round[i][harq_pid]++;
- else
- AssertFatal(1 == 0,
- "Illegal harq_ack value for CC %d harq_pid %d (%d) UE %d/%x\n",
- i, harq_pid, pdu[j], UE_id, rnti);
- j++;
- } else if (spatial_bundling == 0) {
- if ((sched_ctl->tbcnt[i][harq_pid] == 2)
- && (pdu[j] == 1) && (pdu[j + 1] == 1)) {
- sched_ctl->round[i][harq_pid] = 8;
- sched_ctl->tbcnt[i][harq_pid] = 0;
- } else if ((sched_ctl->tbcnt[i][harq_pid] == 2)
- && (pdu[j] == 1) && (pdu[j + 1] == 2)) {
- sched_ctl->round[i][harq_pid]++;
- sched_ctl->tbcnt[i][harq_pid] = 1;
- } else if ((sched_ctl->tbcnt[i][harq_pid] == 2)
- && (pdu[j] == 2) && (pdu[j + 1] == 1)) {
- sched_ctl->round[i][harq_pid]++;
- sched_ctl->tbcnt[i][harq_pid] = 1;
- } else if ((sched_ctl->tbcnt[i][harq_pid] == 2)
- && (pdu[j] == 2) && (pdu[j + 1] == 2)) {
- sched_ctl->round[i][harq_pid]++;
- } else
- AssertFatal(1 == 0,
- "Illegal combination for CC %d harq_pid %d (%d,%d,%d) UE %d/%x\n",
- i, harq_pid,
- sched_ctl->tbcnt[i][harq_pid],
- pdu[j], pdu[j + 1], UE_id, rnti);
- j += 2;
- } else if (spatial_bundling == 1) {
- if (pdu[j] == 1) {
- sched_ctl->round[i][harq_pid] = 8;
- sched_ctl->tbcnt[i][harq_pid] = 0;
- } else if (pdu[j] == 2) {
- sched_ctl->round[i][harq_pid]++;
- } else
- AssertFatal(1 == 0,
- "Illegal hack_nak value %d for CC %d harq_pid %d UE %d/%x\n",
- pdu[j], i, harq_pid, UE_id, rnti);
- j++;
- } else
- AssertFatal(1 == 0,
- "Illegal value for spatial_bundling %d\n",
- spatial_bundling);
- }
- }
- break;
- case 3: // Format 4
- AssertFatal(1 == 0,
- "Should not receive harq indication with Format 4\n");
- break;
- case 4: // Format 5
+ break;
+ case 2: // Format 3
+ AssertFatal(numCC > 2,
+ "Should not receive harq indication with FDD format 3 with %d < 3 active CCs\n",
+ numCC);
+ for (i = 0, j = 0; i < numCC; i++) {
+ if ((sched_ctl->round[i][harq_pid] < 8)) {
+ if (tmode[i] == 1 || tmode[i] == 2 || tmode[0] == 5
+ || tmode[0] == 6 || tmode[0] == 7) {
+ if (pdu[j] == 1) {
+ sched_ctl->round[i][harq_pid] = 8;
+ sched_ctl->tbcnt[i][harq_pid] = 0;
+ } else if (pdu[j] == 2)
+ sched_ctl->round[i][harq_pid]++;
+ else
+ AssertFatal(1 == 0,
+ "Illegal harq_ack value for CC %d harq_pid %d (%d) UE %d/%x\n",
+ i, harq_pid, pdu[j], UE_id, rnti);
+ j++;
+ } else if (spatial_bundling == 0) {
+ if ((sched_ctl->tbcnt[i][harq_pid] == 2)
+ && (pdu[j] == 1) && (pdu[j + 1] == 1)) {
+ sched_ctl->round[i][harq_pid] = 8;
+ sched_ctl->tbcnt[i][harq_pid] = 0;
+ } else if ((sched_ctl->tbcnt[i][harq_pid] == 2)
+ && (pdu[j] == 1) && (pdu[j + 1] == 2)) {
+ sched_ctl->round[i][harq_pid]++;
+ sched_ctl->tbcnt[i][harq_pid] = 1;
+ } else if ((sched_ctl->tbcnt[i][harq_pid] == 2)
+ && (pdu[j] == 2) && (pdu[j + 1] == 1)) {
+ sched_ctl->round[i][harq_pid]++;
+ sched_ctl->tbcnt[i][harq_pid] = 1;
+ } else if ((sched_ctl->tbcnt[i][harq_pid] == 2)
+ && (pdu[j] == 2) && (pdu[j + 1] == 2)) {
+ sched_ctl->round[i][harq_pid]++;
+ } else
+ AssertFatal(1 == 0,
+ "Illegal combination for CC %d harq_pid %d (%d,%d,%d) UE %d/%x\n",
+ i, harq_pid,
+ sched_ctl->tbcnt[i][harq_pid],
+ pdu[j], pdu[j + 1], UE_id, rnti);
+ j += 2;
+ } else if (spatial_bundling == 1) {
+ if (pdu[j] == 1) {
+ sched_ctl->round[i][harq_pid] = 8;
+ sched_ctl->tbcnt[i][harq_pid] = 0;
+ } else if (pdu[j] == 2) {
+ sched_ctl->round[i][harq_pid]++;
+ } else
+ AssertFatal(1 == 0,
+ "Illegal hack_nak value %d for CC %d harq_pid %d UE %d/%x\n",
+ pdu[j], i, harq_pid, UE_id, rnti);
+ j++;
+ } else
AssertFatal(1 == 0,
- "Should not receive harq indication with Format 5\n");
- break;
+ "Illegal value for spatial_bundling %d\n",
+ spatial_bundling);
}
+ }
+ break;
+ case 3: // Format 4
+ AssertFatal(1 == 0,
+ "Should not receive harq indication with Format 4\n");
+ break;
+ case 4: // Format 5
+ AssertFatal(1 == 0,
+ "Should not receive harq indication with Format 5\n");
+ break;
}
+ }
}
void
@@ -3965,129 +3516,106 @@ extract_pucch_csi(module_id_t mod_idP, int CC_idP, int UE_id,
frame_t frameP, sub_frame_t subframeP,
uint8_t * pdu, uint8_t length)
{
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
- COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
- struct CQI_ReportPeriodic *cqi_ReportPeriodic;
- int no_pmi;
- uint8_t Ltab[6] = { 0, 2, 4, 4, 4, 4 };
- uint8_t Jtab[6] = { 0, 2, 2, 3, 4, 4 };
- int feedback_cnt;
-
- AssertFatal(UE_list->UE_template[CC_idP][UE_id].
- physicalConfigDedicated != NULL,
- "physicalConfigDedicated is null for UE %d\n", UE_id);
- AssertFatal(UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- cqi_ReportConfig != NULL,
- "cqi_ReportConfig is null for UE %d\n", UE_id);
- AssertFatal((cqi_ReportPeriodic =
- UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- cqi_ReportConfig->cqi_ReportPeriodic) != NULL,
- "cqi_ReportPeriodic is null for UE %d\n", UE_id);
-
- // determine feedback mode
- AssertFatal(cqi_ReportPeriodic->present !=
- CQI_ReportPeriodic_PR_NOTHING,
- "cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_NOTHING!\n");
- AssertFatal(cqi_ReportPeriodic->choice.
- setup.cqi_FormatIndicatorPeriodic.present !=
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING,
- "cqi_ReportPeriodic->cqi_FormatIndicatorPeriodic.choice.setup.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING!\n");
-
- uint16_t Npd, N_OFFSET_CQI;
- int H, K, bandwidth_part, L, Lmask;
- int ri = sched_ctl->periodic_ri_received[CC_idP];
-
- get_csi_params(cc, cqi_ReportPeriodic, &Npd, &N_OFFSET_CQI, &H);
- K = (H - 1) / Jtab[cc->mib->message.dl_Bandwidth];
- L = Ltab[cc->mib->message.dl_Bandwidth];
- Lmask = L - 1;
- feedback_cnt = (((frameP * 10) + subframeP) / Npd) % H;
-
- if (feedback_cnt > 0)
- bandwidth_part = (feedback_cnt - 1) % K;
- else
- bandwidth_part = 0;
-
- switch (get_tmode(mod_idP, CC_idP, UE_id)) {
- case 1:
- case 2:
- case 3:
- case 7:
- no_pmi = 1;
- break;
- case 4:
- case 5:
- case 6:
- no_pmi = 0;
- break;
- default:
- // note: need to check TM8-10 without PMI/RI or with 1 antenna port (see Section 5.2.3.3.1 from 36.213)
- no_pmi = 0;
- }
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+ COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
+ struct CQI_ReportPeriodic *cqi_ReportPeriodic;
+ int no_pmi;
+ uint8_t Ltab[6] = { 0, 2, 4, 4, 4, 4 };
+ uint8_t Jtab[6] = { 0, 2, 2, 3, 4, 4 };
+ int feedback_cnt;
+
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated != NULL,
+ "physicalConfigDedicated is null for UE %d\n", UE_id);
+ AssertFatal(UE_list->
+ UE_template[CC_idP][UE_id].physicalConfigDedicated->cqi_ReportConfig != NULL,
+ "cqi_ReportConfig is null for UE %d\n", UE_id);
+ AssertFatal((cqi_ReportPeriodic = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->cqi_ReportConfig->cqi_ReportPeriodic) != NULL,
+ "cqi_ReportPeriodic is null for UE %d\n", UE_id);
+
+ // determine feedback mode
+ AssertFatal(cqi_ReportPeriodic->present != CQI_ReportPeriodic_PR_NOTHING,
+ "cqi_ReportPeriodic->present == CQI_ReportPeriodic_PR_NOTHING!\n");
+ AssertFatal(cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present != CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING,
+ "cqi_ReportPeriodic->cqi_FormatIndicatorPeriodic.choice.setup.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_NOTHING!\n");
+
+ uint16_t Npd, N_OFFSET_CQI;
+ int H, K, bandwidth_part, L, Lmask;
+ int ri = sched_ctl->periodic_ri_received[CC_idP];
+
+ get_csi_params(cc, cqi_ReportPeriodic, &Npd, &N_OFFSET_CQI, &H);
+ K = (H - 1) / Jtab[cc->mib->message.dl_Bandwidth];
+ L = Ltab[cc->mib->message.dl_Bandwidth];
+ Lmask = L - 1;
+ feedback_cnt = (((frameP * 10) + subframeP) / Npd) % H;
+
+ if (feedback_cnt > 0)
+ bandwidth_part = (feedback_cnt - 1) % K;
+ else
+ bandwidth_part = 0;
+
+ switch (get_tmode(mod_idP, CC_idP, UE_id)) {
+ case 1:
+ case 2:
+ case 3:
+ case 7:
+ no_pmi = 1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ no_pmi = 0;
+ break;
+ default:
+ // note: need to check TM8-10 without PMI/RI or with 1 antenna port (see Section 5.2.3.3.1 from 36.213)
+ no_pmi = 0;
+ }
- if ((cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.
- present ==
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_widebandCQI)
- || (feedback_cnt == 0)) {
- // Note: This implements only Tables: 5.3.3.1-1,5.3.3.1-1A and 5.3.3.1-2 from 36.213 (1,2,4 antenna ports Wideband CQI/PMI)
-
- if (no_pmi == 1) { // get spatial_diffcqi if needed
- sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
- sched_ctl->periodic_wideband_spatial_diffcqi[CC_idP] =
- (pdu[0] >> 4) & 7;
- } else if ((cc->p_eNB == 2) && (ri == 1)) {
- // p=2 Rank 1 wideband CQI/PMI 6 bits
- sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
- sched_ctl->periodic_wideband_pmi[CC_idP] = (pdu[0] >> 4) & 3;
- } else if ((cc->p_eNB == 2) && (ri > 1)) {
- // p=2 Rank 2 wideband CQI/PMI 8 bits
- sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
- sched_ctl->periodic_wideband_spatial_diffcqi[CC_idP] =
- (pdu[0] >> 4) & 7;
- sched_ctl->periodic_wideband_pmi[CC_idP] = (pdu[0] >> 7) & 1;
- } else if ((cc->p_eNB == 4) && (ri == 1)) {
- // p=4 Rank 1 wideband CQI/PMI 8 bits
- sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
- sched_ctl->periodic_wideband_pmi[CC_idP] =
- (pdu[0] >> 4) & 0x0F;
-
- } else if ((cc->p_eNB == 4) && (ri > 1)) {
- // p=4 Rank 2 wideband CQI/PMI 11 bits
- sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
- sched_ctl->periodic_wideband_spatial_diffcqi[CC_idP] =
- (pdu[0] >> 4) & 7;
- sched_ctl->periodic_wideband_pmi[CC_idP] = (pdu[0] >> 7) & 0xF;
- } else
- AssertFatal(1 == 0,
- "illegal combination p %d, ri %d, no_pmi %d\n",
- cc->p_eNB, ri, no_pmi);
- } else if (cqi_ReportPeriodic->choice.
- setup.cqi_FormatIndicatorPeriodic.present ==
- CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI)
+ if ((cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_widebandCQI)
+ || (feedback_cnt == 0)) {
+ // Note: This implements only Tables: 5.3.3.1-1,5.3.3.1-1A and 5.3.3.1-2 from 36.213 (1,2,4 antenna ports Wideband CQI/PMI)
+
+ if (no_pmi == 1) { // get spatial_diffcqi if needed
+ sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
+ sched_ctl->periodic_wideband_spatial_diffcqi[CC_idP] =
+ (pdu[0] >> 4) & 7;
+ } else if ((cc->p_eNB == 2) && (ri == 1)) {
+ // p=2 Rank 1 wideband CQI/PMI 6 bits
+ sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
+ sched_ctl->periodic_wideband_pmi[CC_idP] = (pdu[0] >> 4) & 3;
+ } else if ((cc->p_eNB == 2) && (ri > 1)) {
+ // p=2 Rank 2 wideband CQI/PMI 8 bits
+ sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
+ sched_ctl->periodic_wideband_spatial_diffcqi[CC_idP] =
+ (pdu[0] >> 4) & 7;
+ sched_ctl->periodic_wideband_pmi[CC_idP] = (pdu[0] >> 7) & 1;
+ } else if ((cc->p_eNB == 4) && (ri == 1)) {
+ // p=4 Rank 1 wideband CQI/PMI 8 bits
+ sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
+ sched_ctl->periodic_wideband_pmi[CC_idP] =
+ (pdu[0] >> 4) & 0x0F;
+ } else if ((cc->p_eNB == 4) && (ri > 1)) {
+ // p=4 Rank 2 wideband CQI/PMI 11 bits
+ sched_ctl->periodic_wideband_cqi[CC_idP] = pdu[0] & 0xF;
+ sched_ctl->periodic_wideband_spatial_diffcqi[CC_idP] =
+ (pdu[0] >> 4) & 7;
+ sched_ctl->periodic_wideband_pmi[CC_idP] = (pdu[0] >> 7) & 0xF;
+ } else
+ AssertFatal(1 == 0,
+ "illegal combination p %d, ri %d, no_pmi %d\n",
+ cc->p_eNB, ri, no_pmi);
+ } else if (cqi_ReportPeriodic->choice.setup.cqi_FormatIndicatorPeriodic.present == CQI_ReportPeriodic__setup__cqi_FormatIndicatorPeriodic_PR_subbandCQI)
{
- // This is Table 5.2.3.3.2-2 for 36.213
- if (ri == 1) {
- //4+Ltab[cc->mib->message.dl_Bandwidth] bits
- sched_ctl->periodic_subband_cqi[CC_idP][(bandwidth_part * L) +
- ((pdu[0] >> 4) &
- Lmask)] =
- pdu[0] & 0xF;
- } else if (ri > 1) {
- //7+Ltab[cc->mib->message.dl_Bandwidth] bits;
- sched_ctl->
- periodic_subband_spatial_diffcqi[CC_idP][(bandwidth_part *
- L) +
- ((pdu[0] >> 7) &
- Lmask)] =
- (pdu[0] >> 4) & 7;
- sched_ctl->periodic_subband_cqi[CC_idP][(bandwidth_part * L) +
- ((pdu[0] >> 7) &
- Lmask)] =
- pdu[0] & 0xF;
- }
+ // This is Table 5.2.3.3.2-2 for 36.213
+ if (ri == 1) {
+ //4+Ltab[cc->mib->message.dl_Bandwidth] bits
+ sched_ctl->periodic_subband_cqi[CC_idP][(bandwidth_part * L) +((pdu[0] >> 4) & Lmask)] = pdu[0] & 0xF;
+ } else if (ri > 1) {
+ //7+Ltab[cc->mib->message.dl_Bandwidth] bits;
+ sched_ctl->periodic_subband_spatial_diffcqi[CC_idP][(bandwidth_part * L) + ((pdu[0] >> 7) & Lmask)] = (pdu[0] >> 4) & 7;
+ sched_ctl->periodic_subband_cqi[CC_idP][(bandwidth_part * L) + ((pdu[0] >> 7) & Lmask)] =
+ pdu[0] & 0xF;
+ }
}
}
@@ -4096,278 +3624,263 @@ extract_pusch_csi(module_id_t mod_idP, int CC_idP, int UE_id,
frame_t frameP, sub_frame_t subframeP,
uint8_t * pdu, uint8_t length)
{
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
- UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
- int Ntab[6] = { 0, 4, 7, 9, 10, 13 };
- int Ntab_uesel[6] = { 0, 8, 13, 17, 19, 25 };
- int Ltab_uesel[6] = { 0, 6, 9, 13, 15, 18 };
- int Mtab_uesel[6] = { 0, 1, 3, 5, 6, 6 };
- int v[6];
- int i;
- uint64_t p = *(uint64_t *) pdu;
- int curbyte, curbit;
- CQI_ReportModeAperiodic_t *cqi_ReportModeAperiodic;
-
- AssertFatal(UE_list->UE_template[CC_idP][UE_id].
- physicalConfigDedicated != NULL,
- "physicalConfigDedicated is null for UE %d\n", UE_id);
- AssertFatal(UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- cqi_ReportConfig != NULL,
- "cqi_ReportConfig is null for UE %d\n", UE_id);
- AssertFatal((cqi_ReportModeAperiodic =
- UE_list->
- UE_template[CC_idP][UE_id].physicalConfigDedicated->
- cqi_ReportConfig->cqi_ReportModeAperiodic) != NULL,
- "cqi_ReportModeAperiodic is null for UE %d\n", UE_id);
-
- int N = Ntab[cc->mib->message.dl_Bandwidth];
- int tmode = get_tmode(mod_idP, CC_idP, UE_id);
- int ri = sched_ctl->aperiodic_ri_received[CC_idP];
- int r, diffcqi0 = 0, diffcqi1 = 0, pmi_uesel = 0;
- int bw = cc->mib->message.dl_Bandwidth;
- int m;
-
- switch (*cqi_ReportModeAperiodic) {
- case CQI_ReportModeAperiodic_rm12:
- AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
- // wideband multiple PMI (TM4/6), Table 5.2.2.6.1-1 (for TM4/6)
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm12\n",
- tmode);
- if (tmode <= 6) { //Table 5.2.2.6.1-1 36.213
- if ((ri == 1) && (cc->p_eNB == 2)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x03);
- p >>= 2;
- }
- }
- if ((ri == 2) && (cc->p_eNB == 2)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x01);
- p >>= 1;
- }
- }
- if ((ri == 1) && (cc->p_eNB == 4)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x03);
- p >>= 4;
- }
- }
- if ((ri == 2) && (cc->p_eNB == 4)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x01);
- p >>= 4;
- }
- }
- } // if (tmode <= 6) { //Table 5.2.2.6.1-1 36.213
- else {
- AssertFatal(1 == 0, "support for TM 8-10 to be done\n");
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
+ UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+ int Ntab[6] = { 0, 4, 7, 9, 10, 13 };
+ int Ntab_uesel[6] = { 0, 8, 13, 17, 19, 25 };
+ int Ltab_uesel[6] = { 0, 6, 9, 13, 15, 18 };
+ int Mtab_uesel[6] = { 0, 1, 3, 5, 6, 6 };
+ int v[6];
+ int i;
+ uint64_t p = *(uint64_t *) pdu;
+ int curbyte, curbit;
+ CQI_ReportModeAperiodic_t *cqi_ReportModeAperiodic;
+
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated != NULL,
+ "physicalConfigDedicated is null for UE %d\n", UE_id);
+ AssertFatal(UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->cqi_ReportConfig != NULL,
+ "cqi_ReportConfig is null for UE %d\n", UE_id);
+ AssertFatal((cqi_ReportModeAperiodic = UE_list->UE_template[CC_idP][UE_id].physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic) != NULL,
+ "cqi_ReportModeAperiodic is null for UE %d\n", UE_id);
+
+ int N = Ntab[cc->mib->message.dl_Bandwidth];
+ int tmode = get_tmode(mod_idP, CC_idP, UE_id);
+ int ri = sched_ctl->aperiodic_ri_received[CC_idP];
+ int r, diffcqi0 = 0, diffcqi1 = 0, pmi_uesel = 0;
+ int bw = cc->mib->message.dl_Bandwidth;
+ int m;
+
+ switch (*cqi_ReportModeAperiodic) {
+ case CQI_ReportModeAperiodic_rm12:
+ AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
+ // wideband multiple PMI (TM4/6), Table 5.2.2.6.1-1 (for TM4/6)
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9 || tmode == 10,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm12\n",
+ tmode);
+ if (tmode <= 6) { //Table 5.2.2.6.1-1 36.213
+ if ((ri == 1) && (cc->p_eNB == 2)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] = (uint8_t) (p & 0x03);
+ p >>= 2;
}
-
- break;
- case CQI_ReportModeAperiodic_rm20:
- AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
- // UE-selected subband CQI no PMI (TM1/2/3/7) , Table 5.2.2.6.3-1 from 36.213
- AssertFatal(tmode == 1 || tmode == 2 || tmode == 3
- || tmode == 7,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm20\n",
- tmode);
-
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ }
+ if ((ri == 2) && (cc->p_eNB == 2)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
p >>= 4;
- diffcqi0 = (uint8_t) (p & 0x03);
- p >>= 2;
- r = (uint8_t) (p & ((1 >> Ltab_uesel[bw]) - 1));
- reverse_index(Ntab_uesel[bw], Mtab_uesel[bw], r, v);
- for (m = 0; m < Mtab_uesel[bw]; m++)
- sched_ctl->aperiodic_subband_diffcqi0[CC_idP][v[m]] = diffcqi0;
- break;
- case CQI_ReportModeAperiodic_rm22:
- AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
- // UE-selected subband CQI multiple PMI (TM4/6) Table 5.2.2.6.3-2 from 36.213
-
- AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
- || tmode == 10,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm22\n",
- tmode);
-
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ sched_ctl->aperiodic_wideband_cqi1[CC_idP] = (uint8_t) (p & 0x0F);
p >>= 4;
- diffcqi0 = (uint8_t) (p & 0x03);
- p >>= 2;
-
- if (ri > 1) {
- sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- diffcqi1 = (uint8_t) (p & 0x03);
- p >>= 2;
- }
- r = (uint8_t) (p & ((1 >> Ltab_uesel[bw]) - 1));
- p >>= Ltab_uesel[bw];
- reverse_index(Ntab_uesel[bw], Mtab_uesel[bw], r, v);
- if ((ri == 1) && (cc->p_eNB == 2)) {
- pmi_uesel = p & 0x3;
- p >>= 2;
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x3;
- } else if ((ri == 2) && (cc->p_eNB == 2)) {
- pmi_uesel = p & 0x1;
- p >>= 1;
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x1;
- } else if (cc->p_eNB == 4) {
- pmi_uesel = p & 0x0F;
- p >>= 4;
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x0F;
- }
- for (m = 0; m < Mtab_uesel[bw]; m++) {
- sched_ctl->aperiodic_subband_diffcqi0[CC_idP][v[m]] = diffcqi0;
- if (ri > 1)
- sched_ctl->aperiodic_subband_diffcqi1[CC_idP][v[m]] =
- diffcqi1;
- sched_ctl->aperiodic_subband_pmi[CC_idP][v[m]] = pmi_uesel;
- }
- break;
- case CQI_ReportModeAperiodic_rm30:
- //subband CQI no PMI (TM1/2/3/7)
- AssertFatal(tmode == 1 || tmode == 2 || tmode == 3
- || tmode == 7,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm30\n",
- tmode);
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] = pdu[0] >> 4;
- curbyte = 0;
- curbit = 3;
for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_diffcqi0[CC_idP][i] =
- (pdu[curbyte] >> (curbit - 1)) & 0x03;
- curbit -= 2;
- if (curbit < 0) {
- curbit = 7;
- curbyte++;
- }
- }
- sched_ctl->dl_cqi[CC_idP] =
- sched_ctl->aperiodic_wideband_cqi0[CC_idP];
- break;
- case CQI_ReportModeAperiodic_rm31:
- AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
- //subband CQI single PMI (TM4/5/6)
- AssertFatal(tmode == 4 || tmode == 5 || tmode == 6 || tmode == 8
- || tmode == 9
- || tmode == 10,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm31\n",
- tmode);
-
- if ((ri == 1) && (cc->p_eNB == 2)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_diffcqi0[CC_idP][i] =
- (uint8_t) (p & 0x03);
- p >>= 2;
- }
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x03;
- }
- if ((ri == 2) && (cc->p_eNB == 2)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x01);
- p >>= 1;
- }
- sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x01);
- p >>= 1;
- }
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x01;
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] = (uint8_t) (p & 0x01);
+ p >>= 1;
}
- if ((ri == 1) && (cc->p_eNB == 4)) {
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_diffcqi0[CC_idP][i] =
- (uint8_t) (p & 0x03);
- p >>= 2;
- }
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x0F;
+ }
+ if ((ri == 1) && (cc->p_eNB == 4)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] = (uint8_t) (p & 0x03);
+ p >>= 4;
}
- if ((ri > 1) && (cc->p_eNB == 4)) { // Note : 64 bits for 20 MHz
- sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x01);
- p >>= 1;
- }
- sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
- (uint8_t) (p & 0x0F);
- p >>= 4;
- for (i = 0; i < N; i++) {
- sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
- (uint8_t) (p & 0x01);
- p >>= 2;
- }
- sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x0F;
+ }
+ if ((ri == 2) && (cc->p_eNB == 4)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ p >>= 4;
+ sched_ctl->aperiodic_wideband_cqi1[CC_idP] = (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] = (uint8_t) (p & 0x01);
+ p >>= 4;
}
+ }
+ } // if (tmode <= 6) { //Table 5.2.2.6.1-1 36.213
+ else {
+ AssertFatal(1 == 0, "support for TM 8-10 to be done\n");
+ }
- break;
- case CQI_ReportModeAperiodic_rm32_v1250:
- AssertFatal(tmode == 4 || tmode == 5 || tmode == 6 || tmode == 8
- || tmode == 9
- || tmode == 10,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm32\n",
- tmode);
- AssertFatal(1 == 0, "CQI_ReportModeAperiodic_rm32 to be done\n");
- break;
- case CQI_ReportModeAperiodic_rm10_v1310:
- AssertFatal(tmode == 1 || tmode == 2 || tmode == 3
- || tmode == 7,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm10\n",
- tmode);
- AssertFatal(1 == 0, "CQI_ReportModeAperiodic_rm10 to be done\n");
- break;
- case CQI_ReportModeAperiodic_rm11_v1310:
- AssertFatal(tmode == 4 || tmode == 5 || tmode == 6 || tmode == 8
- || tmode == 9
- || tmode == 10,
- "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm11\n",
- tmode);
- AssertFatal(1 == 0, "CQI_ReportModeAperiodic_rm11 to be done\n");
- break;
+ break;
+ case CQI_ReportModeAperiodic_rm20:
+ AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
+ // UE-selected subband CQI no PMI (TM1/2/3/7) , Table 5.2.2.6.3-1 from 36.213
+ AssertFatal(tmode == 1 || tmode == 2 || tmode == 3
+ || tmode == 7,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm20\n",
+ tmode);
+
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ p >>= 4;
+ diffcqi0 = (uint8_t) (p & 0x03);
+ p >>= 2;
+ r = (uint8_t) (p & ((1 >> Ltab_uesel[bw]) - 1));
+ reverse_index(Ntab_uesel[bw], Mtab_uesel[bw], r, v);
+ for (m = 0; m < Mtab_uesel[bw]; m++)
+ sched_ctl->aperiodic_subband_diffcqi0[CC_idP][v[m]] = diffcqi0;
+ break;
+ case CQI_ReportModeAperiodic_rm22:
+ AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
+ // UE-selected subband CQI multiple PMI (TM4/6) Table 5.2.2.6.3-2 from 36.213
+
+ AssertFatal(tmode == 4 || tmode == 6 || tmode == 8 || tmode == 9
+ || tmode == 10,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm22\n",
+ tmode);
+
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = (uint8_t) (p & 0x0F);
+ p >>= 4;
+ diffcqi0 = (uint8_t) (p & 0x03);
+ p >>= 2;
+
+ if (ri > 1) {
+ sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ diffcqi1 = (uint8_t) (p & 0x03);
+ p >>= 2;
+ }
+ r = (uint8_t) (p & ((1 >> Ltab_uesel[bw]) - 1));
+ p >>= Ltab_uesel[bw];
+ reverse_index(Ntab_uesel[bw], Mtab_uesel[bw], r, v);
+ if ((ri == 1) && (cc->p_eNB == 2)) {
+ pmi_uesel = p & 0x3;
+ p >>= 2;
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x3;
+ } else if ((ri == 2) && (cc->p_eNB == 2)) {
+ pmi_uesel = p & 0x1;
+ p >>= 1;
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x1;
+ } else if (cc->p_eNB == 4) {
+ pmi_uesel = p & 0x0F;
+ p >>= 4;
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x0F;
+ }
+ for (m = 0; m < Mtab_uesel[bw]; m++) {
+ sched_ctl->aperiodic_subband_diffcqi0[CC_idP][v[m]] = diffcqi0;
+ if (ri > 1)
+ sched_ctl->aperiodic_subband_diffcqi1[CC_idP][v[m]] =
+ diffcqi1;
+ sched_ctl->aperiodic_subband_pmi[CC_idP][v[m]] = pmi_uesel;
+ }
+ break;
+ case CQI_ReportModeAperiodic_rm30:
+ //subband CQI no PMI (TM1/2/3/7)
+ AssertFatal(tmode == 1 || tmode == 2 || tmode == 3
+ || tmode == 7,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm30\n",
+ tmode);
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] = pdu[0] >> 4;
+ curbyte = 0;
+ curbit = 3;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_diffcqi0[CC_idP][i] =
+ (pdu[curbyte] >> (curbit - 1)) & 0x03;
+ curbit -= 2;
+ if (curbit < 0) {
+ curbit = 7;
+ curbyte++;
+ }
+ }
+ sched_ctl->dl_cqi[CC_idP] =
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP];
+ break;
+ case CQI_ReportModeAperiodic_rm31:
+ AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
+ //subband CQI single PMI (TM4/5/6)
+ AssertFatal(tmode == 4 || tmode == 5 || tmode == 6 || tmode == 8
+ || tmode == 9
+ || tmode == 10,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm31\n",
+ tmode);
+
+ if ((ri == 1) && (cc->p_eNB == 2)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_diffcqi0[CC_idP][i] =
+ (uint8_t) (p & 0x03);
+ p >>= 2;
+ }
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x03;
}
+ if ((ri == 2) && (cc->p_eNB == 2)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
+ (uint8_t) (p & 0x01);
+ p >>= 1;
+ }
+ sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
+ (uint8_t) (p & 0x01);
+ p >>= 1;
+ }
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x01;
+ }
+ if ((ri == 1) && (cc->p_eNB == 4)) {
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_diffcqi0[CC_idP][i] =
+ (uint8_t) (p & 0x03);
+ p >>= 2;
+ }
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x0F;
+ }
+ if ((ri > 1) && (cc->p_eNB == 4)) { // Note : 64 bits for 20 MHz
+ sched_ctl->aperiodic_wideband_cqi0[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
+ (uint8_t) (p & 0x01);
+ p >>= 1;
+ }
+ sched_ctl->aperiodic_wideband_cqi1[CC_idP] =
+ (uint8_t) (p & 0x0F);
+ p >>= 4;
+ for (i = 0; i < N; i++) {
+ sched_ctl->aperiodic_subband_pmi[CC_idP][i] =
+ (uint8_t) (p & 0x01);
+ p >>= 2;
+ }
+ sched_ctl->aperiodic_wideband_pmi[CC_idP] = p & 0x0F;
+ }
+
+ break;
+#ifdef Rel14
+ case CQI_ReportModeAperiodic_rm32_v1250:
+ AssertFatal(tmode == 4 || tmode == 5 || tmode == 6 || tmode == 8
+ || tmode == 9
+ || tmode == 10,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm32\n",
+ tmode);
+ AssertFatal(1 == 0, "CQI_ReportModeAperiodic_rm32 to be done\n");
+ break;
+ case CQI_ReportModeAperiodic_rm10_v1310:
+ AssertFatal(tmode == 1 || tmode == 2 || tmode == 3
+ || tmode == 7,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm10\n",
+ tmode);
+ AssertFatal(1 == 0, "CQI_ReportModeAperiodic_rm10 to be done\n");
+ break;
+ case CQI_ReportModeAperiodic_rm11_v1310:
+ AssertFatal(tmode == 4 || tmode == 5 || tmode == 6 || tmode == 8
+ || tmode == 9
+ || tmode == 10,
+ "Illegal transmission mode %d for CQI_ReportModeAperiodic_rm11\n",
+ tmode);
+ AssertFatal(1 == 0, "CQI_ReportModeAperiodic_rm11 to be done\n");
+ break;
+#endif /* Rel14 */
+ }
}
void
@@ -4376,105 +3889,123 @@ cqi_indication(module_id_t mod_idP, int CC_idP, frame_t frameP,
nfapi_cqi_indication_rel9_t * rel9, uint8_t * pdu,
nfapi_ul_cqi_information_t * ul_cqi_information)
{
- int UE_id = find_UE_id(mod_idP, rntiP);
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- if (UE_id == -1) {
- LOG_W(MAC, "cqi_indication: UE %x not found\n", rntiP);
- return;
- }
- UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-
- if (UE_id >= 0) {
+ int UE_id = find_UE_id(mod_idP, rntiP);
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ if (UE_id == -1) {
+ LOG_W(MAC, "cqi_indication: UE %x not found\n", rntiP);
+ return;
+ }
+ UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
- LOG_D(MAC,"%s() UE_id:%d channel:%d cqi:%d\n", __FUNCTION__, UE_id, ul_cqi_information->channel, ul_cqi_information->ul_cqi);
+ if (UE_id >= 0) {
- if (ul_cqi_information->channel == 0) { // PUCCH
+ LOG_D(MAC,"%s() UE_id:%d channel:%d cqi:%d\n", __FUNCTION__, UE_id, ul_cqi_information->channel, ul_cqi_information->ul_cqi);
- // extract pucch csi information before changing RI information
- extract_pucch_csi(mod_idP, CC_idP, UE_id, frameP, subframeP,
- pdu, rel9->length);
+ if (ul_cqi_information->channel == 0) { // PUCCH
- memcpy((void *) sched_ctl->periodic_ri_received,
- (void *) rel9->ri, rel9->number_of_cc_reported);
+ // extract pucch csi information before changing RI information
+ extract_pucch_csi(mod_idP, CC_idP, UE_id, frameP, subframeP,
+ pdu, rel9->length);
- // SNR for PUCCH2
- sched_ctl->pucch2_snr[CC_idP] = ul_cqi_information->ul_cqi;
- } else { //PUSCH
- memcpy((void *) sched_ctl->aperiodic_ri_received,
- (void *) rel9->ri, rel9->number_of_cc_reported);
+ memcpy((void *) sched_ctl->periodic_ri_received,
+ (void *) rel9->ri, rel9->number_of_cc_reported);
- extract_pusch_csi(mod_idP, CC_idP, UE_id, frameP, subframeP,
- pdu, rel9->length);
+ // SNR for PUCCH2
+ sched_ctl->pucch2_snr[CC_idP] = ul_cqi_information->ul_cqi;
+ } else { //PUSCH
+ memcpy((void *) sched_ctl->aperiodic_ri_received,
+ (void *) rel9->ri, rel9->number_of_cc_reported);
- }
+ extract_pusch_csi(mod_idP, CC_idP, UE_id, frameP, subframeP,
+ pdu, rel9->length);
- // timing advance
- sched_ctl->timing_advance = rel9->timing_advance;
- sched_ctl->timing_advance_r9 = rel9->timing_advance_r9;
}
+
+ // timing advance
+ sched_ctl->timing_advance = rel9->timing_advance;
+ sched_ctl->timing_advance_r9 = rel9->timing_advance_r9;
+ }
}
void
SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP,
sub_frame_t subframeP, rnti_t rntiP, uint8_t ul_cqi)
{
- T(T_ENB_MAC_SCHEDULING_REQUEST, T_INT(mod_idP), T_INT(cc_idP),
- T_INT(frameP), T_INT(subframeP), T_INT(rntiP));
+ T(T_ENB_MAC_SCHEDULING_REQUEST, T_INT(mod_idP), T_INT(cc_idP),
+ T_INT(frameP), T_INT(subframeP), T_INT(rntiP));
- int UE_id = find_UE_id(mod_idP, rntiP);
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ int UE_id = find_UE_id(mod_idP, rntiP);
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- if (UE_id != -1) {
- if (mac_eNB_get_rrc_status(mod_idP, UE_RNTI(mod_idP, UE_id)) <
- RRC_CONNECTED)
- LOG_D(MAC,
- "[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d\n",
- mod_idP, rntiP, frameP, subframeP, UE_id, cc_idP);
+ if (UE_id != -1) {
+ if (mac_eNB_get_rrc_status(mod_idP, UE_RNTI(mod_idP, UE_id)) <
+ RRC_CONNECTED)
+ LOG_D(MAC,
+ "[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d\n",
+ mod_idP, rntiP, frameP, subframeP, UE_id, cc_idP);
#if 0
- UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+ UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
- /* for the moment don't use ul_cqi from SR, value is too different from harq */
- sched_ctl->pucch1_snr[cc_idP] = ul_cqi;
- sched_ctl->pucch1_cqi_update[cc_idP] = 1;
+ /* for the moment don't use ul_cqi from SR, value is too different from harq */
+ sched_ctl->pucch1_snr[cc_idP] = ul_cqi;
+ sched_ctl->pucch1_cqi_update[cc_idP] = 1;
#endif
- UE_list->UE_template[cc_idP][UE_id].ul_SR = 1;
- UE_list->UE_template[cc_idP][UE_id].ul_active = TRUE;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_SR_INDICATION, 1);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_SR_INDICATION, 0);
- } else {
- // AssertFatal(0, "find_UE_id(%u,rnti %d) not found", enb_mod_idP, rntiP);
- // AssertError(0, 0, "Frame %d: find_UE_id(%u,rnti %d) not found\n", frameP, enb_mod_idP, rntiP);
- LOG_D(MAC,
- "[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d (unknown UEid) on CC_id %d\n",
- mod_idP, rntiP, frameP, subframeP, UE_id, cc_idP);
- }
+ UE_list->UE_template[cc_idP][UE_id].ul_SR = 1;
+ UE_list->UE_template[cc_idP][UE_id].ul_active = TRUE;
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_SR_INDICATION, 1);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_SR_INDICATION, 0);
+ } else {
+ // AssertFatal(0, "find_UE_id(%u,rnti %d) not found", enb_mod_idP, rntiP);
+ // AssertError(0, 0, "Frame %d: find_UE_id(%u,rnti %d) not found\n", frameP, enb_mod_idP, rntiP);
+ LOG_D(MAC,
+ "[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d (unknown UEid) on CC_id %d\n",
+ mod_idP, rntiP, frameP, subframeP, UE_id, cc_idP);
+ }
}
void
UL_failure_indication(module_id_t mod_idP, int cc_idP, frame_t frameP,
rnti_t rntiP, sub_frame_t subframeP)
{
- int UE_id = find_UE_id(mod_idP, rntiP);
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ int UE_id = find_UE_id(mod_idP, rntiP);
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- if (UE_id != -1) {
- LOG_D(MAC,
- "[eNB %d][UE %d/%x] Frame %d subframeP %d Signaling UL Failure for UE %d on CC_id %d (timer %d)\n",
- mod_idP, UE_id, rntiP, frameP, subframeP, UE_id, cc_idP,
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
- if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer == 0)
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 1;
- } else {
- // AssertFatal(0, "find_UE_id(%u,rnti %d) not found", enb_mod_idP, rntiP);
- // AssertError(0, 0, "Frame %d: find_UE_id(%u,rnti %d) not found\n", frameP, enb_mod_idP, rntiP);
- LOG_W(MAC,
- "[eNB %d][SR %x] Frame %d subframeP %d Signaling UL Failure for UE %d (unknown UEid) on CC_id %d\n",
- mod_idP, rntiP, frameP, subframeP, UE_id, cc_idP);
- }
+ if (UE_id != -1) {
+ LOG_D(MAC,
+ "[eNB %d][UE %d/%x] Frame %d subframeP %d Signaling UL Failure for UE %d on CC_id %d (timer %d)\n",
+ mod_idP, UE_id, rntiP, frameP, subframeP, UE_id, cc_idP,
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
+ if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer == 0)
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 1;
+ } else {
+ // AssertFatal(0, "find_UE_id(%u,rnti %d) not found", enb_mod_idP, rntiP);
+ // AssertError(0, 0, "Frame %d: find_UE_id(%u,rnti %d) not found\n", frameP, enb_mod_idP, rntiP);
+ LOG_W(MAC,
+ "[eNB %d][SR %x] Frame %d subframeP %d Signaling UL Failure for UE %d (unknown UEid) on CC_id %d\n",
+ mod_idP, rntiP, frameP, subframeP, UE_id, cc_idP);
+ }
+}
+
+static int nack_or_dtx_reported(
+ COMMON_channels_t *cc,
+ nfapi_harq_indication_pdu_t *harq_pdu)
+{
+ int i;
+
+ if (cc->tdd_Config) {
+ AssertFatal(0==1, "TDD to be done. FAPI structures (see nfapi_harq_indication_tdd_rel13_t) are not clean. To be cleaned as well?\n");
+ abort();
+ } else {
+ nfapi_harq_indication_fdd_rel13_t *hi = &harq_pdu->harq_indication_fdd_rel13;
+ for (i = 0; i < hi->number_of_ack_nack; hi++)
+ if (hi->harq_tb_n[i] != 1)
+ return 1;
+ return 0;
+ }
}
void
@@ -4482,33 +4013,34 @@ harq_indication(module_id_t mod_idP, int CC_idP, frame_t frameP,
sub_frame_t subframeP,
nfapi_harq_indication_pdu_t * harq_pdu)
{
- rnti_t rnti = harq_pdu->rx_ue_information.rnti;
- uint8_t ul_cqi = harq_pdu->ul_cqi_information.ul_cqi;
- uint8_t channel = harq_pdu->ul_cqi_information.channel;
- int UE_id = find_UE_id(mod_idP, rnti);
- if (UE_id == -1) {
- LOG_W(MAC, "harq_indication: UE %x not found\n", rnti);
- return;
- }
- UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
- UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
- COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
- // extract HARQ Information
- LOG_D(MAC,
- "Frame %d, subframe %d: Received harq indication (%d) from UE %d/%x, ul_cqi %d\n",
- frameP, subframeP, channel, UE_id, rnti, ul_cqi);
- if (cc->tdd_Config)
- extract_harq(mod_idP, CC_idP, UE_id, frameP, subframeP,
- (void *) &harq_pdu->harq_indication_tdd_rel13,
- channel);
- else
- extract_harq(mod_idP, CC_idP, UE_id, frameP, subframeP,
- (void *) &harq_pdu->harq_indication_fdd_rel13,
- channel);
- if (channel == 0) {
- sched_ctl->pucch1_snr[CC_idP] = ul_cqi;
- sched_ctl->pucch1_cqi_update[CC_idP] = 1;
- }
+ rnti_t rnti = harq_pdu->rx_ue_information.rnti;
+ uint8_t ul_cqi = harq_pdu->ul_cqi_information.ul_cqi;
+ uint8_t channel = harq_pdu->ul_cqi_information.channel;
+ int UE_id = find_UE_id(mod_idP, rnti);
+ if (UE_id == -1) {
+ LOG_W(MAC, "harq_indication: UE %x not found\n", rnti);
+ return;
+ }
+ UE_list_t *UE_list = &RC.mac[mod_idP]->UE_list;
+ UE_sched_ctrl *sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
+ COMMON_channels_t *cc = &RC.mac[mod_idP]->common_channels[CC_idP];
+ // extract HARQ Information
+ LOG_D(MAC,
+ "Frame %d, subframe %d: Received harq indication (%d) from UE %d/%x, ul_cqi %d\n",
+ frameP, subframeP, channel, UE_id, rnti, ul_cqi);
+ if (cc->tdd_Config)
+ extract_harq(mod_idP, CC_idP, UE_id, frameP, subframeP,
+ (void *) &harq_pdu->harq_indication_tdd_rel13,
+ channel);
+ else
+ extract_harq(mod_idP, CC_idP, UE_id, frameP, subframeP,
+ (void *) &harq_pdu->harq_indication_fdd_rel13,
+ channel);
+ /* don't care about cqi reporting if NACK/DTX is there */
+ if (channel == 0 && !nack_or_dtx_reported(cc, harq_pdu)) {
+ sched_ctl->pucch1_snr[CC_idP] = ul_cqi;
+ sched_ctl->pucch1_cqi_update[CC_idP] = 1;
+ }
}
// Flexran Slicing functions
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 3acab2c801b684f508b863c8a2f86f8b75af86e6..72b9013d930ace80efc964bbe377adebde78b366 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -81,9 +81,9 @@ extern uint8_t nfapi_mode;
// This table holds the allowable PRB sizes for ULSCH transmissions
uint8_t rb_table[34] =
- { 1, 2, 3, 4, 5, 6, 8, 9, 10, 12, 15, 16, 18, 20, 24, 25, 27, 30, 32,
+ { 1, 2, 3, 4, 5, 6, 8, 9, 10, 12, 15, 16, 18, 20, 24, 25, 27, 30, 32,
36, 40, 45, 48, 50, 54, 60, 64, 72, 75, 80, 81, 90, 96, 100
-};
+ };
/* number of active slices for past and current time*/
int n_active_slices_uplink = 1;
@@ -126,746 +126,636 @@ rx_sdu(const module_id_t enb_mod_idP,
const uint16_t sdu_lenP,
const uint16_t timing_advance, const uint8_t ul_cqi)
{
- int current_rnti = rntiP;
- unsigned char rx_ces[MAX_NUM_CE], num_ce, num_sdu, i, *payload_ptr;
- unsigned char rx_lcids[NB_RB_MAX];
- unsigned short rx_lengths[NB_RB_MAX];
- int UE_id = find_UE_id(enb_mod_idP, current_rnti);
- int RA_id;
- int ii, j;
- eNB_MAC_INST *mac = RC.mac[enb_mod_idP];
- int harq_pid =
- subframe2harqpid(&mac->common_channels[CC_idP], frameP, subframeP);
-
- UE_list_t *UE_list = &mac->UE_list;
- int crnti_rx = 0;
- int old_buffer_info;
- RA_t *ra =
- (RA_t *) & RC.mac[enb_mod_idP]->common_channels[CC_idP].ra[0];
- int first_rb = 0;
-
- start_meas(&mac->rx_ulsch_sdu);
-
- if ((UE_id > NUMBER_OF_UE_MAX) || (UE_id == -1))
- for (ii = 0; ii < NB_RB_MAX; ii++) {
- rx_lengths[ii] = 0;
- }
+ int current_rnti = rntiP;
+ unsigned char rx_ces[MAX_NUM_CE], num_ce, num_sdu, i, *payload_ptr;
+ unsigned char rx_lcids[NB_RB_MAX];
+ unsigned short rx_lengths[NB_RB_MAX];
+ int UE_id = find_UE_id(enb_mod_idP, current_rnti);
+ int RA_id;
+ int ii, j;
+ eNB_MAC_INST *mac = RC.mac[enb_mod_idP];
+ int harq_pid =
+ subframe2harqpid(&mac->common_channels[CC_idP], frameP, subframeP);
+ int lcgid_updated[4] = {0, 0, 0, 0};
+
+ UE_list_t *UE_list = &mac->UE_list;
+ int crnti_rx = 0;
+ RA_t *ra =
+ (RA_t *) & RC.mac[enb_mod_idP]->common_channels[CC_idP].ra[0];
+ int first_rb = 0;
+
+ start_meas(&mac->rx_ulsch_sdu);
+
+ if ((UE_id > NUMBER_OF_UE_MAX) || (UE_id == -1))
+ for (ii = 0; ii < NB_RB_MAX; ii++) {
+ rx_lengths[ii] = 0;
+ }
+
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
+ (VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU, 1);
+ if (opt_enabled == 1) {
+ trace_pdu(0, sduP, sdu_lenP, 0, 3, current_rnti, frameP, subframeP,
+ 0, 0);
+ LOG_D(OPT, "[eNB %d][ULSCH] Frame %d rnti %x with size %d\n",
+ enb_mod_idP, frameP, current_rnti, sdu_lenP);
+ }
+
+ if (UE_id != -1) {
+ LOG_D(MAC,
+ "[eNB %d][PUSCH %d] CC_id %d Received ULSCH sdu round %d from PHY (rnti %x, UE_id %d) ul_cqi %d\n",
+ enb_mod_idP, harq_pid, CC_idP,
+ UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid],
+ current_rnti, UE_id, ul_cqi);
+
+ AssertFatal(UE_list->UE_sched_ctrl[UE_id].
+ round_UL[CC_idP][harq_pid] < 8, "round >= 8\n");
+ if (sduP != NULL) {
+ UE_list->UE_sched_ctrl[UE_id].ul_inactivity_timer = 0;
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
+ UE_list->UE_sched_ctrl[UE_id].ul_scheduled &= (~(1 << harq_pid));
+ /* Update with smoothing: 3/4 of old value and 1/4 of new.
+ * This is the logic that was done in the function
+ * lte_est_timing_advance_pusch, maybe it's not necessary?
+ * maybe it's even not correct at all?
+ */
+ UE_list->UE_sched_ctrl[UE_id].ta_update = (UE_list->UE_sched_ctrl[UE_id].ta_update * 3 + timing_advance) / 4;
+ UE_list->UE_sched_ctrl[UE_id].pusch_snr[CC_idP] = ul_cqi;
+ UE_list->UE_sched_ctrl[UE_id].ul_consecutive_errors = 0;
+ first_rb = UE_list->UE_template[CC_idP][UE_id].first_rb_ul[harq_pid];
+
+ if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
+ UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0;
+ mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP,
+ subframeP, UE_RNTI(enb_mod_idP,
+ UE_id));
+ }
+
+ /* update scheduled bytes */
+ UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes -= UE_list->UE_template[CC_idP][UE_id].TBS_UL[harq_pid];
+ if (UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes < 0)
+ UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes = 0;
+ } else { // we've got an error
+ LOG_D(MAC,
+ "[eNB %d][PUSCH %d] CC_id %d ULSCH in error in round %d, ul_cqi %d\n",
+ enb_mod_idP, harq_pid, CC_idP,
+ UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid],
+ ul_cqi);
+
+ // AssertFatal(1==0,"ulsch in error\n");
+ if (UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid] == 3) {
+ UE_list->UE_sched_ctrl[UE_id].ul_scheduled &= (~(1 << harq_pid));
+ UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid] = 0;
+ if (UE_list->UE_sched_ctrl[UE_id].ul_consecutive_errors++ == 10)
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 1;
+
+ /* update scheduled bytes */
+ UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes -= UE_list->UE_template[CC_idP][UE_id].TBS_UL[harq_pid];
+ if (UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes < 0)
+ UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes = 0;
+ } else
+ UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid]++;
+ return;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU, 1);
- if (opt_enabled == 1) {
- trace_pdu(0, sduP, sdu_lenP, 0, 3, current_rnti, frameP, subframeP,
- 0, 0);
- LOG_D(OPT, "[eNB %d][ULSCH] Frame %d rnti %x with size %d\n",
- enb_mod_idP, frameP, current_rnti, sdu_lenP);
}
+ } else if ((RA_id = find_RA_id(enb_mod_idP, CC_idP, current_rnti)) != -1) { // Check if this is an RA process for the rnti
+ AssertFatal(mac->common_channels[CC_idP].
+ radioResourceConfigCommon->rach_ConfigCommon.
+ maxHARQ_Msg3Tx > 1,
+ "maxHARQ %d should be greater than 1\n",
+ (int) mac->common_channels[CC_idP].
+ radioResourceConfigCommon->rach_ConfigCommon.
+ maxHARQ_Msg3Tx);
- if (UE_id != -1) {
+ LOG_D(MAC,
+ "[eNB %d][PUSCH %d] CC_id %d [RAPROC Msg3] Received ULSCH sdu round %d from PHY (rnti %x, RA_id %d) ul_cqi %d\n",
+ enb_mod_idP, harq_pid, CC_idP, ra[RA_id].msg3_round,
+ current_rnti, RA_id, ul_cqi);
+
+ first_rb = ra->msg3_first_rb;
+
+ if (sduP == NULL) { // we've got an error on Msg3
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d, RA %d ULSCH in error in round %d/%d\n",
+ enb_mod_idP, CC_idP, RA_id,
+ ra[RA_id].msg3_round,
+ (int) mac->common_channels[CC_idP].
+ radioResourceConfigCommon->rach_ConfigCommon.
+ maxHARQ_Msg3Tx);
+ if (ra[RA_id].msg3_round == mac->common_channels[CC_idP].radioResourceConfigCommon->rach_ConfigCommon.maxHARQ_Msg3Tx - 1) {
+ cancel_ra_proc(enb_mod_idP, CC_idP, frameP, current_rnti);
+ }
+
+ else {
+ first_rb = UE_list->UE_template[CC_idP][UE_id].first_rb_ul[harq_pid];
+ ra[RA_id].msg3_round++;
+ // prepare handling of retransmission
+ ra[RA_id].Msg3_frame = (ra[RA_id].Msg3_frame + ((ra[RA_id].Msg3_subframe > 1) ? 1 : 0)) % 1024;
+ ra[RA_id].Msg3_subframe = (ra[RA_id].Msg3_subframe + 8) % 10;
+ add_msg3(enb_mod_idP, CC_idP, &ra[RA_id], frameP, subframeP);
+ }
+ return;
+ }
+ } else {
+ LOG_W(MAC,
+ "Cannot find UE or RA corresponding to ULSCH rnti %x, dropping it\n",
+ current_rnti);
+ return;
+ }
+ payload_ptr = parse_ulsch_header(sduP, &num_ce, &num_sdu, rx_ces, rx_lcids, rx_lengths, sdu_lenP);
+
+ T(T_ENB_MAC_UE_UL_PDU, T_INT(enb_mod_idP), T_INT(CC_idP),
+ T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
+ T_INT(harq_pid), T_INT(sdu_lenP), T_INT(num_ce), T_INT(num_sdu));
+ T(T_ENB_MAC_UE_UL_PDU_WITH_DATA, T_INT(enb_mod_idP), T_INT(CC_idP),
+ T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
+ T_INT(harq_pid), T_INT(sdu_lenP), T_INT(num_ce), T_INT(num_sdu),
+ T_BUFFER(sduP, sdu_lenP));
+
+ mac->eNB_stats[CC_idP].ulsch_bytes_rx = sdu_lenP;
+ mac->eNB_stats[CC_idP].total_ulsch_bytes_rx += sdu_lenP;
+ mac->eNB_stats[CC_idP].total_ulsch_pdus_rx += 1;
+
+ UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid] = 0;
+
+ // control element
+ for (i = 0; i < num_ce; i++) {
+
+ T(T_ENB_MAC_UE_UL_CE, T_INT(enb_mod_idP), T_INT(CC_idP),
+ T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
+ T_INT(rx_ces[i]));
+
+ switch (rx_ces[i]) { // implement and process BSR + CRNTI +
+ case POWER_HEADROOM:
+ if (UE_id != -1) {
+ UE_list->UE_template[CC_idP][UE_id].phr_info =
+ (payload_ptr[0] & 0x3f) - PHR_MAPPING_OFFSET;
LOG_D(MAC,
- "[eNB %d][PUSCH %d] CC_id %d Received ULSCH sdu round %d from PHY (rnti %x, UE_id %d) ul_cqi %d\n",
- enb_mod_idP, harq_pid, CC_idP,
- UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid],
- current_rnti, UE_id, ul_cqi);
-
- AssertFatal(UE_list->UE_sched_ctrl[UE_id].
- round_UL[CC_idP][harq_pid] < 8, "round >= 8\n");
- if (sduP != NULL) {
- UE_list->UE_sched_ctrl[UE_id].ul_inactivity_timer = 0;
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
- UE_list->UE_sched_ctrl[UE_id].ul_scheduled &=
- (~(1 << harq_pid));
- /* Update with smoothing: 3/4 of old value and 1/4 of new.
- * This is the logic that was done in the function
- * lte_est_timing_advance_pusch, maybe it's not necessary?
- * maybe it's even not correct at all?
- */
- UE_list->UE_sched_ctrl[UE_id].ta_update =
- (UE_list->UE_sched_ctrl[UE_id].ta_update * 3 +
- timing_advance) / 4;
- UE_list->UE_sched_ctrl[UE_id].pusch_snr[CC_idP] = ul_cqi;
- UE_list->UE_sched_ctrl[UE_id].ul_consecutive_errors = 0;
- first_rb =
- UE_list->UE_template[CC_idP][UE_id].first_rb_ul[harq_pid];
-
- if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
- UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0;
- mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP,
- subframeP, UE_RNTI(enb_mod_idP,
- UE_id));
- }
- } else { // we've got an error
+ "[eNB %d] CC_id %d MAC CE_LCID %d : Received PHR PH = %d (db)\n",
+ enb_mod_idP, CC_idP, rx_ces[i],
+ UE_list->UE_template[CC_idP][UE_id].phr_info);
+ UE_list->UE_template[CC_idP][UE_id].phr_info_configured =
+ 1;
+ UE_list->UE_sched_ctrl[UE_id].phr_received = 1;
+ }
+ payload_ptr += sizeof(POWER_HEADROOM_CMD);
+ break;
+
+ case CRNTI:
+ {
+ int old_rnti =
+ (((uint16_t) payload_ptr[0]) << 8) + payload_ptr[1];
+ int old_UE_id = find_UE_id(enb_mod_idP, old_rnti);
+ LOG_D(MAC,
+ "[eNB %d] Frame %d, Subframe %d CC_id %d MAC CE_LCID %d (ce %d/%d): CRNTI %x (UE_id %d) in Msg3\n",
+ enb_mod_idP, frameP, subframeP, CC_idP, rx_ces[i], i,
+ num_ce, old_rnti, old_UE_id);
+ /* receiving CRNTI means that the current rnti has to go away */
+ cancel_ra_proc(enb_mod_idP, CC_idP, frameP,
+ current_rnti);
+ if (old_UE_id != -1) {
+ /* TODO: if the UE did random access (followed by a MAC uplink with
+ * CRNTI) because none of its scheduling request was granted, then
+ * according to 36.321 5.4.4 the UE's MAC will notify RRC to release
+ * PUCCH/SRS. According to 36.331 5.3.13 the UE will then apply
+ * default configuration for CQI reporting and scheduling requests,
+ * which basically means that the CQI requests won't work anymore and
+ * that the UE won't do any scheduling request anymore as long as the
+ * eNB doesn't reconfigure the UE.
+ * We have to take care of this. As the code is, nothing is done and
+ * the UE state in the eNB is wrong.
+ */
+ UE_id = old_UE_id;
+ UE_list->UE_sched_ctrl[UE_id].ul_inactivity_timer = 0;
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
+ if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
+ UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0;
+ mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP,
+ subframeP, old_rnti);
+ }
+ current_rnti = old_rnti;
+ }
+ crnti_rx = 1;
+ payload_ptr += 2;
+ break;
+ }
+
+ case TRUNCATED_BSR:
+ case SHORT_BSR:
+ {
+ uint8_t lcgid;
+ lcgid = (payload_ptr[0] >> 6);
+
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d\n",
+ enb_mod_idP, CC_idP, rx_ces[i], lcgid,
+ payload_ptr[0] & 0x3f);
+
+ if (crnti_rx == 1)
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d\n",
+ enb_mod_idP, CC_idP, rx_ces[i], lcgid,
+ payload_ptr[0] & 0x3f);
+ if (UE_id != -1) {
+ int bsr = payload_ptr[0] & 0x3f;
+
+ lcgid_updated[lcgid] = 1;
+
+ // update buffer info
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[lcgid] = BSR_TABLE[bsr];
+
+ UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer =
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[0] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[1] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[2] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[3];
+ //UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
+
+ RC.eNB[enb_mod_idP][CC_idP]->pusch_stats_bsr[UE_id][(frameP * 10) + subframeP] = (payload_ptr[0] & 0x3f);
+ if (UE_id == UE_list->head)
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_UE0_BSR,
+ RC.eNB[enb_mod_idP][CC_idP]->pusch_stats_bsr
+ [UE_id][(frameP * 10) + subframeP]);
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[lcgid] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[lcgid] = frameP;
+ }
+ if (mac_eNB_get_rrc_status(enb_mod_idP,UE_RNTI(enb_mod_idP, UE_id)) < RRC_CONNECTED)
LOG_D(MAC,
- "[eNB %d][PUSCH %d] CC_id %d ULSCH in error in round %d, ul_cqi %d\n",
- enb_mod_idP, harq_pid, CC_idP,
- UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid],
- ul_cqi);
-
- // AssertFatal(1==0,"ulsch in error\n");
- if (UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid] ==
- 3) {
- UE_list->UE_sched_ctrl[UE_id].ul_scheduled &=
- (~(1 << harq_pid));
- UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid] =
- 0;
- if (UE_list->UE_sched_ctrl[UE_id].
- ul_consecutive_errors++ == 10)
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 1;
- } else
- UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid]++;
- return;
+ "[eNB %d] CC_id %d MAC CE_LCID %d : estimated_ul_buffer = %d (lcg increment %d)\n",
+ enb_mod_idP, CC_idP, rx_ces[i],
+ UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer,
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[lcgid]);
+ } else {
}
- } else if ((RA_id = find_RA_id(enb_mod_idP, CC_idP, current_rnti)) != -1) { // Check if this is an RA process for the rnti
- AssertFatal(mac->common_channels[CC_idP].
- radioResourceConfigCommon->rach_ConfigCommon.
- maxHARQ_Msg3Tx > 1,
- "maxHARQ %d should be greater than 1\n",
- (int) mac->common_channels[CC_idP].
- radioResourceConfigCommon->rach_ConfigCommon.
- maxHARQ_Msg3Tx);
+ payload_ptr += 1; //sizeof(SHORT_BSR); // fixme
+ }
+ break;
+
+ case LONG_BSR:
+ if (UE_id != -1) {
+ int bsr0 = (payload_ptr[0] & 0xFC) >> 2;
+ int bsr1 = ((payload_ptr[0] & 0x03) << 4) | ((payload_ptr[1] & 0xF0) >> 4);
+ int bsr2 = ((payload_ptr[1] & 0x0F) << 2) | ((payload_ptr[2] & 0xC0) >> 6);
+ int bsr3 = payload_ptr[2] & 0x3F;
+
+ lcgid_updated[0] = 1;
+ lcgid_updated[1] = 1;
+ lcgid_updated[2] = 1;
+ lcgid_updated[3] = 1;
+
+ // update buffer info
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID0] = BSR_TABLE[bsr0];
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID1] = BSR_TABLE[bsr1];
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID2] = BSR_TABLE[bsr2];
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID3] = BSR_TABLE[bsr3];
+
+ UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer =
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[0] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[1] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[2] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[3];
+ //UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
+
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = "
+ "%u LCGID2 = %u LCGID3 = %u\n", enb_mod_idP, CC_idP,
+ rx_ces[i],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID0],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID1],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID2],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID3]);
+ if (crnti_rx == 1)
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = "
+ "%u LCGID2 = %u LCGID3 = %u\n", enb_mod_idP,
+ CC_idP, rx_ces[i],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID0],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID1],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID2],
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID3]);
+
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID0] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0] = 0;
+ } else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0] = frameP;
+ }
- LOG_D(MAC,
- "[eNB %d][PUSCH %d] CC_id %d [RAPROC Msg3] Received ULSCH sdu round %d from PHY (rnti %x, RA_id %d) ul_cqi %d\n",
- enb_mod_idP, harq_pid, CC_idP, ra[RA_id].msg3_round,
- current_rnti, RA_id, ul_cqi);
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID1] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1] = 0;
+ } else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1] = frameP;
+ }
- first_rb = ra->msg3_first_rb;
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID2] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2] = 0;
+ } else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2] = frameP;
+ }
- if (sduP == NULL) { // we've got an error on Msg3
- LOG_D(MAC,
- "[eNB %d] CC_id %d, RA %d ULSCH in error in round %d/%d\n",
- enb_mod_idP, CC_idP, RA_id,
- ra[RA_id].msg3_round,
- (int) mac->common_channels[CC_idP].
- radioResourceConfigCommon->rach_ConfigCommon.
- maxHARQ_Msg3Tx);
- if (ra[RA_id].msg3_round ==
- mac->common_channels[CC_idP].radioResourceConfigCommon->
- rach_ConfigCommon.maxHARQ_Msg3Tx - 1) {
- cancel_ra_proc(enb_mod_idP, CC_idP, frameP, current_rnti);
- }
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[LCGID3] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3] = 0;
+ } else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3] == 0) {
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3] = frameP;
- else {
- first_rb =
- UE_list->UE_template[CC_idP][UE_id].
- first_rb_ul[harq_pid];
- ra[RA_id].msg3_round++;
- // prepare handling of retransmission
- ra[RA_id].Msg3_frame = (ra[RA_id].Msg3_frame + ((ra[RA_id].Msg3_subframe > 1) ? 1 : 0)) % 1024;
- ra[RA_id].Msg3_subframe = (ra[RA_id].Msg3_subframe + 8) % 10;
- add_msg3(enb_mod_idP, CC_idP, &ra[RA_id], frameP,
- subframeP);
- }
- return;
}
- } else {
- LOG_W(MAC,
- "Cannot find UE or RA corresponding to ULSCH rnti %x, dropping it\n",
- current_rnti);
- return;
+ }
+
+ payload_ptr += 3; ////sizeof(LONG_BSR);
+ break;
+
+ default:
+ LOG_E(MAC,
+ "[eNB %d] CC_id %d Received unknown MAC header (0x%02x)\n",
+ enb_mod_idP, CC_idP, rx_ces[i]);
+ break;
}
- payload_ptr =
- parse_ulsch_header(sduP, &num_ce, &num_sdu, rx_ces, rx_lcids,
- rx_lengths, sdu_lenP);
+ }
- T(T_ENB_MAC_UE_UL_PDU, T_INT(enb_mod_idP), T_INT(CC_idP),
+ for (i = 0; i < num_sdu; i++) {
+ LOG_D(MAC, "SDU Number %d MAC Subheader SDU_LCID %d, length %d\n",
+ i, rx_lcids[i], rx_lengths[i]);
+
+ T(T_ENB_MAC_UE_UL_SDU, T_INT(enb_mod_idP), T_INT(CC_idP),
T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
- T_INT(harq_pid), T_INT(sdu_lenP), T_INT(num_ce), T_INT(num_sdu));
- T(T_ENB_MAC_UE_UL_PDU_WITH_DATA, T_INT(enb_mod_idP), T_INT(CC_idP),
+ T_INT(rx_lcids[i]), T_INT(rx_lengths[i]));
+ T(T_ENB_MAC_UE_UL_SDU_WITH_DATA, T_INT(enb_mod_idP), T_INT(CC_idP),
T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
- T_INT(harq_pid), T_INT(sdu_lenP), T_INT(num_ce), T_INT(num_sdu),
- T_BUFFER(sduP, sdu_lenP));
-
- mac->eNB_stats[CC_idP].ulsch_bytes_rx = sdu_lenP;
- mac->eNB_stats[CC_idP].total_ulsch_bytes_rx += sdu_lenP;
- mac->eNB_stats[CC_idP].total_ulsch_pdus_rx += 1;
-
- UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid] = 0;
-
- // control element
- for (i = 0; i < num_ce; i++) {
-
- T(T_ENB_MAC_UE_UL_CE, T_INT(enb_mod_idP), T_INT(CC_idP),
- T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
- T_INT(rx_ces[i]));
-
- switch (rx_ces[i]) { // implement and process BSR + CRNTI +
- case POWER_HEADROOM:
- if (UE_id != -1) {
- UE_list->UE_template[CC_idP][UE_id].phr_info =
- (payload_ptr[0] & 0x3f) - PHR_MAPPING_OFFSET;
- LOG_D(MAC,
- "[eNB %d] CC_id %d MAC CE_LCID %d : Received PHR PH = %d (db)\n",
- enb_mod_idP, CC_idP, rx_ces[i],
- UE_list->UE_template[CC_idP][UE_id].phr_info);
- UE_list->UE_template[CC_idP][UE_id].phr_info_configured =
- 1;
- UE_list->UE_sched_ctrl[UE_id].phr_received = 1;
- }
- payload_ptr += sizeof(POWER_HEADROOM_CMD);
- break;
+ T_INT(rx_lcids[i]), T_INT(rx_lengths[i]), T_BUFFER(payload_ptr,
+ rx_lengths
+ [i]));
+
+ switch (rx_lcids[i]) {
+ case CCCH:
+ if (rx_lengths[i] > CCCH_PAYLOAD_SIZE_MAX) {
+ LOG_E(MAC,
+ "[eNB %d/%d] frame %d received CCCH of size %d (too big, maximum allowed is %d, sdu_len %d), dropping packet\n",
+ enb_mod_idP, CC_idP, frameP, rx_lengths[i],
+ CCCH_PAYLOAD_SIZE_MAX, sdu_lenP);
+ break;
+ }
+ LOG_D(MAC,
+ "[eNB %d][RAPROC] CC_id %d Frame %d, Received CCCH: %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x\n",
+ enb_mod_idP, CC_idP, frameP, payload_ptr[0],
+ payload_ptr[1], payload_ptr[2], payload_ptr[3],
+ payload_ptr[4], payload_ptr[5], current_rnti);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TERMINATE_RA_PROC, 1);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TERMINATE_RA_PROC, 0);
+ for (ii = 0; ii < NB_RA_PROC_MAX; ii++) {
+ RA_t *ra = &mac->common_channels[CC_idP].ra[ii];
- case CRNTI:
- {
- int old_rnti =
- (((uint16_t) payload_ptr[0]) << 8) + payload_ptr[1];
- int old_UE_id = find_UE_id(enb_mod_idP, old_rnti);
- LOG_D(MAC,
- "[eNB %d] Frame %d, Subframe %d CC_id %d MAC CE_LCID %d (ce %d/%d): CRNTI %x (UE_id %d) in Msg3\n",
- enb_mod_idP, frameP, subframeP, CC_idP, rx_ces[i], i,
- num_ce, old_rnti, old_UE_id);
- /* receiving CRNTI means that the current rnti has to go away */
- cancel_ra_proc(enb_mod_idP, CC_idP, frameP,
- current_rnti);
- if (old_UE_id != -1) {
- /* TODO: if the UE did random access (followed by a MAC uplink with
- * CRNTI) because none of its scheduling request was granted, then
- * according to 36.321 5.4.4 the UE's MAC will notify RRC to release
- * PUCCH/SRS. According to 36.331 5.3.13 the UE will then apply
- * default configuration for CQI reporting and scheduling requests,
- * which basically means that the CQI requests won't work anymore and
- * that the UE won't do any scheduling request anymore as long as the
- * eNB doesn't reconfigure the UE.
- * We have to take care of this. As the code is, nothing is done and
- * the UE state in the eNB is wrong.
- */
- UE_id = old_UE_id;
- UE_list->UE_sched_ctrl[UE_id].ul_inactivity_timer = 0;
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
- if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
- UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0;
- mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP,
- subframeP, old_rnti);
- }
- current_rnti = old_rnti;
- }
- crnti_rx = 1;
- payload_ptr += 2;
- break;
- }
-
- case TRUNCATED_BSR:
- case SHORT_BSR:
- {
- uint8_t lcgid;
- lcgid = (payload_ptr[0] >> 6);
-
- LOG_D(MAC,
- "[eNB %d] CC_id %d MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d\n",
- enb_mod_idP, CC_idP, rx_ces[i], lcgid,
- payload_ptr[0] & 0x3f);
-
- if (crnti_rx == 1)
- LOG_D(MAC,
- "[eNB %d] CC_id %d MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d\n",
- enb_mod_idP, CC_idP, rx_ces[i], lcgid,
- payload_ptr[0] & 0x3f);
- if (UE_id != -1) {
-
- UE_list->UE_template[CC_idP][UE_id].bsr_info[lcgid] =
- (payload_ptr[0] & 0x3f);
-
- // update buffer info
-
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[lcgid] =
- BSR_TABLE[UE_list->UE_template[CC_idP][UE_id].
- bsr_info[lcgid]];
-
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer =
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[lcgid];
-
- RC.eNB[enb_mod_idP][CC_idP]->
- pusch_stats_bsr[UE_id][(frameP * 10) + subframeP]
- = (payload_ptr[0] & 0x3f);
- if (UE_id == UE_list->head)
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
- (VCD_SIGNAL_DUMPER_VARIABLES_UE0_BSR,
- RC.eNB[enb_mod_idP][CC_idP]->pusch_stats_bsr
- [UE_id][(frameP * 10) + subframeP]);
- if (UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[lcgid]
- == 0) {
- UE_list->UE_template[CC_idP]
- [UE_id].ul_buffer_creation_time[lcgid] =
- frameP;
- }
- if (mac_eNB_get_rrc_status
- (enb_mod_idP,
- UE_RNTI(enb_mod_idP, UE_id)) < RRC_CONNECTED)
- LOG_D(MAC,
- "[eNB %d] CC_id %d MAC CE_LCID %d : ul_total_buffer = %d (lcg increment %d)\n",
- enb_mod_idP, CC_idP, rx_ces[i],
- UE_list->UE_template[CC_idP][UE_id].
- ul_total_buffer,
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[lcgid]);
- } else {
-
- }
- payload_ptr += 1; //sizeof(SHORT_BSR); // fixme
- }
- break;
-
- case LONG_BSR:
- if (UE_id != -1) {
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0] =
- ((payload_ptr[0] & 0xFC) >> 2);
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1] =
- ((payload_ptr[0] & 0x03) << 4) |
- ((payload_ptr[1] & 0xF0) >> 4);
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2] =
- ((payload_ptr[1] & 0x0F) << 2) |
- ((payload_ptr[2] & 0xC0) >> 6);
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3] =
- (payload_ptr[2] & 0x3F);
-
- // update buffer info
- old_buffer_info =
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID0];
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID0] =
- BSR_TABLE[UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID0]];
-
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer +=
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID0];
- if (UE_list->UE_template[CC_idP][UE_id].ul_total_buffer >=
- old_buffer_info)
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer -=
- old_buffer_info;
- else
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer =
- 0;
-
- old_buffer_info =
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID1];
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID1] =
- BSR_TABLE[UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID1]];
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer +=
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID1];
- if (UE_list->UE_template[CC_idP][UE_id].ul_total_buffer >=
- old_buffer_info)
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer -=
- old_buffer_info;
- else
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer =
- 0;
-
- old_buffer_info =
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID2];
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID2] =
- BSR_TABLE[UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID2]];
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer +=
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID2];
- if (UE_list->UE_template[CC_idP][UE_id].ul_total_buffer >=
- old_buffer_info)
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer -=
- old_buffer_info;
- else
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer =
- 0;
-
- old_buffer_info =
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID3];
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID3] =
- BSR_TABLE[UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID3]];
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer +=
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[LCGID3];
- if (UE_list->UE_template[CC_idP][UE_id].ul_total_buffer >=
- old_buffer_info)
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer -=
- old_buffer_info;
- else
- UE_list->UE_template[CC_idP][UE_id].ul_total_buffer =
- 0;
-
- LOG_D(MAC,
- "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR LCGID0 = %u LCGID1 = "
- "%u LCGID2 = %u LCGID3 = %u\n", enb_mod_idP, CC_idP,
- rx_ces[i],
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0],
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1],
- UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2],
- UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID3]);
- if (crnti_rx == 1)
- LOG_D(MAC,
- "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR LCGID0 = %u LCGID1 = "
- "%u LCGID2 = %u LCGID3 = %u\n", enb_mod_idP,
- CC_idP, rx_ces[i],
- UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID0],
- UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID1],
- UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID2],
- UE_list->UE_template[CC_idP][UE_id].
- bsr_info[LCGID3]);
-
- if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0] ==
- 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID0] = 0;
- } else if (UE_list->UE_template[CC_idP]
- [UE_id].ul_buffer_creation_time[LCGID0] == 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID0] = frameP;
- }
-
- if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1] ==
- 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID1] = 0;
- } else if (UE_list->UE_template[CC_idP]
- [UE_id].ul_buffer_creation_time[LCGID1] == 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID1] = frameP;
- }
-
- if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2] ==
- 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID2] = 0;
- } else if (UE_list->UE_template[CC_idP]
- [UE_id].ul_buffer_creation_time[LCGID2] == 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID2] = frameP;
- }
-
- if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3] ==
- 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID3] = 0;
- } else if (UE_list->UE_template[CC_idP]
- [UE_id].ul_buffer_creation_time[LCGID3] == 0) {
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_creation_time[LCGID3] = frameP;
-
- }
- }
+ LOG_D(MAC,
+ "[mac %d][RAPROC] CC_id %d Checking proc %d : rnti (%x, %x), state %d\n",
+ enb_mod_idP, CC_idP, ii, ra->rnti,
+ current_rnti, ra->state);
- payload_ptr += 3; ////sizeof(LONG_BSR);
- break;
+ if ((ra->rnti == current_rnti) && (ra->state != IDLE)) {
- default:
- LOG_E(MAC,
- "[eNB %d] CC_id %d Received unknown MAC header (0x%02x)\n",
- enb_mod_idP, CC_idP, rx_ces[i]);
- break;
- }
- }
+ //payload_ptr = parse_ulsch_header(msg3,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,msg3_len);
- for (i = 0; i < num_sdu; i++) {
- LOG_D(MAC, "SDU Number %d MAC Subheader SDU_LCID %d, length %d\n",
- i, rx_lcids[i], rx_lengths[i]);
-
- T(T_ENB_MAC_UE_UL_SDU, T_INT(enb_mod_idP), T_INT(CC_idP),
- T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
- T_INT(rx_lcids[i]), T_INT(rx_lengths[i]));
- T(T_ENB_MAC_UE_UL_SDU_WITH_DATA, T_INT(enb_mod_idP), T_INT(CC_idP),
- T_INT(current_rnti), T_INT(frameP), T_INT(subframeP),
- T_INT(rx_lcids[i]), T_INT(rx_lengths[i]), T_BUFFER(payload_ptr,
- rx_lengths
- [i]));
-
- switch (rx_lcids[i]) {
- case CCCH:
- if (rx_lengths[i] > CCCH_PAYLOAD_SIZE_MAX) {
- LOG_E(MAC,
- "[eNB %d/%d] frame %d received CCCH of size %d (too big, maximum allowed is %d, sdu_len %d), dropping packet\n",
- enb_mod_idP, CC_idP, frameP, rx_lengths[i],
- CCCH_PAYLOAD_SIZE_MAX, sdu_lenP);
- break;
- }
+ if (UE_id < 0) {
+ memcpy(&ra->cont_res_id[0], payload_ptr, 6);
LOG_D(MAC,
- "[eNB %d][RAPROC] CC_id %d Frame %d, Received CCCH: %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x\n",
- enb_mod_idP, CC_idP, frameP, payload_ptr[0],
- payload_ptr[1], payload_ptr[2], payload_ptr[3],
- payload_ptr[4], payload_ptr[5], current_rnti);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_TERMINATE_RA_PROC, 1);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_TERMINATE_RA_PROC, 0);
- for (ii = 0; ii < NB_RA_PROC_MAX; ii++) {
- RA_t *ra = &mac->common_channels[CC_idP].ra[ii];
-
- LOG_D(MAC,
- "[mac %d][RAPROC] CC_id %d Checking proc %d : rnti (%x, %x), state %d\n",
- enb_mod_idP, CC_idP, ii, ra->rnti,
- current_rnti, ra->state);
-
- if ((ra->rnti == current_rnti) && (ra->state != IDLE)) {
-
- //payload_ptr = parse_ulsch_header(msg3,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,msg3_len);
-
- if (UE_id < 0) {
- memcpy(&ra->cont_res_id[0], payload_ptr, 6);
- LOG_D(MAC,
- "[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3: length %d, offset %ld\n",
- enb_mod_idP, CC_idP, frameP, rx_lengths[i],
- payload_ptr - sduP);
-
- if ((UE_id =
- add_new_ue(enb_mod_idP, CC_idP,
- mac->common_channels[CC_idP].
- ra[ii].rnti, harq_pid
+ "[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3: length %d, offset %ld\n",
+ enb_mod_idP, CC_idP, frameP, rx_lengths[i],
+ payload_ptr - sduP);
+
+ if ((UE_id = add_new_ue(enb_mod_idP, CC_idP,
+ mac->common_channels[CC_idP].
+ ra[ii].rnti, harq_pid
#ifdef Rel14
- ,
- mac->common_channels[CC_idP].
- ra[ii].rach_resource_type
+ ,
+ mac->common_channels[CC_idP].
+ ra[ii].rach_resource_type
#endif
- )) == -1) {
- AssertFatal(1 == 0,
- "[MAC][eNB] Max user count reached\n");
- // kill RA procedure
- } else
- LOG_D(MAC,
- "[eNB %d][RAPROC] CC_id %d Frame %d Added user with rnti %x => UE %d\n",
- enb_mod_idP, CC_idP, frameP, ra->rnti,
- UE_id);
- } else {
- LOG_D(MAC,
- "[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3 from already registered UE %d: length %d, offset %ld\n",
- enb_mod_idP, CC_idP, frameP, UE_id,
- rx_lengths[i], payload_ptr - sduP);
- // kill RA procedure
- }
-
- mac_rrc_data_ind(enb_mod_idP,
- CC_idP,
- frameP, subframeP,
- current_rnti,
- CCCH,
- (uint8_t *) payload_ptr,
- rx_lengths[i],
- 0);
-
-
- if (num_ce > 0) { // handle msg3 which is not RRCConnectionRequest
- // process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
- }
- // prepare transmission of Msg4
- ra->state = MSG4;
-
-
-
- // Program Msg4 PDCCH+DLSCH/MPDCCH transmission 4 subframes from now, // Check if this is ok for BL/CE, or if the rule is different
- ra->Msg4_frame = frameP + ((subframeP > 5) ? 1 : 0);
- ra->Msg4_subframe = (subframeP + 4) % 10;
-
- } // if process is active
- } // loop on RA processes
-
- break;
-
- case DCCH:
- case DCCH1:
- // if(eNB_mac_inst[module_idP][CC_idP].Dcch_lchan[UE_id].Active==1){
+ )) == -1) {
+ AssertFatal(1 == 0,
+ "[MAC][eNB] Max user count reached\n");
+ // kill RA procedure
+ } else
+ LOG_D(MAC,
+ "[eNB %d][RAPROC] CC_id %d Frame %d Added user with rnti %x => UE %d\n",
+ enb_mod_idP, CC_idP, frameP, ra->rnti,
+ UE_id);
+ } else {
+ LOG_D(MAC,
+ "[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3 from already registered UE %d: length %d, offset %ld\n",
+ enb_mod_idP, CC_idP, frameP, UE_id,
+ rx_lengths[i], payload_ptr - sduP);
+ // kill RA procedure
+ }
+
+ mac_rrc_data_ind(enb_mod_idP,
+ CC_idP,
+ frameP, subframeP,
+ current_rnti,
+ CCCH,
+ (uint8_t *) payload_ptr,
+ rx_lengths[i],
+ 0);
+
+
+ if (num_ce > 0) { // handle msg3 which is not RRCConnectionRequest
+ // process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
+ }
+ // prepare transmission of Msg4
+ ra->state = MSG4;
+
+
+
+ // Program Msg4 PDCCH+DLSCH/MPDCCH transmission 4 subframes from now, // Check if this is ok for BL/CE, or if the rule is different
+ ra->Msg4_frame = frameP + ((subframeP > 5) ? 1 : 0);
+ ra->Msg4_subframe = (subframeP + 4) % 10;
+
+ } // if process is active
+ } // loop on RA processes
+
+ break;
+
+ case DCCH:
+ case DCCH1:
+ // if(eNB_mac_inst[module_idP][CC_idP].Dcch_lchan[UE_id].Active==1){
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
- LOG_T(MAC, "offset: %d\n",
- (unsigned char) ((unsigned char *) payload_ptr - sduP));
- for (j = 0; j < 32; j++) {
- LOG_T(MAC, "%x ", payload_ptr[j]);
- }
- LOG_T(MAC, "\n");
+ LOG_T(MAC, "offset: %d\n",
+ (unsigned char) ((unsigned char *) payload_ptr - sduP));
+ for (j = 0; j < 32; j++) {
+ LOG_T(MAC, "%x ", payload_ptr[j]);
+ }
+ LOG_T(MAC, "\n");
#endif
- if (UE_id != -1) {
- // adjust buffer occupancy of the correponding logical channel group
- if (UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[UE_list->UE_template[CC_idP]
- [UE_id].lcgidmap[rx_lcids[i]]] >=
- rx_lengths[i])
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[UE_list->UE_template[CC_idP]
- [UE_id].lcgidmap[rx_lcids[i]]] -=
- rx_lengths[i];
- else
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[UE_list->UE_template[CC_idP]
- [UE_id].lcgidmap[rx_lcids[i]]] = 0;
-
- LOG_D(MAC,
- "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
- enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
- rx_lcids[i]);
-
- mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL); //(unsigned int*)crc_status);
- UE_list->eNB_UE_stats[CC_idP][UE_id].
- num_pdu_rx[rx_lcids[i]] += 1;
- UE_list->eNB_UE_stats[CC_idP][UE_id].
- num_bytes_rx[rx_lcids[i]]
- += rx_lengths[i];
+ if (UE_id != -1) {
+ if (lcgid_updated[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] == 0) {
+ // adjust buffer occupancy of the correponding logical channel group
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] >= rx_lengths[i])
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] -= rx_lengths[i];
+ else
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] = 0;
+
+ UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer =
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[0] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[1] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[2] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[3];
+ //UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
+ }
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
+ enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
+ rx_lcids[i]);
- }
+ mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL); //(unsigned int*)crc_status);
+ UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]] += 1;
+ UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]] += rx_lengths[i];
+
+
+ }
- /* UE_id != -1 */
- // }
- break;
+ /* UE_id != -1 */
+ // }
+ break;
- // all the DRBS
- case DTCH:
- default:
+ // all the DRBS
+ case DTCH:
+ default:
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
- LOG_T(MAC, "offset: %d\n",
- (unsigned char) ((unsigned char *) payload_ptr - sduP));
- for (j = 0; j < 32; j++) {
- LOG_T(MAC, "%x ", payload_ptr[j]);
- }
- LOG_T(MAC, "\n");
+ LOG_T(MAC, "offset: %d\n",
+ (unsigned char) ((unsigned char *) payload_ptr - sduP));
+ for (j = 0; j < 32; j++) {
+ LOG_T(MAC, "%x ", payload_ptr[j]);
+ }
+ LOG_T(MAC, "\n");
#endif
- if (rx_lcids[i] < NB_RB_MAX) {
- LOG_D(MAC,
- "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DTCH, received %d bytes from UE %d for lcid %d\n",
- enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
- rx_lcids[i]);
-
- if (UE_id != -1) {
- // adjust buffer occupancy of the correponding logical channel group
- LOG_D(MAC,
- "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DTCH, received %d bytes from UE %d for lcid %d, removing from LCGID %ld, %d\n",
- enb_mod_idP, CC_idP, frameP, rx_lengths[i],
- UE_id, rx_lcids[i],
- UE_list->UE_template[CC_idP][UE_id].
- lcgidmap[rx_lcids[i]],
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[UE_list->UE_template[CC_idP]
- [UE_id].lcgidmap[rx_lcids[i]]]);
-
- if (UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[UE_list->UE_template[CC_idP]
- [UE_id].lcgidmap[rx_lcids[i]]]
- >= rx_lengths[i])
- UE_list->UE_template[CC_idP][UE_id].
- ul_buffer_info[UE_list->UE_template[CC_idP]
- [UE_id].lcgidmap[rx_lcids[i]]]
- -= rx_lengths[i];
- else
- UE_list->UE_template[CC_idP][UE_id].ul_buffer_info
- [UE_list->UE_template[CC_idP][UE_id].lcgidmap
- [rx_lcids[i]]] = 0;
- if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX)
- && (rx_lengths[i] > 0)) { // MAX SIZE OF transport block
- mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL); //(unsigned int*)crc_status);
-
- UE_list->eNB_UE_stats[CC_idP][UE_id].
- num_pdu_rx[rx_lcids[i]] += 1;
- UE_list->eNB_UE_stats[CC_idP][UE_id].
- num_bytes_rx[rx_lcids[i]] += rx_lengths[i];
- //clear uplane_inactivity_timer
- UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
- } else { /* rx_length[i] */
- UE_list->eNB_UE_stats[CC_idP][UE_id].
- num_errors_rx += 1;
- LOG_E(MAC,
- "[eNB %d] CC_id %d Frame %d : Max size of transport block reached LCID %d from UE %d ",
- enb_mod_idP, CC_idP, frameP, rx_lcids[i],
- UE_id);
- }
- } else { /*(UE_id != -1 */
- LOG_E(MAC,
- "[eNB %d] CC_id %d Frame %d : received unsupported or unknown LCID %d from UE %d ",
- enb_mod_idP, CC_idP, frameP, rx_lcids[i], UE_id);
- }
- }
+ if (rx_lcids[i] < NB_RB_MAX) {
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DTCH, received %d bytes from UE %d for lcid %d\n",
+ enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
+ rx_lcids[i]);
- break;
+ if (UE_id != -1) {
+ // adjust buffer occupancy of the correponding logical channel group
+ LOG_D(MAC,
+ "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DTCH, received %d bytes from UE %d for lcid %d, removing from LCGID %ld, %d\n",
+ enb_mod_idP, CC_idP, frameP, rx_lengths[i],
+ UE_id, rx_lcids[i],
+ UE_list->UE_template[CC_idP][UE_id].
+ lcgidmap[rx_lcids[i]],
+ UE_list->UE_template[CC_idP][UE_id].
+ ul_buffer_info[UE_list->UE_template[CC_idP]
+ [UE_id].lcgidmap[rx_lcids[i]]]);
+
+ if (lcgid_updated[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] == 0) {
+ if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] >= rx_lengths[i])
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] -= rx_lengths[i];
+ else
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] = 0;
+
+ UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer =
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[0] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[1] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[2] +
+ UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[3];
+ //UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
+ }
+
+ if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0)) { // MAX SIZE OF transport block
+ mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL); //(unsigned int*)crc_status);
+
+ UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]] += 1;
+ UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]] += rx_lengths[i];
+ //clear uplane_inactivity_timer
+ UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
+ } else { /* rx_length[i] */
+ UE_list->eNB_UE_stats[CC_idP][UE_id].num_errors_rx += 1;
+ LOG_E(MAC,
+ "[eNB %d] CC_id %d Frame %d : Max size of transport block reached LCID %d from UE %d ",
+ enb_mod_idP, CC_idP, frameP, rx_lcids[i],
+ UE_id);
+ }
+ } else { /*(UE_id != -1 */
+ LOG_E(MAC,
+ "[eNB %d] CC_id %d Frame %d : received unsupported or unknown LCID %d from UE %d ",
+ enb_mod_idP, CC_idP, frameP, rx_lcids[i], UE_id);
}
+ }
- payload_ptr += rx_lengths[i];
+ break;
}
- // Program ACK for PHICH
- LOG_D(MAC,
- "Programming PHICH ACK for rnti %x harq_pid %d (first_rb %d)\n",
- current_rnti, harq_pid, first_rb);
- nfapi_hi_dci0_request_t *hi_dci0_req = &mac->HI_DCI0_req[CC_idP];
- nfapi_hi_dci0_request_body_t *hi_dci0_req_body = &hi_dci0_req->hi_dci0_request_body;
- nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
- &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
- memset((void *) hi_dci0_pdu, 0, sizeof(nfapi_hi_dci0_request_pdu_t));
- hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_HI_PDU_TYPE;
- hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_hi_pdu);
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_HI_PDU_REL8_TAG;
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.resource_block_start = first_rb;
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms = 0;
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.hi_value = 1;
- hi_dci0_req_body->number_of_hi++;
- hi_dci0_req_body->sfnsf = sfnsf_add_subframe(frameP,subframeP, 0);
- hi_dci0_req_body->tl.tag = NFAPI_HI_DCI0_REQUEST_BODY_TAG;
- hi_dci0_req->sfn_sf = sfnsf_add_subframe(frameP,subframeP, 4);
- hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
-
- /* NN--> FK: we could either check the payload, or use a phy helper to detect a false msg3 */
- if ((num_sdu == 0) && (num_ce == 0)) {
- if (UE_id != -1)
- UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_errors_rx += 1;
- /*
- if (msg3_flagP != NULL) {
- if( *msg3_flagP == 1 ) {
- LOG_N(MAC,"[eNB %d] CC_id %d frame %d : false msg3 detection: signal phy to canceling RA and remove the UE\n", enb_mod_idP, CC_idP, frameP);
- *msg3_flagP=0;
- }
- } */
- } else {
- if (UE_id != -1) {
- UE_list->eNB_UE_stats[CC_idP][UE_id].pdu_bytes_rx = sdu_lenP;
- UE_list->eNB_UE_stats[CC_idP][UE_id].total_pdu_bytes_rx +=
- sdu_lenP;
- UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_pdus_rx += 1;
- }
+ payload_ptr += rx_lengths[i];
+ }
+
+ // Program ACK for PHICH
+ LOG_D(MAC,
+ "Programming PHICH ACK for rnti %x harq_pid %d (first_rb %d)\n",
+ current_rnti, harq_pid, first_rb);
+ nfapi_hi_dci0_request_t *hi_dci0_req = &mac->HI_DCI0_req[CC_idP];
+ nfapi_hi_dci0_request_body_t *hi_dci0_req_body = &hi_dci0_req->hi_dci0_request_body;
+ nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu =
+ &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
+ memset((void *) hi_dci0_pdu, 0, sizeof(nfapi_hi_dci0_request_pdu_t));
+ hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_HI_PDU_TYPE;
+ hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_hi_pdu);
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_HI_PDU_REL8_TAG;
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.resource_block_start = first_rb;
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms = 0;
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.hi_value = 1;
+ hi_dci0_req_body->number_of_hi++;
+ hi_dci0_req_body->sfnsf = sfnsf_add_subframe(frameP,subframeP, 0);
+ hi_dci0_req_body->tl.tag = NFAPI_HI_DCI0_REQUEST_BODY_TAG;
+ hi_dci0_req->sfn_sf = sfnsf_add_subframe(frameP,subframeP, 4);
+ hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
+
+ /* NN--> FK: we could either check the payload, or use a phy helper to detect a false msg3 */
+ if ((num_sdu == 0) && (num_ce == 0)) {
+ if (UE_id != -1)
+ UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_errors_rx += 1;
+ /*
+ if (msg3_flagP != NULL) {
+ if( *msg3_flagP == 1 ) {
+ LOG_N(MAC,"[eNB %d] CC_id %d frame %d : false msg3 detection: signal phy to canceling RA and remove the UE\n", enb_mod_idP, CC_idP, frameP);
+ *msg3_flagP=0;
+ }
+ } */
+ } else {
+ if (UE_id != -1) {
+ UE_list->eNB_UE_stats[CC_idP][UE_id].pdu_bytes_rx = sdu_lenP;
+ UE_list->eNB_UE_stats[CC_idP][UE_id].total_pdu_bytes_rx += sdu_lenP;
+ UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_pdus_rx += 1;
}
+ }
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
- (VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU, 0);
- stop_meas(&mac->rx_ulsch_sdu);
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU, 0);
+ stop_meas(&mac->rx_ulsch_sdu);
}
uint32_t bytes_to_bsr_index(int32_t nbytes)
{
- uint32_t i = 0;
+ uint32_t i = 0;
- if (nbytes < 0) {
- return (0);
- }
+ if (nbytes < 0) {
+ return (0);
+ }
- while ((i < BSR_TABLE_SIZE) && (BSR_TABLE[i] <= nbytes)) {
- i++;
- }
+ while ((i < BSR_TABLE_SIZE) && (BSR_TABLE[i] <= nbytes)) {
+ i++;
+ }
- return (i - 1);
+ return (i - 1);
}
void
add_ue_ulsch_info(module_id_t module_idP, int CC_id, int UE_id,
sub_frame_t subframeP, UE_ULSCH_STATUS status)
{
- eNB_ulsch_info[module_idP][CC_id][UE_id].rnti =
- UE_RNTI(module_idP, UE_id);
- eNB_ulsch_info[module_idP][CC_id][UE_id].subframe = subframeP;
- eNB_ulsch_info[module_idP][CC_id][UE_id].status = status;
+ eNB_ulsch_info[module_idP][CC_id][UE_id].rnti = UE_RNTI(module_idP, UE_id);
+ eNB_ulsch_info[module_idP][CC_id][UE_id].subframe = subframeP;
+ eNB_ulsch_info[module_idP][CC_id][UE_id].status = status;
- eNB_ulsch_info[module_idP][CC_id][UE_id].serving_num++;
+ eNB_ulsch_info[module_idP][CC_id][UE_id].serving_num++;
}
unsigned char *parse_ulsch_header(unsigned char *mac_header,
@@ -876,77 +766,76 @@ unsigned char *parse_ulsch_header(unsigned char *mac_header,
unsigned short *rx_lengths,
unsigned short tb_length)
{
- unsigned char not_done = 1, num_ces = 0, num_sdus =
- 0, lcid, num_sdu_cnt;
- unsigned char *mac_header_ptr = mac_header;
- unsigned short length, ce_len = 0;
+ unsigned char not_done = 1, num_ces = 0, num_sdus =
+ 0, lcid, num_sdu_cnt;
+ unsigned char *mac_header_ptr = mac_header;
+ unsigned short length, ce_len = 0;
- while (not_done == 1) {
+ while (not_done == 1) {
- if (((SCH_SUBHEADER_FIXED *) mac_header_ptr)->E == 0) {
- not_done = 0;
- }
+ if (((SCH_SUBHEADER_FIXED *) mac_header_ptr)->E == 0) {
+ not_done = 0;
+ }
- lcid = ((SCH_SUBHEADER_FIXED *) mac_header_ptr)->LCID;
+ lcid = ((SCH_SUBHEADER_FIXED *) mac_header_ptr)->LCID;
- if (lcid < EXTENDED_POWER_HEADROOM) {
- if (not_done == 0) { // last MAC SDU, length is implicit
- mac_header_ptr++;
- length =
- tb_length - (mac_header_ptr - mac_header) - ce_len;
+ if (lcid < EXTENDED_POWER_HEADROOM) {
+ if (not_done == 0) { // last MAC SDU, length is implicit
+ mac_header_ptr++;
+ length = tb_length - (mac_header_ptr - mac_header) - ce_len;
- for (num_sdu_cnt = 0; num_sdu_cnt < num_sdus;
- num_sdu_cnt++) {
- length -= rx_lengths[num_sdu_cnt];
- }
- } else {
- if (((SCH_SUBHEADER_SHORT *) mac_header_ptr)->F == 0) {
- length = ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->L;
- mac_header_ptr += 2; //sizeof(SCH_SUBHEADER_SHORT);
- } else { // F = 1
- length =
- ((((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_MSB &
- 0x7f) << 8) | (((SCH_SUBHEADER_LONG *)
- mac_header_ptr)->L_LSB & 0xff);
- mac_header_ptr += 3; //sizeof(SCH_SUBHEADER_LONG);
- }
- }
-
- LOG_D(MAC,
- "[eNB] sdu %d lcid %d tb_length %d length %d (offset now %ld)\n",
- num_sdus, lcid, tb_length, length,
- mac_header_ptr - mac_header);
- rx_lcids[num_sdus] = lcid;
- rx_lengths[num_sdus] = length;
- num_sdus++;
- } else { // This is a control element subheader POWER_HEADROOM, BSR and CRNTI
- if (lcid == SHORT_PADDING) {
- mac_header_ptr++;
- } else {
- rx_ces[num_ces] = lcid;
- num_ces++;
- mac_header_ptr++;
-
- if (lcid == LONG_BSR) {
- ce_len += 3;
- } else if (lcid == CRNTI) {
- ce_len += 2;
- } else if ((lcid == POWER_HEADROOM)
- || (lcid == TRUNCATED_BSR)
- || (lcid == SHORT_BSR)) {
- ce_len++;
- } else {
- LOG_E(MAC, "unknown CE %d \n", lcid);
- AssertFatal(1 == 0, "unknown CE");
- }
- }
+ for (num_sdu_cnt = 0; num_sdu_cnt < num_sdus;
+ num_sdu_cnt++) {
+ length -= rx_lengths[num_sdu_cnt];
}
+ } else {
+ if (((SCH_SUBHEADER_SHORT *) mac_header_ptr)->F == 0) {
+ length = ((SCH_SUBHEADER_SHORT *) mac_header_ptr)->L;
+ mac_header_ptr += 2; //sizeof(SCH_SUBHEADER_SHORT);
+ } else { // F = 1
+ length =
+ ((((SCH_SUBHEADER_LONG *) mac_header_ptr)->L_MSB &
+ 0x7f) << 8) | (((SCH_SUBHEADER_LONG *)
+ mac_header_ptr)->L_LSB & 0xff);
+ mac_header_ptr += 3; //sizeof(SCH_SUBHEADER_LONG);
+ }
+ }
+
+ LOG_D(MAC,
+ "[eNB] sdu %d lcid %d tb_length %d length %d (offset now %ld)\n",
+ num_sdus, lcid, tb_length, length,
+ mac_header_ptr - mac_header);
+ rx_lcids[num_sdus] = lcid;
+ rx_lengths[num_sdus] = length;
+ num_sdus++;
+ } else { // This is a control element subheader POWER_HEADROOM, BSR and CRNTI
+ if (lcid == SHORT_PADDING) {
+ mac_header_ptr++;
+ } else {
+ rx_ces[num_ces] = lcid;
+ num_ces++;
+ mac_header_ptr++;
+
+ if (lcid == LONG_BSR) {
+ ce_len += 3;
+ } else if (lcid == CRNTI) {
+ ce_len += 2;
+ } else if ((lcid == POWER_HEADROOM)
+ || (lcid == TRUNCATED_BSR)
+ || (lcid == SHORT_BSR)) {
+ ce_len++;
+ } else {
+ LOG_E(MAC, "unknown CE %d \n", lcid);
+ AssertFatal(1 == 0, "unknown CE");
+ }
+ }
}
+ }
- *num_ce = num_ces;
- *num_sdu = num_sdus;
+ *num_ce = num_ces;
+ *num_sdu = num_sdus;
- return (mac_header_ptr);
+ return (mac_header_ptr);
}
/* This function is called by PHY layer when it schedules some
@@ -961,236 +850,230 @@ set_msg3_subframe(module_id_t mod_id,
int subframe, int rnti, int Msg3_frame,
int Msg3_subframe)
{
- eNB_MAC_INST *mac = RC.mac[mod_id];
- int i;
- for (i = 0; i < NB_RA_PROC_MAX; i++) {
- if (mac->common_channels[CC_id].ra[i].state != IDLE &&
- mac->common_channels[CC_id].ra[i].rnti == rnti) {
- mac->common_channels[CC_id].ra[i].Msg3_subframe =
- Msg3_subframe;
- break;
- }
+ eNB_MAC_INST *mac = RC.mac[Mod_id];
+ int i;
+ for (i = 0; i < NB_RA_PROC_MAX; i++) {
+ if (mac->common_channels[CC_id].ra[i].state != IDLE &&
+ mac->common_channels[CC_id].ra[i].rnti == rnti) {
+ mac->common_channels[CC_id].ra[i].Msg3_subframe =
+ Msg3_subframe;
+ break;
}
+ }
}
void
schedule_ulsch(module_id_t module_idP, frame_t frameP,
sub_frame_t subframeP)
{
- uint16_t first_rb[MAX_NUM_CCs], i;
- int CC_id;
- eNB_MAC_INST *mac = RC.mac[module_idP];
- COMMON_channels_t *cc;
-
- start_meas(&mac->schedule_ulsch);
-
- int sched_subframe = (subframeP + 4) % 10;
-
- cc = &mac->common_channels[0];
- int tdd_sfa;
- // for TDD: check subframes where we have to act and return if nothing should be done now
- if (cc->tdd_Config) {
- tdd_sfa = cc->tdd_Config->subframeAssignment;
- switch (subframeP) {
- case 0:
- if ((tdd_sfa == 0) || (tdd_sfa == 3) || (tdd_sfa == 6))
- sched_subframe = 4;
- else
- return;
- break;
- case 1:
- if ((tdd_sfa == 0) || (tdd_sfa == 1))
- sched_subframe = 7;
- else if (tdd_sfa == 6)
- sched_subframe = 8;
- break;
- default:
- return;
-
- case 2: // Don't schedule UL in subframe 2 for TDD
- return;
- case 3:
- if (tdd_sfa == 2)
- sched_subframe = 7;
- else
- return;
- break;
- case 4:
- if (tdd_sfa == 1)
- sched_subframe = 8;
- else
- return;
- break;
- case 5:
- if (tdd_sfa == 0)
- sched_subframe = 9;
- else if (tdd_sfa == 6)
- sched_subframe = 3;
- else
- return;
- break;
- case 6:
- if (tdd_sfa == 1)
- sched_subframe = 2;
- else if (tdd_sfa == 6)
- sched_subframe = 3;
- else
- return;
- break;
- case 7:
- return;
- case 8:
- if ((tdd_sfa >= 2) || (tdd_sfa <= 5))
- sched_subframe = 2;
- else
- return;
- break;
- case 9:
- if ((tdd_sfa == 1) || (tdd_sfa == 3) || (tdd_sfa == 4))
- sched_subframe = 3;
- else if (tdd_sfa == 6)
- sched_subframe = 4;
- else
- return;
- break;
- }
+ uint16_t first_rb[MAX_NUM_CCs], i;
+ int CC_id;
+ eNB_MAC_INST *mac = RC.mac[module_idP];
+ COMMON_channels_t *cc;
+
+ start_meas(&mac->schedule_ulsch);
+
+ int sched_subframe = (subframeP + 4) % 10;
+
+ cc = &mac->common_channels[0];
+ int tdd_sfa;
+ // for TDD: check subframes where we have to act and return if nothing should be done now
+ if (cc->tdd_Config) {
+ tdd_sfa = cc->tdd_Config->subframeAssignment;
+ switch (subframeP) {
+ case 0:
+ if ((tdd_sfa == 0) || (tdd_sfa == 3) || (tdd_sfa == 6))
+ sched_subframe = 4;
+ else
+ return;
+ break;
+ case 1:
+ if ((tdd_sfa == 0) || (tdd_sfa == 1))
+ sched_subframe = 7;
+ else if (tdd_sfa == 6)
+ sched_subframe = 8;
+ break;
+ default:
+ return;
+
+ case 2: // Don't schedule UL in subframe 2 for TDD
+ return;
+ case 3:
+ if (tdd_sfa == 2)
+ sched_subframe = 7;
+ else
+ return;
+ break;
+ case 4:
+ if (tdd_sfa == 1)
+ sched_subframe = 8;
+ else
+ return;
+ break;
+ case 5:
+ if (tdd_sfa == 0)
+ sched_subframe = 9;
+ else if (tdd_sfa == 6)
+ sched_subframe = 3;
+ else
+ return;
+ break;
+ case 6:
+ if (tdd_sfa == 1)
+ sched_subframe = 2;
+ else if (tdd_sfa == 6)
+ sched_subframe = 3;
+ else
+ return;
+ break;
+ case 7:
+ return;
+ case 8:
+ if ((tdd_sfa >= 2) || (tdd_sfa <= 5))
+ sched_subframe = 2;
+ else
+ return;
+ break;
+ case 9:
+ if ((tdd_sfa == 1) || (tdd_sfa == 3) || (tdd_sfa == 4))
+ sched_subframe = 3;
+ else if (tdd_sfa == 6)
+ sched_subframe = 4;
+ else
+ return;
+ break;
}
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
+ }
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- //leave out first RB for PUCCH
- first_rb[CC_id] = 1;
+ //leave out first RB for PUCCH
+ first_rb[CC_id] = 1;
- // UE data info;
- // check which UE has data to transmit
- // function to decide the scheduling
- // e.g. scheduling_rslt = Greedy(granted_UEs, nb_RB)
+ // UE data info;
+ // check which UE has data to transmit
+ // function to decide the scheduling
+ // e.g. scheduling_rslt = Greedy(granted_UEs, nb_RB)
- // default function for default scheduling
- //
+ // default function for default scheduling
+ //
- // output of scheduling, the UE numbers in RBs, where it is in the code???
- // check if RA (Msg3) is active in this subframeP, if so skip the PRBs used for Msg3
- // Msg3 is using 1 PRB so we need to increase first_rb accordingly
- // not sure about the break (can there be more than 1 active RA procedure?)
+ // output of scheduling, the UE numbers in RBs, where it is in the code???
+ // check if RA (Msg3) is active in this subframeP, if so skip the PRBs used for Msg3
+ // Msg3 is using 1 PRB so we need to increase first_rb accordingly
+ // not sure about the break (can there be more than 1 active RA procedure?)
- for (i = 0; i < NB_RA_PROC_MAX; i++) {
- if ((cc->ra[i].state == WAITMSG3) &&
- (cc->ra[i].Msg3_subframe == sched_subframe)) {
- first_rb[CC_id]++;
- // cc->ray[i].Msg3_subframe = -1;
- break;
- }
- }
+ for (i = 0; i < NB_RA_PROC_MAX; i++) {
+ if ((cc->ra[i].state == WAITMSG3) &&
+ (cc->ra[i].Msg3_subframe == sched_subframe)) {
+ first_rb[CC_id]++;
+ // cc->ray[i].Msg3_subframe = -1;
+ break;
+ }
}
+ }
- // perform slice-specifc operations
+ // perform slice-specifc operations
- total_slice_percentage_uplink=0;
- avg_slice_percentage_uplink=1.0/n_active_slices_uplink;
+ total_slice_percentage_uplink=0;
+ avg_slice_percentage_uplink=1.0/n_active_slices_uplink;
// reset the slice percentage for inactive slices
- for (i = n_active_slices_uplink; i< MAX_NUM_SLICES; i++) {
- slice_percentage_uplink[i]=0;
- }
- for (i = 0; i < n_active_slices_uplink; i++) {
- if (slice_percentage_uplink[i] < 0 ){
- LOG_W(MAC, "[eNB %d] frame %d subframe %d:invalid slice %d percentage %f. resetting to zero",
- module_idP, frameP, subframeP, i, slice_percentage_uplink[i]);
- slice_percentage_uplink[i]=0;
- }
- total_slice_percentage_uplink+=slice_percentage_uplink[i];
- }
-
- for (i = 0; i < n_active_slices_uplink; i++) {
-
- // Load any updated functions
- if (update_ul_scheduler[i] > 0 ) {
- slice_sched_ul[i] = dlsym(NULL, ul_scheduler_type[i]);
- update_ul_scheduler[i] = 0;
- update_ul_scheduler_current[i] = 0;
- //slice_percentage_current_uplink[i]= slice_percentage_uplink[i];
- //total_slice_percentage_current_uplink+=slice_percentage_uplink[i];
- //if (total_slice_percentage_current_uplink> 1)
- // total_slice_percentage_current_uplink=1;
- LOG_N(MAC,"update ul scheduler slice %d\n", i);
- }
- // the new total RB share is within the range
- if (total_slice_percentage_uplink <= 1.0){
-
- // check if the number of slices has changed, and log
- if (n_active_slices_current_uplink != n_active_slices_uplink ){
- if ((n_active_slices_uplink > 0) && (n_active_slices_uplink <= MAX_NUM_SLICES)) {
- LOG_N(MAC,"[eNB %d]frame %d subframe %d: number of active UL slices has changed: %d-->%d\n",
- module_idP, frameP, subframeP, n_active_slices_current_uplink, n_active_slices_uplink);
-
- n_active_slices_current_uplink = n_active_slices_uplink;
-
- } else {
- LOG_W(MAC,"invalid number of UL slices %d, revert to the previous value %d\n",n_active_slices_uplink, n_active_slices_current_uplink);
- n_active_slices_uplink = n_active_slices_current_uplink;
- }
- }
-
- // check if the slice rb share has changed, and log the console
- if (slice_percentage_current_uplink[i] != slice_percentage_uplink[i]){
- LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: total percentage %f-->%f, slice RB percentage has changed: %f-->%f\n",
- module_idP, i, frameP, subframeP, total_slice_percentage_current_uplink, total_slice_percentage_uplink, slice_percentage_current_uplink[i], slice_percentage_uplink[i]);
- total_slice_percentage_current_uplink= total_slice_percentage_uplink;
- slice_percentage_current_uplink[i] = slice_percentage_uplink[i];
-
- }
-
- // check if the slice max MCS, and log the console
- if (slice_maxmcs_current_uplink[i] != slice_maxmcs_uplink[i]){
- if ((slice_maxmcs_uplink[i] >= 0) && (slice_maxmcs_uplink[i] <= 16)){
- LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: slice MAX MCS has changed: %d-->%d\n",
- module_idP, i, frameP, subframeP, slice_maxmcs_current_uplink[i], slice_maxmcs_uplink[i]);
- slice_maxmcs_current_uplink[i] = slice_maxmcs_uplink[i];
- } else {
- LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid slice max mcs %d, revert the previous value %d\n",module_idP, i, slice_maxmcs_uplink[i],slice_maxmcs_current_uplink[i]);
- slice_maxmcs_uplink[i]= slice_maxmcs_current_uplink[i];
-
- }
- }
-
- // check if a new scheduler, and log the console
- if (update_ul_scheduler_current[i] != update_ul_scheduler[i]){
- LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: UL scheduler for this slice is updated: %s \n",
- module_idP, i, frameP, subframeP, ul_scheduler_type[i]);
-
- update_ul_scheduler_current[i] = update_ul_scheduler[i];
- }
- }
- else {
-
- if (n_active_slices_uplink == n_active_slices_current_uplink){
- LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid total RB share (%f->%f), reduce proportionally the RB share by 0.1\n",
- module_idP, i, total_slice_percentage_current_uplink,
- total_slice_percentage_uplink);
- if (slice_percentage_uplink[i] > avg_slice_percentage_uplink){
- slice_percentage_uplink[i]-=0.1;
- total_slice_percentage_uplink-=0.1;
- }
- } else {
- // here we can correct the values, e.g. reduce proportionally
- LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid total RB share (%f->%f), revert the number of slice to its previous value (%d->%d)\n",
- module_idP, i, total_slice_percentage_current_uplink,
- total_slice_percentage_uplink, n_active_slices_uplink,
- n_active_slices_current_uplink);
- n_active_slices_uplink = n_active_slices_current_uplink;
- slice_percentage_uplink[i] = slice_percentage_current_uplink[i];
- }
- }
-
- // Run each enabled slice-specific schedulers one by one
- /* TODO Navid What is the right call for this message? */
- slice_sched_ul[i](module_idP, i, frameP, subframeP, sched_subframe, first_rb);
- }
+ for (i = n_active_slices_uplink; i< MAX_NUM_SLICES; i++) {
+ slice_percentage_uplink[i]=0;
+ }
+ for (i = 0; i < n_active_slices_uplink; i++) {
+ if (slice_percentage_uplink[i] < 0 ){
+ LOG_W(MAC, "[eNB %d] frame %d subframe %d:invalid slice %d percentage %f. resetting to zero",
+ module_idP, frameP, subframeP, i, slice_percentage_uplink[i]);
+ slice_percentage_uplink[i]=0;
+ }
+ total_slice_percentage_uplink+=slice_percentage_uplink[i];
+ }
+
+ for (i = 0; i < n_active_slices_uplink; i++) {
+
+ // Load any updated functions
+ if (update_ul_scheduler[i] > 0 ) {
+ slice_sched_ul[i] = dlsym(NULL, ul_scheduler_type[i]);
+ update_ul_scheduler[i] = 0;
+ update_ul_scheduler_current[i] = 0;
+ //slice_percentage_current_uplink[i]= slice_percentage_uplink[i];
+ //total_slice_percentage_current_uplink+=slice_percentage_uplink[i];
+ //if (total_slice_percentage_current_uplink> 1)
+ //total_slice_percentage_current_uplink=1;
+ LOG_N(MAC,"update ul scheduler slice %d\n", i);
+ }
+ // the new total RB share is within the range
+ if (total_slice_percentage_uplink <= 1.0){
+
+ // check if the number of slices has changed, and log
+ if (n_active_slices_current_uplink != n_active_slices_uplink ){
+ if ((n_active_slices_uplink > 0) && (n_active_slices_uplink <= MAX_NUM_SLICES)) {
+ LOG_N(MAC,"[eNB %d]frame %d subframe %d: number of active UL slices has changed: %d-->%d\n",
+ module_idP, frameP, subframeP, n_active_slices_current_uplink, n_active_slices_uplink);
+ n_active_slices_current_uplink = n_active_slices_uplink;
+ } else {
+ LOG_W(MAC,"invalid number of UL slices %d, revert to the previous value %d\n",
+ n_active_slices_uplink, n_active_slices_current_uplink);
+ n_active_slices_uplink = n_active_slices_current_uplink;
+ }
+ }
+
+ // check if the slice rb share has changed, and log the console
+ if (slice_percentage_current_uplink[i] != slice_percentage_uplink[i]){
+ LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: total percentage %f-->%f, slice RB percentage has changed: %f-->%f\n",
+ module_idP, i, frameP, subframeP, total_slice_percentage_current_uplink,
+ total_slice_percentage_uplink, slice_percentage_current_uplink[i], slice_percentage_uplink[i]);
+ total_slice_percentage_current_uplink = total_slice_percentage_uplink;
+ slice_percentage_current_uplink[i] = slice_percentage_uplink[i];
+ }
+
+ // check if the slice max MCS, and log the console
+ if (slice_maxmcs_current_uplink[i] != slice_maxmcs_uplink[i]){
+ if ((slice_maxmcs_uplink[i] >= 0) && (slice_maxmcs_uplink[i] <= 16)){
+ LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: slice MAX MCS has changed: %d-->%d\n",
+ module_idP, i, frameP, subframeP, slice_maxmcs_current_uplink[i], slice_maxmcs_uplink[i]);
+ slice_maxmcs_current_uplink[i] = slice_maxmcs_uplink[i];
+ } else {
+ LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid slice max mcs %d, revert the previous value %d\n",
+ module_idP, i, slice_maxmcs_uplink[i],slice_maxmcs_current_uplink[i]);
+ slice_maxmcs_uplink[i] = slice_maxmcs_current_uplink[i];
+ }
+ }
+
+ // check if a new scheduler, and log the console
+ if (update_ul_scheduler_current[i] != update_ul_scheduler[i]){
+ LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: UL scheduler for this slice is updated: %s \n",
+ module_idP, i, frameP, subframeP, ul_scheduler_type[i]);
+ update_ul_scheduler_current[i] = update_ul_scheduler[i];
+ }
+ } else {
+ if (n_active_slices_uplink == n_active_slices_current_uplink) {
+ LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid total RB share (%f->%f), reduce proportionally the RB share by 0.1\n",
+ module_idP, i, total_slice_percentage_current_uplink, total_slice_percentage_uplink);
+ if (slice_percentage_uplink[i] > avg_slice_percentage_uplink) {
+ slice_percentage_uplink[i] -= 0.1;
+ total_slice_percentage_uplink -= 0.1;
+ }
+ } else {
+ // here we can correct the values, e.g. reduce proportionally
+ LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid total RB share (%f->%f), revert the number of slice to its previous value (%d->%d)\n",
+ module_idP, i, total_slice_percentage_current_uplink,
+ total_slice_percentage_uplink, n_active_slices_uplink,
+ n_active_slices_current_uplink);
+ n_active_slices_uplink = n_active_slices_current_uplink;
+ slice_percentage_uplink[i] = slice_percentage_current_uplink[i];
+ }
+ }
+ // Run each enabled slice-specific schedulers one by one
+ /* TODO Navid What is the right call for this message? */
+ slice_sched_ul[i](module_idP, i, frameP, subframeP, sched_subframe, first_rb);
+ }
- stop_meas(&mac->schedule_ulsch);
+ stop_meas(&mac->schedule_ulsch);
}
void
@@ -1200,504 +1083,466 @@ schedule_ulsch_rnti(module_id_t module_idP,
sub_frame_t subframeP,
unsigned char sched_subframeP, uint16_t * first_rb)
{
- int UE_id;
- uint8_t aggregation = 2;
- rnti_t rnti = -1;
- uint8_t round = 0;
- uint8_t harq_pid = 0;
- uint8_t status = 0;
- uint8_t rb_table_index = -1;
- uint32_t cqi_req, cshift, ndi, tpc;
- int32_t normalized_rx_power;
- int32_t target_rx_power = -90;
- static int32_t tpc_accumulated = 0;
- int n;
- int CC_id = 0;
- int drop_ue = 0;
- int N_RB_UL;
- eNB_MAC_INST *mac = RC.mac[module_idP];
- COMMON_channels_t *cc = mac->common_channels;
- UE_list_t *UE_list = &mac->UE_list;
- UE_TEMPLATE *UE_template;
- UE_sched_ctrl *UE_sched_ctrl;
- int sched_frame = frameP;
- int rvidx_tab[4] = { 0, 2, 3, 1 };
-
- if (sched_subframeP < subframeP)
- sched_frame++;
-
- nfapi_hi_dci0_request_t *hi_dci0_req = &mac->HI_DCI0_req[CC_id];
- nfapi_hi_dci0_request_body_t *hi_dci0_req_body = &hi_dci0_req->hi_dci0_request_body;
- nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu;
-
- nfapi_ul_config_request_t *ul_req_tmp = &mac->UL_req_tmp[CC_id][sched_subframeP];
- nfapi_ul_config_request_body_t *ul_req_tmp_body = &ul_req_tmp->ul_config_request_body;
-
- //LOG_D(MAC, "entering ulsch preprocesor\n");
- ulsch_scheduler_pre_processor(module_idP, slice_id, frameP, subframeP, first_rb);
-
- //LOG_D(MAC, "exiting ulsch preprocesor\n");
-
- hi_dci0_req->sfn_sf = (frameP << 4) + subframeP;
-
- // loop over all active UEs
- for (UE_id = UE_list->head_ul; UE_id >= 0;
- UE_id = UE_list->next_ul[UE_id]) {
-
- if (flexran_slice_member(UE_id, slice_id) == 0)
- continue;
-
- // don't schedule if Msg4 is not received yet
- if (UE_list->UE_template[UE_PCCID(module_idP, UE_id)][UE_id].
- configured == FALSE) {
- LOG_D(MAC,
- "[eNB %d] frame %d subfarme %d, UE %d: not configured, skipping UE scheduling \n",
- module_idP, frameP, subframeP, UE_id);
- continue;
- }
+ int UE_id;
+ uint8_t aggregation = 2;
+ rnti_t rnti = -1;
+ uint8_t round = 0;
+ uint8_t harq_pid = 0;
+ uint8_t status = 0;
+ uint8_t rb_table_index = -1;
+ uint32_t cqi_req, cshift, ndi, tpc;
+ int32_t normalized_rx_power;
+ int32_t target_rx_power = -90;
+ static int32_t tpc_accumulated = 0;
+ int n;
+ int CC_id = 0;
+ int drop_ue = 0;
+ int N_RB_UL;
+ eNB_MAC_INST *mac = RC.mac[module_idP];
+ COMMON_channels_t *cc = mac->common_channels;
+ UE_list_t *UE_list = &mac->UE_list;
+ UE_TEMPLATE *UE_template;
+ UE_sched_ctrl *UE_sched_ctrl;
+ int sched_frame = frameP;
+ int rvidx_tab[4] = { 0, 2, 3, 1 };
+
+ if (sched_subframeP < subframeP)
+ sched_frame++;
+
+ nfapi_hi_dci0_request_t *hi_dci0_req = &mac->HI_DCI0_req[CC_id];
+ nfapi_hi_dci0_request_body_t *hi_dci0_req_body = &hi_dci0_req->hi_dci0_request_body;
+ nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu;
+
+ nfapi_ul_config_request_t *ul_req_tmp = &mac->UL_req_tmp[CC_id][sched_subframeP];
+ nfapi_ul_config_request_body_t *ul_req_tmp_body = &ul_req_tmp->ul_config_request_body;
+
+ //LOG_D(MAC, "entering ulsch preprocesor\n");
+ ulsch_scheduler_pre_processor(module_idP, slice_id, frameP, subframeP, first_rb);
+
+ //LOG_D(MAC, "exiting ulsch preprocesor\n");
+
+ hi_dci0_req->sfn_sf = (frameP << 4) + subframeP;
+
+ // loop over all active UEs
+ for (UE_id = UE_list->head_ul; UE_id >= 0;
+ UE_id = UE_list->next_ul[UE_id]) {
+
+ if (flexran_slice_member(UE_id, slice_id) == 0)
+ continue;
+
+ // don't schedule if Msg4 is not received yet
+ if (UE_list->UE_template[UE_PCCID(module_idP, UE_id)][UE_id].
+ configured == FALSE) {
+ LOG_D(MAC,
+ "[eNB %d] frame %d subfarme %d, UE %d: not configured, skipping UE scheduling \n",
+ module_idP, frameP, subframeP, UE_id);
+ continue;
+ }
- rnti = UE_RNTI(module_idP, UE_id);
+ rnti = UE_RNTI(module_idP, UE_id);
- if (rnti == NOT_A_RNTI) {
- LOG_W(MAC, "[eNB %d] frame %d subfarme %d, UE %d: no RNTI \n",
- module_idP, frameP, subframeP, UE_id);
- continue;
- }
+ if (rnti == NOT_A_RNTI) {
+ LOG_W(MAC, "[eNB %d] frame %d subfarme %d, UE %d: no RNTI \n",
+ module_idP, frameP, subframeP, UE_id);
+ continue;
+ }
- drop_ue = 0;
- /* let's drop the UE if get_eNB_UE_stats returns NULL when calling it with any of the UE's active UL CCs */
- /* TODO: refine?
-
- for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
- CC_id = UE_list->ordered_ULCCids[n][UE_id];
-
- if (mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti) == NULL) {
- LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d: no PHY context\n", module_idP,frameP,subframeP,UE_id,rnti,CC_id);
- drop_ue = 1;
- break;
- }
- } */
- if (drop_ue == 1) {
-/* we can't come here, ulsch_scheduler_pre_processor won't put in the list a UE with no PHY context */
- abort();
- /* TODO: this is a hack. Sometimes the UE has no PHY context but
- * is still present in the MAC with 'ul_failure_timer' = 0 and
- * 'ul_out_of_sync' = 0. It seems wrong and the UE stays there forever. Let's
- * start an UL out of sync procedure in this case.
- * The root cause of this problem has to be found and corrected.
- * In the meantime, this hack...
- */
- if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer == 0 &&
- UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 0) {
- LOG_W(MAC,
- "[eNB %d] frame %d subframe %d, UE %d/%x CC %d: UE in weird state, let's put it 'out of sync'\n",
- module_idP, frameP, subframeP, UE_id, rnti, CC_id);
- // inform RRC of failure and clear timer
- mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP,
- subframeP, rnti);
- UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
- UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 1;
+ drop_ue = 0;
+ /* let's drop the UE if get_eNB_UE_stats returns NULL when calling it with any of the UE's active UL CCs */
+ /* TODO: refine?
+
+ for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
+ CC_id = UE_list->ordered_ULCCids[n][UE_id];
+
+ if (mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti) == NULL) {
+ LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d: no PHY context\n", module_idP,frameP,subframeP,UE_id,rnti,CC_id);
+ drop_ue = 1;
+ break;
+ }
+ } */
+ if (drop_ue == 1) {
+ /* we can't come here, ulsch_scheduler_pre_processor won't put in the list a UE with no PHY context */
+ abort();
+ /* TODO: this is a hack. Sometimes the UE has no PHY context but
+ * is still present in the MAC with 'ul_failure_timer' = 0 and
+ * 'ul_out_of_sync' = 0. It seems wrong and the UE stays there forever. Let's
+ * start an UL out of sync procedure in this case.
+ * The root cause of this problem has to be found and corrected.
+ * In the meantime, this hack...
+ */
+ if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer == 0 &&
+ UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 0) {
+ LOG_W(MAC,
+ "[eNB %d] frame %d subframe %d, UE %d/%x CC %d: UE in weird state, let's put it 'out of sync'\n",
+ module_idP, frameP, subframeP, UE_id, rnti, CC_id);
+ // inform RRC of failure and clear timer
+ mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP,
+ subframeP, rnti);
+ UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
+ UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 1;
+ }
+ continue;
+ }
+ // loop over all active UL CC_ids for this UE
+ for (n = 0; n < UE_list->numactiveULCCs[UE_id]; n++) {
+ // This is the actual CC_id in the list
+ CC_id = UE_list->ordered_ULCCids[n][UE_id];
+ N_RB_UL = to_prb(cc[CC_id].ul_Bandwidth);
+
+ /*
+ aggregation=get_aggregation(get_bw_index(module_idP,CC_id),
+ eNB_UE_stats->dl_cqi,
+ format0);
+ */
+
+ if (CCE_allocation_infeasible
+ (module_idP, CC_id, 1, subframeP, aggregation, rnti)) {
+ LOG_W(MAC,
+ "[eNB %d] frame %d subframe %d, UE %d/%x CC %d: not enough nCCE\n",
+ module_idP, frameP, subframeP, UE_id, rnti, CC_id);
+ continue; // break;
+ }
+
+ /* be sure that there are some free RBs */
+ if (first_rb[CC_id] >= N_RB_UL - 1) {
+ LOG_W(MAC,
+ "[eNB %d] frame %d subframe %d, UE %d/%x CC %d: dropping, not enough RBs\n",
+ module_idP, frameP, subframeP, UE_id, rnti, CC_id);
+ continue;
+ }
+ // if (eNB_UE_stats->mode == PUSCH) { // ue has a ulsch channel
+
+ UE_template = &UE_list->UE_template[CC_id][UE_id];
+ UE_sched_ctrl = &UE_list->UE_sched_ctrl[UE_id];
+ harq_pid = subframe2harqpid(&cc[CC_id], sched_frame, sched_subframeP);
+ round = UE_sched_ctrl->round_UL[CC_id][harq_pid];
+ AssertFatal(round < 8, "round %d > 7 for UE %d/%x\n", round,
+ UE_id, rnti);
+ LOG_D(MAC,
+ "[eNB %d] frame %d subframe %d (sched_frame %d, sched_subframe %d), Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
+ module_idP, frameP, subframeP, sched_frame, sched_subframeP, harq_pid, UE_id, rnti,
+ CC_id, aggregation, N_RB_UL);
+
+ RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP * 10) + subframeP] = UE_template->estimated_ul_buffer;
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_UE0_BO,RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP *
+ 10) +
+ subframeP]);
+ if (UE_is_to_be_scheduled(module_idP, CC_id, UE_id) > 0 || round > 0) // || ((frameP%10)==0))
+ // if there is information on bsr of DCCH, DTCH or if there is UL_SR, or if there is a packet to retransmit, or we want to schedule a periodic feedback every 10 frames
+ {
+ LOG_D(MAC,
+ "[eNB %d][PUSCH %d] Frame %d subframe %d Scheduling UE %d/%x in round %d(SR %d,UL_inactivity timer %d,UL_failure timer %d,cqi_req_timer %d)\n",
+ module_idP, harq_pid, frameP, subframeP, UE_id, rnti,
+ round, UE_template->ul_SR,
+ UE_sched_ctrl->ul_inactivity_timer,
+ UE_sched_ctrl->ul_failure_timer,
+ UE_sched_ctrl->cqi_req_timer);
+ // reset the scheduling request
+ UE_template->ul_SR = 0;
+ status = mac_eNB_get_rrc_status(module_idP, rnti);
+ if (status < RRC_CONNECTED)
+ cqi_req = 0;
+ else if (UE_sched_ctrl->cqi_req_timer > 30) {
+ if (nfapi_mode) {
+ cqi_req = 0;
+ } else {
+ cqi_req = 1;
}
- continue;
- }
- // loop over all active UL CC_ids for this UE
- for (n = 0; n < UE_list->numactiveULCCs[UE_id]; n++) {
- // This is the actual CC_id in the list
- CC_id = UE_list->ordered_ULCCids[n][UE_id];
- N_RB_UL = to_prb(cc[CC_id].ul_Bandwidth);
-
- /*
- aggregation=get_aggregation(get_bw_index(module_idP,CC_id),
- eNB_UE_stats->dl_cqi,
- format0);
- */
-
- if (CCE_allocation_infeasible
- (module_idP, CC_id, 1, subframeP, aggregation, rnti)) {
- LOG_W(MAC,
- "[eNB %d] frame %d subframe %d, UE %d/%x CC %d: not enough nCCE\n",
- module_idP, frameP, subframeP, UE_id, rnti, CC_id);
- continue; // break;
+ UE_sched_ctrl->cqi_req_timer = 0;
+ } else
+ cqi_req = 0;
+
+ //power control
+ //compute the expected ULSCH RX power (for the stats)
+
+ // this is the normalized RX power and this should be constant (regardless of mcs
+ normalized_rx_power = UE_sched_ctrl->pusch_snr[CC_id];
+ target_rx_power = 178;
+
+ // this assumes accumulated tpc
+ // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
+ int32_t framex10psubframe = UE_template->pusch_tpc_tx_frame * 10 + UE_template->pusch_tpc_tx_subframe;
+ if (((framex10psubframe + 10) <= (frameP * 10 + subframeP)) || //normal case
+ ((framex10psubframe > (frameP * 10 + subframeP)) && (((10240 - framex10psubframe + frameP * 10 + subframeP) >= 10)))) //frame wrap-around
+ {
+ UE_template->pusch_tpc_tx_frame = frameP;
+ UE_template->pusch_tpc_tx_subframe = subframeP;
+ if (normalized_rx_power > (target_rx_power + 4)) {
+ tpc = 0; //-1
+ tpc_accumulated--;
+ } else if (normalized_rx_power < (target_rx_power - 4)) {
+ tpc = 2; //+1
+ tpc_accumulated++;
+ } else {
+ tpc = 1; //0
+ }
+ } else {
+ tpc = 1; //0
+ }
+ //tpc = 1;
+ if (tpc != 1) {
+ LOG_D(MAC,
+ "[eNB %d] ULSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",
+ module_idP, frameP, subframeP, harq_pid, tpc,
+ tpc_accumulated, normalized_rx_power,
+ target_rx_power);
+ }
+ // new transmission
+ if (round == 0) {
+
+ ndi = 1 - UE_template->oldNDI_UL[harq_pid];
+ UE_template->oldNDI_UL[harq_pid] = ndi;
+ UE_list->eNB_UE_stats[CC_id][UE_id].
+ normalized_rx_power = normalized_rx_power;
+ UE_list->eNB_UE_stats[CC_id][UE_id].target_rx_power = target_rx_power;
+ UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs1 = UE_template->pre_assigned_mcs_ul;
+ UE_template->mcs_UL[harq_pid] = UE_template->pre_assigned_mcs_ul; //cmin (UE_template->pre_assigned_mcs_ul, openair_daq_vars.target_ue_ul_mcs); // adjust, based on user-defined MCS
+ if (UE_template->pre_allocated_rb_table_index_ul >= 0) {
+ rb_table_index =
+ UE_template->pre_allocated_rb_table_index_ul;
+ } else {
+ UE_template->mcs_UL[harq_pid] = 10; //cmin (10, openair_daq_vars.target_ue_ul_mcs);
+ rb_table_index = 5; // for PHR
}
- /* be sure that there are some free RBs */
- if (first_rb[CC_id] >= N_RB_UL - 1) {
- LOG_W(MAC,
- "[eNB %d] frame %d subframe %d, UE %d/%x CC %d: dropping, not enough RBs\n",
- module_idP, frameP, subframeP, UE_id, rnti, CC_id);
- continue;
+ UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2 = UE_template->mcs_UL[harq_pid];
+ // buffer_occupancy = UE_template->ul_total_buffer;
+
+
+ while (((rb_table[rb_table_index] >
+ (N_RB_UL - 1 - first_rb[CC_id]))
+ || (rb_table[rb_table_index] > 45))
+ && (rb_table_index > 0)) {
+ rb_table_index--;
}
- // if (eNB_UE_stats->mode == PUSCH) { // ue has a ulsch channel
-
- UE_template = &UE_list->UE_template[CC_id][UE_id];
- UE_sched_ctrl = &UE_list->UE_sched_ctrl[UE_id];
- harq_pid =
- subframe2harqpid(&cc[CC_id], sched_frame, sched_subframeP);
- round = UE_sched_ctrl->round_UL[CC_id][harq_pid];
- AssertFatal(round < 8, "round %d > 7 for UE %d/%x\n", round,
- UE_id, rnti);
+
+ UE_template->TBS_UL[harq_pid] = get_TBS_UL(UE_template->mcs_UL[harq_pid],
+ rb_table[rb_table_index]);
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_rx += rb_table[rb_table_index];
+ UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_TBS = UE_template->TBS_UL[harq_pid];
+ // buffer_occupancy -= TBS;
+
+ T(T_ENB_MAC_UE_UL_SCHEDULE, T_INT(module_idP),
+ T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+ T_INT(subframeP), T_INT(harq_pid),
+ T_INT(UE_template->mcs_UL[harq_pid]),
+ T_INT(first_rb[CC_id]),
+ T_INT(rb_table[rb_table_index]),
+ T_INT(UE_template->TBS_UL[harq_pid]), T_INT(ndi));
+
+ if (mac_eNB_get_rrc_status(module_idP, rnti) < RRC_CONNECTED)
+ LOG_D(MAC,
+ "[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)\n",
+ module_idP, harq_pid, rnti, CC_id, frameP,
+ subframeP, UE_id,
+ UE_template->mcs_UL[harq_pid],
+ first_rb[CC_id], rb_table[rb_table_index],
+ rb_table_index,
+ UE_template->TBS_UL[harq_pid], harq_pid);
+
+ // bad indices : 20 (40 PRB), 21 (45 PRB), 22 (48 PRB)
+ //store for possible retransmission
+ UE_template->nb_rb_ul[harq_pid] = rb_table[rb_table_index];
+ UE_template->first_rb_ul[harq_pid] = first_rb[CC_id];
+
+ UE_sched_ctrl->ul_scheduled |= (1 << harq_pid);
+ if (UE_id == UE_list->head)
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_UE0_SCHEDULED,
+ UE_sched_ctrl->ul_scheduled);
+
+ // adjust scheduled UL bytes by TBS, wait for UL sdus to do final update
LOG_D(MAC,
- "[eNB %d] frame %d subframe %d (sched_frame %d, sched_subframe %d), Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
- module_idP, frameP, subframeP, sched_frame, sched_subframeP, harq_pid, UE_id, rnti,
- CC_id, aggregation, N_RB_UL);
-
- RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP *
- 10) +
- subframeP] =
- UE_template->ul_total_buffer;
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
- (VCD_SIGNAL_DUMPER_VARIABLES_UE0_BO,
- RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP *
- 10) +
- subframeP]);
- if (UE_is_to_be_scheduled(module_idP, CC_id, UE_id) > 0 || round > 0) // || ((frameP%10)==0))
- // if there is information on bsr of DCCH, DTCH or if there is UL_SR, or if there is a packet to retransmit, or we want to schedule a periodic feedback every 10 frames
- {
- LOG_D(MAC,
- "[eNB %d][PUSCH %d] Frame %d subframe %d Scheduling UE %d/%x in round %d(SR %d,UL_inactivity timer %d,UL_failure timer %d,cqi_req_timer %d)\n",
- module_idP, harq_pid, frameP, subframeP, UE_id, rnti,
- round, UE_template->ul_SR,
- UE_sched_ctrl->ul_inactivity_timer,
- UE_sched_ctrl->ul_failure_timer,
- UE_sched_ctrl->cqi_req_timer);
- // reset the scheduling request
- UE_template->ul_SR = 0;
- status = mac_eNB_get_rrc_status(module_idP, rnti);
- if (status < RRC_CONNECTED)
- cqi_req = 0;
- else if (UE_sched_ctrl->cqi_req_timer > 30) {
- if (nfapi_mode) {
- cqi_req = 0;
- } else {
- cqi_req = 1;
- }
- UE_sched_ctrl->cqi_req_timer = 0;
- } else
- cqi_req = 0;
-
- //power control
- //compute the expected ULSCH RX power (for the stats)
-
- // this is the normalized RX power and this should be constant (regardless of mcs
- normalized_rx_power = UE_sched_ctrl->pusch_snr[CC_id];
- target_rx_power = 178;
-
- // this assumes accumulated tpc
- // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
- int32_t framex10psubframe =
- UE_template->pusch_tpc_tx_frame * 10 +
- UE_template->pusch_tpc_tx_subframe;
- if (((framex10psubframe + 10) <= (frameP * 10 + subframeP)) || //normal case
- ((framex10psubframe > (frameP * 10 + subframeP)) && (((10240 - framex10psubframe + frameP * 10 + subframeP) >= 10)))) //frame wrap-around
- {
- UE_template->pusch_tpc_tx_frame = frameP;
- UE_template->pusch_tpc_tx_subframe = subframeP;
- if (normalized_rx_power > (target_rx_power + 4)) {
- tpc = 0; //-1
- tpc_accumulated--;
- } else if (normalized_rx_power < (target_rx_power - 4)) {
- tpc = 2; //+1
- tpc_accumulated++;
- } else {
- tpc = 1; //0
- }
- } else {
- tpc = 1; //0
- }
- //tpc = 1;
- if (tpc != 1) {
- LOG_D(MAC,
- "[eNB %d] ULSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",
- module_idP, frameP, subframeP, harq_pid, tpc,
- tpc_accumulated, normalized_rx_power,
- target_rx_power);
- }
- // new transmission
- if (round == 0) {
-
- ndi = 1 - UE_template->oldNDI_UL[harq_pid];
- UE_template->oldNDI_UL[harq_pid] = ndi;
- UE_list->eNB_UE_stats[CC_id][UE_id].
- normalized_rx_power = normalized_rx_power;
- UE_list->eNB_UE_stats[CC_id][UE_id].target_rx_power =
- target_rx_power;
- UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs1 =
- UE_template->pre_assigned_mcs_ul;
- UE_template->mcs_UL[harq_pid] = UE_template->pre_assigned_mcs_ul; //cmin (UE_template->pre_assigned_mcs_ul, openair_daq_vars.target_ue_ul_mcs); // adjust, based on user-defined MCS
- if (UE_template->pre_allocated_rb_table_index_ul >= 0) {
- rb_table_index =
- UE_template->pre_allocated_rb_table_index_ul;
- } else {
- UE_template->mcs_UL[harq_pid] = 10; //cmin (10, openair_daq_vars.target_ue_ul_mcs);
- rb_table_index = 5; // for PHR
- }
-
- UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2 =
- UE_template->mcs_UL[harq_pid];
- // buffer_occupancy = UE_template->ul_total_buffer;
-
-
- while (((rb_table[rb_table_index] >
- (N_RB_UL - 1 - first_rb[CC_id]))
- || (rb_table[rb_table_index] > 45))
- && (rb_table_index > 0)) {
- rb_table_index--;
- }
-
- UE_template->TBS_UL[harq_pid] =
- get_TBS_UL(UE_template->mcs_UL[harq_pid],
- rb_table[rb_table_index]);
- UE_list->eNB_UE_stats[CC_id][UE_id].
- total_rbs_used_rx += rb_table[rb_table_index];
- UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_TBS =
- UE_template->TBS_UL[harq_pid];
- // buffer_occupancy -= TBS;
-
- T(T_ENB_MAC_UE_UL_SCHEDULE, T_INT(module_idP),
- T_INT(CC_id), T_INT(rnti), T_INT(frameP),
- T_INT(subframeP), T_INT(harq_pid),
- T_INT(UE_template->mcs_UL[harq_pid]),
- T_INT(first_rb[CC_id]),
- T_INT(rb_table[rb_table_index]),
- T_INT(UE_template->TBS_UL[harq_pid]), T_INT(ndi));
-
- if (mac_eNB_get_rrc_status(module_idP, rnti) <
- RRC_CONNECTED)
- LOG_D(MAC,
- "[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)\n",
- module_idP, harq_pid, rnti, CC_id, frameP,
- subframeP, UE_id,
- UE_template->mcs_UL[harq_pid],
- first_rb[CC_id], rb_table[rb_table_index],
- rb_table_index,
- UE_template->TBS_UL[harq_pid], harq_pid);
-
- // bad indices : 20 (40 PRB), 21 (45 PRB), 22 (48 PRB)
- //store for possible retransmission
- UE_template->nb_rb_ul[harq_pid] =
- rb_table[rb_table_index];
- UE_template->first_rb_ul[harq_pid] = first_rb[CC_id];
-
- UE_sched_ctrl->ul_scheduled |= (1 << harq_pid);
- if (UE_id == UE_list->head)
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
- (VCD_SIGNAL_DUMPER_VARIABLES_UE0_SCHEDULED,
- UE_sched_ctrl->ul_scheduled);
-
- // adjust total UL buffer status by TBS, wait for UL sdus to do final update
- LOG_D(MAC,
- "[eNB %d] CC_id %d UE %d/%x : adjusting ul_total_buffer, old %d, TBS %d\n",
- module_idP, CC_id, UE_id, rnti,
- UE_template->ul_total_buffer,
- UE_template->TBS_UL[harq_pid]);
- if (UE_template->ul_total_buffer >
- UE_template->TBS_UL[harq_pid])
- UE_template->ul_total_buffer -=
- UE_template->TBS_UL[harq_pid];
- else
- UE_template->ul_total_buffer = 0;
- LOG_D(MAC, "ul_total_buffer, new %d\n",
- UE_template->ul_total_buffer);
- // Cyclic shift for DM RS
- cshift = 0; // values from 0 to 7 can be used for mapping the cyclic shift (36.211 , Table 5.5.2.1.1-1)
- // save it for a potential retransmission
- UE_template->cshift[harq_pid] = cshift;
-
- hi_dci0_pdu = &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
- memset((void *) hi_dci0_pdu, 0,
- sizeof(nfapi_hi_dci0_request_pdu_t));
- hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_DCI_PDU_TYPE;
- hi_dci0_pdu->pdu_size =
- 2 + sizeof(nfapi_hi_dci0_dci_pdu);
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_DCI_PDU_REL8_TAG;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.dci_format =
- NFAPI_UL_DCI_FORMAT_0;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level =
- aggregation;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.transmission_power =
- 6000;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.
- resource_block_start = first_rb[CC_id];
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.
- number_of_resource_block =
- rb_table[rb_table_index];
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.mcs_1 =
- UE_template->mcs_UL[harq_pid];
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.
- cyclic_shift_2_for_drms = cshift;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.
- frequency_hopping_enabled_flag = 0;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.
- new_data_indication_1 = ndi;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.tpc = tpc;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.cqi_csi_request =
- cqi_req;
- hi_dci0_pdu->dci_pdu.dci_pdu_rel8.dl_assignment_index =
- UE_template->DAI_ul[sched_subframeP];
-
- hi_dci0_req_body->number_of_dci++;
- hi_dci0_req_body->sfnsf = sfnsf_add_subframe(frameP, subframeP, 4);
- hi_dci0_req_body->tl.tag = NFAPI_HI_DCI0_REQUEST_BODY_TAG;
-
- hi_dci0_req->sfn_sf = frameP<<4|subframeP; // sfnsf_add_subframe(sched_frame, sched_subframeP, 0); // sunday!
- hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
-
-
- LOG_D(MAC,
- "[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d\n",
- harq_pid, frameP, subframeP, UE_id, rnti,
- sched_frame, sched_subframeP);
-
- // Add UL_config PDUs
- fill_nfapi_ulsch_config_request_rel8(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], cqi_req, cc, UE_template->physicalConfigDedicated, get_tmode(module_idP, CC_id, UE_id), mac->ul_handle, rnti, first_rb[CC_id], // resource_block_start
- rb_table[rb_table_index], // number_of_resource_blocks
- UE_template->mcs_UL[harq_pid], cshift, // cyclic_shift_2_for_drms
- 0, // frequency_hopping_enabled_flag
- 0, // frequency_hopping_bits
- ndi, // new_data_indication
- 0, // redundancy_version
- harq_pid, // harq_process_number
- 0, // ul_tx_mode
- 0, // current_tx_nb
- 0, // n_srs
- get_TBS_UL
- (UE_template->
- mcs_UL[harq_pid],
- rb_table
- [rb_table_index]));
+ "[eNB %d] CC_id %d UE %d/%x : adjusting scheduled_ul_bytes, old %d, TBS %d\n",
+ module_idP, CC_id, UE_id, rnti,
+ UE_template->scheduled_ul_bytes,
+ UE_template->TBS_UL[harq_pid]);
+
+ UE_template->scheduled_ul_bytes += UE_template->TBS_UL[harq_pid];
+
+ LOG_D(MAC, "scheduled_ul_bytes, new %d\n", UE_template->scheduled_ul_bytes);
+
+ // Cyclic shift for DM RS
+ cshift = 0; // values from 0 to 7 can be used for mapping the cyclic shift (36.211 , Table 5.5.2.1.1-1)
+ // save it for a potential retransmission
+ UE_template->cshift[harq_pid] = cshift;
+
+ hi_dci0_pdu = &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
+ memset((void *) hi_dci0_pdu, 0,sizeof(nfapi_hi_dci0_request_pdu_t));
+ hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_DCI_PDU_TYPE;
+ hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_dci_pdu);
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_DCI_PDU_REL8_TAG;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.dci_format = NFAPI_UL_DCI_FORMAT_0;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level = aggregation;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.transmission_power = 6000;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.resource_block_start = first_rb[CC_id];
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.number_of_resource_block = rb_table[rb_table_index];
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.mcs_1 = UE_template->mcs_UL[harq_pid];
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.cyclic_shift_2_for_drms = cshift;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.frequency_hopping_enabled_flag = 0;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.new_data_indication_1 = ndi;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.tpc = tpc;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.cqi_csi_request = cqi_req;
+ hi_dci0_pdu->dci_pdu.dci_pdu_rel8.dl_assignment_index = UE_template->DAI_ul[sched_subframeP];
+
+ hi_dci0_req_body->number_of_dci++;
+ hi_dci0_req_body->sfnsf = sfnsf_add_subframe(frameP, subframeP, 4);
+ hi_dci0_req_body->tl.tag = NFAPI_HI_DCI0_REQUEST_BODY_TAG;
+
+ hi_dci0_req->sfn_sf = frameP<<4|subframeP; // sfnsf_add_subframe(sched_frame, sched_subframeP, 0); // sunday!
+ hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
+
+
+ LOG_D(MAC,
+ "[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d\n",
+ harq_pid, frameP, subframeP, UE_id, rnti,
+ sched_frame, sched_subframeP);
+
+ // Add UL_config PDUs
+ fill_nfapi_ulsch_config_request_rel8(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], cqi_req, cc, UE_template->physicalConfigDedicated, get_tmode(module_idP, CC_id, UE_id), mac->ul_handle, rnti, first_rb[CC_id], // resource_block_start
+ rb_table[rb_table_index], // number_of_resource_blocks
+ UE_template->mcs_UL[harq_pid], cshift, // cyclic_shift_2_for_drms
+ 0, // frequency_hopping_enabled_flag
+ 0, // frequency_hopping_bits
+ ndi, // new_data_indication
+ 0, // redundancy_version
+ harq_pid, // harq_process_number
+ 0, // ul_tx_mode
+ 0, // current_tx_nb
+ 0, // n_srs
+ get_TBS_UL
+ (UE_template->
+ mcs_UL[harq_pid],
+ rb_table
+ [rb_table_index]));
#ifdef Rel14
- if (UE_template->rach_resource_type > 0) { // This is a BL/CE UE allocation
- fill_nfapi_ulsch_config_request_emtc(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], UE_template->rach_resource_type > 2 ? 2 : 1, 1, //total_number_of_repetitions
- 1, //repetition_number
- (frameP *
- 10) +
- subframeP);
- }
+ if (UE_template->rach_resource_type > 0) { // This is a BL/CE UE allocation
+ fill_nfapi_ulsch_config_request_emtc(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], UE_template->rach_resource_type > 2 ? 2 : 1, 1, //total_number_of_repetitions
+ 1, //repetition_number
+ (frameP *
+ 10) +
+ subframeP);
+ }
#endif
- ul_req_tmp->header.message_id = NFAPI_UL_CONFIG_REQUEST;
- ul_req_tmp_body->number_of_pdus++;
- ul_req_tmp_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
- mac->ul_handle++;
-
- uint16_t ul_sched_frame = sched_frame;
- uint16_t ul_sched_subframeP = sched_subframeP;
-
- add_subframe(&ul_sched_frame, &ul_sched_subframeP, 2);
- ul_req_tmp->sfn_sf = ul_sched_frame<<4|ul_sched_subframeP;
-
- add_ue_ulsch_info(module_idP,
- CC_id, UE_id, subframeP,
- S_UL_SCHEDULED);
-
- //LOG_D(MAC, "[eNB %d] CC_id %d Frame %d, subframeP %d: Generated ULSCH DCI for next UE_id %d, format 0\n", module_idP, CC_id, frameP, subframeP, UE_id);
- LOG_D(MAC,"[PUSCH %d] SFN/SF:%04d%d UL_CFG:SFN/SF:%04d%d CQI:%d for UE %d/%x\n", harq_pid,frameP,subframeP,ul_sched_frame,ul_sched_subframeP,cqi_req,UE_id,rnti);
-
- // increment first rb for next UE allocation
- first_rb[CC_id] += rb_table[rb_table_index];
- } else { // round > 0 => retransmission
- T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION,
- T_INT(module_idP), T_INT(CC_id), T_INT(rnti),
- T_INT(frameP), T_INT(subframeP), T_INT(harq_pid),
- T_INT(UE_template->mcs_UL[harq_pid]),
- T_INT(first_rb[CC_id]),
- T_INT(rb_table[rb_table_index]), T_INT(round));
-
- // fill in NAK information
-
- hi_dci0_pdu = &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
- memset((void *) hi_dci0_pdu, 0,
- sizeof(nfapi_hi_dci0_request_pdu_t));
- hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_HI_PDU_TYPE;
- hi_dci0_pdu->pdu_size =
- 2 + sizeof(nfapi_hi_dci0_hi_pdu);
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_HI_PDU_REL8_TAG;
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.resource_block_start =
- UE_template->first_rb_ul[harq_pid];
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.
- cyclic_shift_2_for_drms =
- UE_template->cshift[harq_pid];
- hi_dci0_pdu->hi_pdu.hi_pdu_rel8.hi_value = 0;
- hi_dci0_req_body->number_of_hi++;
- hi_dci0_req_body->sfnsf = sfnsf_add_subframe(sched_frame, sched_subframeP, 0);
- hi_dci0_req->sfn_sf = frameP<<4|subframeP;
- hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
-
- LOG_D(MAC,
- "[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled (PHICH) UE %d (mcs %d, first rb %d, nb_rb %d, TBS %d, round %d)\n",
- module_idP, harq_pid, rnti, CC_id, frameP,
- subframeP, UE_id, UE_template->mcs_UL[harq_pid],
- UE_template->first_rb_ul[harq_pid],
- UE_template->nb_rb_ul[harq_pid],
- UE_template->TBS_UL[harq_pid], round);
- // Add UL_config PDUs
- LOG_D(MAC,
- "[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d\n",
- harq_pid, frameP, subframeP, UE_id, rnti,
- sched_frame, sched_subframeP);
- fill_nfapi_ulsch_config_request_rel8(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], cqi_req, cc, UE_template->physicalConfigDedicated, get_tmode(module_idP, CC_id, UE_id), mac->ul_handle, rnti, UE_template->first_rb_ul[harq_pid], // resource_block_start
- UE_template->nb_rb_ul[harq_pid], // number_of_resource_blocks
- UE_template->mcs_UL[harq_pid], cshift, // cyclic_shift_2_for_drms
- 0, // frequency_hopping_enabled_flag
- 0, // frequency_hopping_bits
- UE_template->oldNDI_UL[harq_pid], // new_data_indication
- rvidx_tab[round & 3], // redundancy_version
- harq_pid, // harq_process_number
- 0, // ul_tx_mode
- 0, // current_tx_nb
- 0, // n_srs
- UE_template->
- TBS_UL[harq_pid]);
+ ul_req_tmp->header.message_id = NFAPI_UL_CONFIG_REQUEST;
+ ul_req_tmp_body->number_of_pdus++;
+ ul_req_tmp_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ mac->ul_handle++;
+
+ uint16_t ul_sched_frame = sched_frame;
+ uint16_t ul_sched_subframeP = sched_subframeP;
+
+ add_subframe(&ul_sched_frame, &ul_sched_subframeP, 2);
+ ul_req_tmp->sfn_sf = ul_sched_frame<<4|ul_sched_subframeP;
+
+ add_ue_ulsch_info(module_idP,
+ CC_id, UE_id, subframeP,
+ S_UL_SCHEDULED);
+
+ //LOG_D(MAC, "[eNB %d] CC_id %d Frame %d, subframeP %d: Generated ULSCH DCI for next UE_id %d, format 0\n", module_idP, CC_id, frameP, subframeP, UE_id);
+ LOG_D(MAC,"[PUSCH %d] SFN/SF:%04d%d UL_CFG:SFN/SF:%04d%d CQI:%d for UE %d/%x\n", harq_pid,frameP,subframeP,ul_sched_frame,ul_sched_subframeP,cqi_req,UE_id,rnti);
+
+ // increment first rb for next UE allocation
+ first_rb[CC_id] += rb_table[rb_table_index];
+ } else { // round > 0 => retransmission
+ T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION,
+ T_INT(module_idP), T_INT(CC_id), T_INT(rnti),
+ T_INT(frameP), T_INT(subframeP), T_INT(harq_pid),
+ T_INT(UE_template->mcs_UL[harq_pid]),
+ T_INT(first_rb[CC_id]),
+ T_INT(rb_table[rb_table_index]), T_INT(round));
+
+ // fill in NAK information
+
+ hi_dci0_pdu = &hi_dci0_req_body->hi_dci0_pdu_list[hi_dci0_req_body->number_of_dci + hi_dci0_req_body->number_of_hi];
+ memset((void *) hi_dci0_pdu, 0,
+ sizeof(nfapi_hi_dci0_request_pdu_t));
+ hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_HI_PDU_TYPE;
+ hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_hi_pdu);
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.tl.tag = NFAPI_HI_DCI0_REQUEST_HI_PDU_REL8_TAG;
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.resource_block_start = UE_template->first_rb_ul[harq_pid];
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms = UE_template->cshift[harq_pid];
+ hi_dci0_pdu->hi_pdu.hi_pdu_rel8.hi_value = 0;
+ hi_dci0_req_body->number_of_hi++;
+ hi_dci0_req_body->sfnsf = sfnsf_add_subframe(sched_frame, sched_subframeP, 0);
+ hi_dci0_req->sfn_sf = frameP<<4|subframeP;
+ hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
+
+ LOG_D(MAC,
+ "[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled (PHICH) UE %d (mcs %d, first rb %d, nb_rb %d, TBS %d, round %d)\n",
+ module_idP, harq_pid, rnti, CC_id, frameP,
+ subframeP, UE_id, UE_template->mcs_UL[harq_pid],
+ UE_template->first_rb_ul[harq_pid],
+ UE_template->nb_rb_ul[harq_pid],
+ UE_template->TBS_UL[harq_pid], round);
+ // Add UL_config PDUs
+ LOG_D(MAC,
+ "[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d\n",
+ harq_pid, frameP, subframeP, UE_id, rnti,
+ sched_frame, sched_subframeP);
+ fill_nfapi_ulsch_config_request_rel8(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], cqi_req, cc, UE_template->physicalConfigDedicated, get_tmode(module_idP, CC_id, UE_id), mac->ul_handle, rnti, UE_template->first_rb_ul[harq_pid], // resource_block_start
+ UE_template->nb_rb_ul[harq_pid], // number_of_resource_blocks
+ UE_template->mcs_UL[harq_pid], cshift, // cyclic_shift_2_for_drms
+ 0, // frequency_hopping_enabled_flag
+ 0, // frequency_hopping_bits
+ UE_template->oldNDI_UL[harq_pid], // new_data_indication
+ rvidx_tab[round & 3], // redundancy_version
+ harq_pid, // harq_process_number
+ 0, // ul_tx_mode
+ 0, // current_tx_nb
+ 0, // n_srs
+ UE_template->
+ TBS_UL[harq_pid]);
#ifdef Rel14
- if (UE_template->rach_resource_type > 0) { // This is a BL/CE UE allocation
- fill_nfapi_ulsch_config_request_emtc(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], UE_template->rach_resource_type > 2 ? 2 : 1, 1, //total_number_of_repetitions
- 1, //repetition_number
- (frameP *
- 10) +
- subframeP);
- }
+ if (UE_template->rach_resource_type > 0) { // This is a BL/CE UE allocation
+ fill_nfapi_ulsch_config_request_emtc(&ul_req_tmp_body->ul_config_pdu_list[ul_req_tmp_body->number_of_pdus], UE_template->rach_resource_type > 2 ? 2 : 1, 1, //total_number_of_repetitions
+ 1, //repetition_number
+ (frameP *
+ 10) +
+ subframeP);
+ }
#endif
- ul_req_tmp_body->number_of_pdus++;
- mac->ul_handle++;
+ ul_req_tmp_body->number_of_pdus++;
+ mac->ul_handle++;
- ul_req_tmp_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
+ ul_req_tmp_body->tl.tag = NFAPI_UL_CONFIG_REQUEST_BODY_TAG;
- ul_req_tmp->sfn_sf = sched_frame<<4|sched_subframeP;
- ul_req_tmp->header.message_id = NFAPI_UL_CONFIG_REQUEST;
+ ul_req_tmp->sfn_sf = sched_frame<<4|sched_subframeP;
+ ul_req_tmp->header.message_id = NFAPI_UL_CONFIG_REQUEST;
- LOG_D(MAC,"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d cqi_req %d\n",
- harq_pid,frameP,subframeP,UE_id,rnti,sched_frame,sched_subframeP,cqi_req);
- } /*
- else if (round > 0) { //we schedule a retransmission
+ LOG_D(MAC,"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d cqi_req %d\n",
+ harq_pid,frameP,subframeP,UE_id,rnti,sched_frame,sched_subframeP,cqi_req);
+ } /*
+ else if (round > 0) { //we schedule a retransmission
- ndi = UE_template->oldNDI_UL[harq_pid];
+ ndi = UE_template->oldNDI_UL[harq_pid];
- if ((round&3)==0) {
- mcs = openair_daq_vars.target_ue_ul_mcs;
- } else {
- mcs = rvidx_tab[round&3] + 28; //not correct for round==4!
+ if ((round&3)==0) {
+ mcs = openair_daq_vars.target_ue_ul_mcs;
+ } else {
+ mcs = rvidx_tab[round&3] + 28; //not correct for round==4!
- }
+ }
- LOG_I(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, harq_pid %d, round %d)\n",
- module_idP,UE_id,rnti,CC_id,frameP,subframeP,mcs,
- first_rb[CC_id],UE_template->nb_rb_ul[harq_pid],
- harq_pid, round);
+ LOG_I(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, harq_pid %d, round %d)\n",
+ module_idP,UE_id,rnti,CC_id,frameP,subframeP,mcs,
+ first_rb[CC_id],UE_template->nb_rb_ul[harq_pid],
+ harq_pid, round);
- rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
- first_rb[CC_id],
- UE_template->nb_rb_ul[harq_pid]);
- first_rb[CC_id]+=UE_template->nb_rb_ul[harq_pid]; // increment for next UE allocation
+ rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
+ first_rb[CC_id],
+ UE_template->nb_rb_ul[harq_pid]);
+ first_rb[CC_id]+=UE_template->nb_rb_ul[harq_pid]; // increment for next UE allocation
- UE_list->eNB_UE_stats[CC_id][UE_id].num_retransmission_rx+=1;
- UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used_retx_rx=UE_template->nb_rb_ul[harq_pid];
- UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_rx+=UE_template->nb_rb_ul[harq_pid];
- UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs1=mcs;
- UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
- }
- */
+ UE_list->eNB_UE_stats[CC_id][UE_id].num_retransmission_rx+=1;
+ UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used_retx_rx=UE_template->nb_rb_ul[harq_pid];
+ UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_rx+=UE_template->nb_rb_ul[harq_pid];
+ UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs1=mcs;
+ UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
+ }
+ */
- } // UE_is_to_be_scheduled
- } // loop over UE_id
- } // loop of CC_id
+ } // UE_is_to_be_scheduled
+ } // loop over UE_id
+ } // loop of CC_id
}
diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c
index bb729f79963b17af6492cb407520aecab0f5acd2..544a48b80b72d3681a90b272955968e8f25d1b46 100644
--- a/openair2/LAYER2/MAC/pre_processor.c
+++ b/openair2/LAYER2/MAC/pre_processor.c
@@ -1640,9 +1640,11 @@ assign_max_mcs_min_rb(module_id_t module_idP, int slice_id, int frameP,
to_prb(RC.mac[module_idP]->common_channels[CC_id].
ul_Bandwidth);
// if this UE has UL traffic
- if (UE_template->ul_total_buffer > 0) {
-
+ int bytes_to_schedule = UE_template->estimated_ul_buffer - UE_template->scheduled_ul_bytes;
+ if (bytes_to_schedule < 0) bytes_to_schedule = 0;
+ int bits_to_schedule = bytes_to_schedule * 8;
+ if (bits_to_schedule > 0) {
tbs = get_TBS_UL(mcs, 3) << 3; // 1 or 2 PRB with cqi enabled does not work well!
rb_table_index = 2;
@@ -1652,7 +1654,7 @@ assign_max_mcs_min_rb(module_id_t module_idP, int slice_id, int frameP,
Ncp, 0);
while ((((UE_template->phr_info - tx_power) < 0)
- || (tbs > UE_template->ul_total_buffer))
+ || (tbs > bits_to_schedule))
&& (mcs > 3)) {
// LOG_I(MAC,"UE_template->phr_info %d tx_power %d mcs %d\n", UE_template->phr_info,tx_power, mcs);
mcs--;
@@ -1660,7 +1662,7 @@ assign_max_mcs_min_rb(module_id_t module_idP, int slice_id, int frameP,
tx_power = estimate_ue_tx_power(tbs, rb_table[rb_table_index], 0, Ncp, 0); // fixme: set use_srs
}
- while ((tbs < UE_template->ul_total_buffer) &&
+ while ((tbs < bits_to_schedule) &&
(rb_table[rb_table_index] <
(N_RB_UL - first_rb[CC_id]))
&& ((UE_template->phr_info - tx_power) > 0)
@@ -1750,11 +1752,14 @@ static int ue_ul_compare(const void *_a, const void *_b, void *_params)
UE_list->UE_template[pCCid2][UE_id2].ul_buffer_info[LCGID0])
return 1;
- if (UE_list->UE_template[pCCid1][UE_id1].ul_total_buffer >
- UE_list->UE_template[pCCid2][UE_id2].ul_total_buffer)
+ int bytes_to_schedule1 = UE_list->UE_template[pCCid1][UE_id1].estimated_ul_buffer - UE_list->UE_template[pCCid1][UE_id1].scheduled_ul_bytes;
+ if (bytes_to_schedule1 < 0) bytes_to_schedule1 = 0;
+ int bytes_to_schedule2 = UE_list->UE_template[pCCid2][UE_id2].estimated_ul_buffer - UE_list->UE_template[pCCid2][UE_id2].scheduled_ul_bytes;
+ if (bytes_to_schedule2 < 0) bytes_to_schedule2 = 0;
+
+ if (bytes_to_schedule1 > bytes_to_schedule2)
return -1;
- if (UE_list->UE_template[pCCid1][UE_id1].ul_total_buffer <
- UE_list->UE_template[pCCid2][UE_id2].ul_total_buffer)
+ if (bytes_to_schedule1 < bytes_to_schedule2)
return 1;
if (UE_list->UE_template[pCCid1][UE_id1].pre_assigned_mcs_ul >
diff --git a/openair2/LAYER2/openair2_proc.c b/openair2/LAYER2/openair2_proc.c
index 34c06a9c538cd968d835210210353015920c0be2..f66d1142abf5c668f240de1fcda9bc2aa65337ff 100644
--- a/openair2/LAYER2/openair2_proc.c
+++ b/openair2/LAYER2/openair2_proc.c
@@ -217,11 +217,11 @@ int dump_eNB_l2_stats(char *buffer, int length)
UE_list->eNB_UE_stats[CC_id][UE_id].num_errors_rx);
len+= sprintf(&buffer[len],"[MAC] Received PHR PH = %d (db)\n", UE_list->UE_template[CC_id][UE_id].phr_info);
- len+= sprintf(&buffer[len],"[MAC] Received BSR LCGID[0][1][2][3] = %u %u %u %u\n",
- UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID0],
- UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID1],
- UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID2],
- UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID3]
+ len+= sprintf(&buffer[len],"[MAC] Estimated size LCGID[0][1][2][3] = %u %u %u %u\n",
+ UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID0],
+ UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID1],
+ UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID2],
+ UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID3]
);
}
diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
index b8a4148b1131a6d8a9960d6fcc5050a4a9d89711..77ba0c4cade0378c36db0cb8807d4f1a23b30ace 100644
--- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
@@ -876,7 +876,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib3)->intraFreqCellReselectionInfo.presenceAntennaPort1 = 0;
(*sib3)->intraFreqCellReselectionInfo.neighCellConfig.buf = CALLOC(8,1);
(*sib3)->intraFreqCellReselectionInfo.neighCellConfig.size = 1;
- (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.buf[0] = 1;
+ (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.buf[0] = 1 << 6;
(*sib3)->intraFreqCellReselectionInfo.neighCellConfig.bits_unused = 6;
(*sib3)->intraFreqCellReselectionInfo.t_ReselectionEUTRA = 1;
(*sib3)->intraFreqCellReselectionInfo.t_ReselectionEUTRA_SF = (struct SpeedStateScaleFactors *)NULL;
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index f51ac31a7936254b83175ae42530a67124dc2703..6f35f28ebde09531196e4537cae31295d7d1a737 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -413,7 +413,9 @@ init_MCCH(
0,//rnti
(BCCH_BCH_Message_t *)NULL,
(RadioResourceConfigCommonSIB_t *) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t *) NULL,
+#endif
(struct PhysicalConfigDedicated *)NULL,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
@@ -1173,7 +1175,9 @@ rrc_eNB_generate_RRCConnectionReestablishment(
ctxt_pP->rnti,
(BCCH_BCH_Message_t *) NULL,
(RadioResourceConfigCommonSIB_t *) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t *) NULL,
+#endif
(struct PhysicalConfigDedicated* ) ue_context_pP->ue_context.physicalConfigDedicated,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
@@ -4599,7 +4603,9 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
ue_context_pP->ue_context.rnti,
(BCCH_BCH_Message_t *) NULL,
(RadioResourceConfigCommonSIB_t*) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t*) NULL,
+#endif
ue_context_pP->ue_context.physicalConfigDedicated,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
@@ -5178,7 +5184,9 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
ue_context_pP->ue_context.rnti,
(BCCH_BCH_Message_t *) NULL,
(RadioResourceConfigCommonSIB_t *) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t *) NULL,
+#endif
ue_context_pP->ue_context.physicalConfigDedicated,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
@@ -5448,7 +5456,9 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
ue_context_pP->ue_context.rnti,
(BCCH_BCH_Message_t *) NULL,
(RadioResourceConfigCommonSIB_t *) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t *) NULL,
+#endif
ue_context_pP->ue_context.physicalConfigDedicated,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
@@ -5501,7 +5511,9 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
ue_context_pP->ue_context.rnti,
(BCCH_BCH_Message_t *) NULL,
(RadioResourceConfigCommonSIB_t *) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t *) NULL,
+#endif
ue_context_pP->ue_context.physicalConfigDedicated,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
@@ -5617,7 +5629,9 @@ rrc_eNB_generate_RRCConnectionSetup(
ue_context_pP->ue_context.rnti,
(BCCH_BCH_Message_t *) NULL,
(RadioResourceConfigCommonSIB_t *) NULL,
+#ifdef Rel14
(RadioResourceConfigCommonSIB_t *) NULL,
+#endif
ue_context_pP->ue_context.physicalConfigDedicated,
#if defined(Rel10) || defined(Rel14)
(SCellToAddMod_r10_t *)NULL,
diff --git a/openair3/S1AP/s1ap_eNB_encoder.c b/openair3/S1AP/s1ap_eNB_encoder.c
index 9a5f422158dc592d685935d01bdbff06c17095c0..7bd8bc09aabf6165dffe649bc2700678fd90a03b 100644
--- a/openair3/S1AP/s1ap_eNB_encoder.c
+++ b/openair3/S1AP/s1ap_eNB_encoder.c
@@ -470,7 +470,7 @@ int s1ap_eNB_encode_initial_ue_message(
return s1ap_generate_initiating_message(buffer,
length,
S1ap_ProcedureCode_id_initialUEMessage,
- S1ap_Criticality_reject,
+ S1ap_Criticality_ignore,
&asn_DEF_S1ap_InitialUEMessage,
initialUEMessage_p);
}
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
index b35b6147cd9dfd9d518356a2434df84a9bae8f73..227decbcd625cd2e870178d533fe70c5c86186ef 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
index 1c9ad09141dfed017836dd27a63c85d71f19a7d9..bc2b3b219c316d8750846a61a16d96aeb90e926a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -10,7 +10,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
index 772e13fe6fd0f3e563f0839c146e028cf9c5e748..42ab1e81c73435fd281af578355a27dcbc81b1ff 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -13,7 +13,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
index e60e7934386b9b8296a5b1b1ebc4845a984f1a7a..aacc87e5b0c49c18d2432224e849121879a48b8a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
@@ -13,7 +13,7 @@ eNBs =
cell_type = "CELL_MACRO_ENB";
- eNB_name = "eNB_Eurecom_LTEBox";
+ eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 5ccc99c04190ea4790ab5a5d62d8cd5ee54474dd..01a2c68bf3b5147e45945fff430a1dad2acdf2fb 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -1069,7 +1069,9 @@ void init_eNB_afterRU(void) {
RC.ru[ru_id]->wakeup_rxtx = wakeup_rxtx;
RC.ru[ru_id]->wakeup_prach_eNB = wakeup_prach_eNB;
+#ifdef Rel14
RC.ru[ru_id]->wakeup_prach_eNB_br = wakeup_prach_eNB_br;
+#endif
RC.ru[ru_id]->eNB_top = eNB_top;
}
}