Skip to content

O
OpenXG-RAN
Commit 0f7a30de authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

handle 20MHz bandwidth, plus factorizing code

parent 2e8e281a
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 147 deletions
openair2/LAYER2/MAC/eNB_scheduler.c
View file @ 0f7a30de
...@@ -299,57 +299,36 @@ void fapi_dl_cqi_report(int module_id, int rnti, int frame, int subframe, int cq ...@@ -299,57 +299,36 @@ void fapi_dl_cqi_report(int module_id, int rnti, int frame, int subframe, int cq
SchedDlCqiInfoReq(fapi->sched, &params); SchedDlCqiInfoReq(fapi->sched, &params);
} }
static void fapi_convert_dl_1A_5MHz_FDD(struct DlDciListElement_s *dci, DCI_ALLOC_t *a) #define CONVERT_DL_1A_FDD(bandwidth) \
{ static void fapi_convert_dl_1A_ ## bandwidth ## MHz_FDD(struct DlDciListElement_s *dci, DCI_ALLOC_t *a) \
DCI1A_5MHz_FDD_t *d = (DCI1A_5MHz_FDD_t *)a->dci_pdu; { \
DCI1A_ ## bandwidth ## MHz_FDD_t *d = (DCI1A_ ## bandwidth ## MHz_FDD_t *)a->dci_pdu; \
if (dci->nr_of_tbs != 1) { printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); exit(1); } \
if (dci->nr_of_tbs != 1) { printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); exit(1); } \
d->type = 1; /* type = 0 => DCI Format 0, type = 1 => DCI Format 1A */ \
d->vrb_type = dci->vrbFormat == VRB_LOCALIZED ? 0 : d->type = 1; /* type = 0 => DCI Format 0, type = 1 => DCI Format 1A */ \
dci->vrbFormat == VRB_DISTRIBUTED ? 1 : d->vrb_type = dci->vrbFormat == VRB_LOCALIZED ? 0 : \
(printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0); dci->vrbFormat == VRB_DISTRIBUTED ? 1 : \
d->rballoc = dci->rbBitmap; (printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0); \
d->mcs = dci->mcs[0]; /* TODO: take care of transport block index */ d->rballoc = dci->rbBitmap; \
d->harq_pid = dci->harqProcess; d->mcs = dci->mcs[0]; /* TODO: take care of transport block index */ \
d->ndi = dci->ndi[0]; /* TODO: take care of transport block index */ d->harq_pid = dci->harqProcess; \
d->rv = dci->rv[0]; /* TODO: take care of transport block index */ d->ndi = dci->ndi[0]; /* TODO: take care of transport block index */ \
d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.2.1-1 */ d->rv = dci->rv[0]; /* TODO: take care of transport block index */ \
dci->tpc == 0 ? 1 : d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.2.1-1 */ \
dci->tpc == 1 ? 2 : dci->tpc == 0 ? 1 : \
dci->tpc == 3 ? 3 : dci->tpc == 1 ? 2 : \
(printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0); dci->tpc == 3 ? 3 : \
d->padding = 0; (printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0); \
d->padding = 0; \
a->dci_length = sizeof_DCI1A_5MHz_FDD_t; \
a->format = format1A; a->dci_length = sizeof_DCI1A_ ## bandwidth ## MHz_FDD_t; \
a->format = format1A; \
} }
static void fapi_convert_dl_1A_10MHz_FDD(struct DlDciListElement_s *dci, DCI_ALLOC_t *a) CONVERT_DL_1A_FDD(5); /* defines fapi_convert_dl_1A_5MHz_FDD */
{ CONVERT_DL_1A_FDD(10); /* defines fapi_convert_dl_1A_10MHz_FDD */
DCI1A_10MHz_FDD_t *d = (DCI1A_10MHz_FDD_t *)a->dci_pdu; CONVERT_DL_1A_FDD(20); /* defines fapi_convert_dl_1A_20MHz_FDD */
if (dci->nr_of_tbs != 1) { printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); exit(1); }
d->type = 1; /* type = 0 => DCI Format 0, type = 1 => DCI Format 1A */
d->vrb_type = dci->vrbFormat == VRB_LOCALIZED ? 0 :
dci->vrbFormat == VRB_DISTRIBUTED ? 1 :
(printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0);
d->rballoc = dci->rbBitmap;
d->mcs = dci->mcs[0]; /* TODO: take care of transport block index */
d->harq_pid = dci->harqProcess;
d->ndi = dci->ndi[0]; /* TODO: take care of transport block index */
d->rv = dci->rv[0]; /* TODO: take care of transport block index */
d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.2.1-1 */
dci->tpc == 0 ? 1 :
dci->tpc == 1 ? 2 :
dci->tpc == 3 ? 3 :
(printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0);
d->padding = 0;
a->dci_length = sizeof_DCI1A_10MHz_FDD_t;
a->format = format1A;
}
static uint32_t revert(uint32_t x, int len) static uint32_t revert(uint32_t x, int len)
{ {
...@@ -363,55 +342,35 @@ static uint32_t revert(uint32_t x, int len) ...@@ -363,55 +342,35 @@ static uint32_t revert(uint32_t x, int len)
return ret; return ret;
} }
static void fapi_convert_dl_1_5MHz_FDD(struct DlDciListElement_s *dci, DCI_ALLOC_t *a) #define CONVERT_DL_1_FDD(bandwidth) \
{ static void fapi_convert_dl_1_ ## bandwidth ## MHz_FDD(struct DlDciListElement_s *dci, DCI_ALLOC_t *a) \
DCI1_5MHz_FDD_t *d = (DCI1_5MHz_FDD_t *)a->dci_pdu; { \
DCI1_ ## bandwidth ## MHz_FDD_t *d = (DCI1_ ## bandwidth ## MHz_FDD_t *)a->dci_pdu; \
if (dci->nr_of_tbs != 1) { printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); exit(1); } \
if (dci->nr_of_tbs != 1) { printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); exit(1); } \
d->rah = dci->resAlloc == 0 ? 0 : \
dci->resAlloc == 1 ? 1 : d->rah = dci->resAlloc == 0 ? 0 : \
(printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0); dci->resAlloc == 1 ? 1 : \
d->rballoc = revert(dci->rbBitmap, 13); (printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0); \
d->mcs = dci->mcs[0]; /* TODO: take care of transport block index */ d->rballoc = revert(dci->rbBitmap, 13); \
d->harq_pid = dci->harqProcess; d->mcs = dci->mcs[0]; /* TODO: take care of transport block index */ \
d->ndi = dci->ndi[0]; /* TODO: take care of transport block index */ d->harq_pid = dci->harqProcess; \
d->rv = dci->rv[0]; /* TODO: take care of transport block index */ d->ndi = dci->ndi[0]; /* TODO: take care of transport block index */ \
d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.2.1-1 */ d->rv = dci->rv[0]; /* TODO: take care of transport block index */ \
dci->tpc == 0 ? 1 : d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.2.1-1 */ \
dci->tpc == 1 ? 2 : dci->tpc == 0 ? 1 : \
dci->tpc == 3 ? 3 : dci->tpc == 1 ? 2 : \
(printf("%s:%d: error (dci->tpc = %d)\n", __FUNCTION__, __LINE__, dci->tpc), abort(), 0); dci->tpc == 3 ? 3 : \
d->dummy = 0; (printf("%s:%d: error (dci->tpc = %d)\n", __FUNCTION__, __LINE__, dci->tpc), abort(), 0); \
d->dummy = 0; \
a->dci_length = sizeof_DCI1_5MHz_FDD_t; \
a->format = format1; a->dci_length = sizeof_DCI1_ ## bandwidth ## MHz_FDD_t; \
a->format = format1; \
} }
static void fapi_convert_dl_1_10MHz_FDD(struct DlDciListElement_s *dci, DCI_ALLOC_t *a) CONVERT_DL_1_FDD(5); /* defines fapi_convert_dl_1_5MHz_FDD */
{ CONVERT_DL_1_FDD(10); /* defines fapi_convert_dl_1_10MHz_FDD */
DCI1_10MHz_FDD_t *d = (DCI1_10MHz_FDD_t *)a->dci_pdu; CONVERT_DL_1_FDD(20); /* defines fapi_convert_dl_1_20MHz_FDD */
if (dci->nr_of_tbs != 1) { printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); exit(1); }
d->rah = dci->resAlloc == 0 ? 0 :
dci->resAlloc == 1 ? 1 :
(printf("%s:%d: error\n", __FUNCTION__, __LINE__), abort(), 0);
d->rballoc = revert(dci->rbBitmap, 13);
d->mcs = dci->mcs[0]; /* TODO: take care of transport block index */
d->harq_pid = dci->harqProcess;
d->ndi = dci->ndi[0]; /* TODO: take care of transport block index */
d->rv = dci->rv[0]; /* TODO: take care of transport block index */
d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.2.1-1 */
dci->tpc == 0 ? 1 :
dci->tpc == 1 ? 2 :
dci->tpc == 3 ? 3 :
(printf("%s:%d: error (dci->tpc = %d)\n", __FUNCTION__, __LINE__, dci->tpc), abort(), 0);
d->dummy = 0;
a->dci_length = sizeof_DCI1_10MHz_FDD_t;
a->format = format1;
}
static void fapi_convert_dl_dci(int module_id, int CC_id, static void fapi_convert_dl_dci(int module_id, int CC_id,
struct DlDciListElement_s *dci, DCI_ALLOC_t *a) struct DlDciListElement_s *dci, DCI_ALLOC_t *a)
...@@ -437,6 +396,13 @@ static void fapi_convert_dl_dci(int module_id, int CC_id, ...@@ -437,6 +396,13 @@ static void fapi_convert_dl_dci(int module_id, int CC_id,
default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort(); default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort();
} }
break; break;
case 100:
switch (dci->format) {
case ONE_A: fapi_convert_dl_1A_20MHz_FDD(dci, a); break;
case ONE: fapi_convert_dl_1_20MHz_FDD(dci, a); break;
default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort();
}
break;
default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort(); default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort();
} }
a->L = dci->aggrLevel == 1 ? 0 : a->L = dci->aggrLevel == 1 ? 0 :
...@@ -449,57 +415,35 @@ static void fapi_convert_dl_dci(int module_id, int CC_id, ...@@ -449,57 +415,35 @@ static void fapi_convert_dl_dci(int module_id, int CC_id,
a->rnti = dci->rnti; a->rnti = dci->rnti;
} }
static void fapi_convert_ul_5MHz_FDD(module_id_t module_idP, int CC_id, #define CONVERT_UL_FDD(bandwidth) \
struct UlDciListElement_s *dci, DCI_ALLOC_t *a) static void fapi_convert_ul_ ## bandwidth ## MHz_FDD(module_id_t module_idP, int CC_id, \
{ struct UlDciListElement_s *dci, DCI_ALLOC_t *a) \
DCI0_5MHz_FDD_t *d = (DCI0_5MHz_FDD_t *)a->dci_pdu; { \
DCI0_ ## bandwidth ## MHz_FDD_t *d = (DCI0_ ## bandwidth ## MHz_FDD_t *)a->dci_pdu; \
d->type = 0; /* type = 0 => DCI Format 0, type = 1 => DCI Format 1A */ \
d->hopping = dci->hopping; d->type = 0; /* type = 0 => DCI Format 0, type = 1 => DCI Format 1A */ \
d->rballoc = mac_xface->computeRIV(PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_DL, dci->rbStart, dci->rbLen); d->hopping = dci->hopping; \
d->mcs = dci->mcs; d->rballoc = mac_xface->computeRIV(PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_DL, dci->rbStart, dci->rbLen); \
d->ndi = dci->ndi; d->mcs = dci->mcs; \
d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.1.1-2, accumulated case supposed */ d->ndi = dci->ndi; \
dci->tpc == 0 ? 1 : d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.1.1-2, accumulated case supposed */ \
dci->tpc == 1 ? 2 : dci->tpc == 0 ? 1 : \
dci->tpc == 3 ? 3 : dci->tpc == 1 ? 2 : \
(printf("%s:%d: error (tpc = %d)\n", __FUNCTION__, __LINE__, dci->tpc), abort(), 0); dci->tpc == 3 ? 3 : \
d->cshift = dci->n2Dmrs; /* TODO: this may be wrong, (printf("%s:%d: error (tpc = %d)\n", __FUNCTION__, __LINE__, dci->tpc), abort(), 0); \
* see openair1/PHY/LTE_TRANSPORT/dci_tools.c:generate_eNB_ulsch_params_from_dci d->cshift = dci->n2Dmrs; /* TODO: this may be wrong, */ \
* there is a translation between those /* see openair1/PHY/LTE_TRANSPORT/dci_tools.c:generate_eNB_ulsch_params_from_dci */ \
*/ /* there is a translation between those */ \
d->cqi_req = dci->cqiRequest; d->cqi_req = dci->cqiRequest; \
d->padding = 0; d->padding = 0; \
\
a->dci_length = sizeof_DCI0_5MHz_FDD_t; a->dci_length = sizeof_DCI0_ ## bandwidth ## MHz_FDD_t; \
a->format = format0; a->format = format0; \
} }
static void fapi_convert_ul_10MHz_FDD(module_id_t module_idP, int CC_id, CONVERT_UL_FDD(5); /* defines fapi_convert_ul_5MHz_FDD */
struct UlDciListElement_s *dci, DCI_ALLOC_t *a) CONVERT_UL_FDD(10); /* defines fapi_convert_ul_10MHz_FDD */
{ CONVERT_UL_FDD(20); /* defines fapi_convert_ul_20MHz_FDD */
DCI0_10MHz_FDD_t *d = (DCI0_10MHz_FDD_t *)a->dci_pdu;
d->type = 0; /* type = 0 => DCI Format 0, type = 1 => DCI Format 1A */
d->hopping = dci->hopping;
d->rballoc = mac_xface->computeRIV(PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_DL, dci->rbStart, dci->rbLen);
d->mcs = dci->mcs;
d->ndi = dci->ndi;
d->TPC = dci->tpc == -1 ? 0 : /* see 36.213 table 5.1.1.1-2, accumulated case supposed */
dci->tpc == 0 ? 1 :
dci->tpc == 1 ? 2 :
dci->tpc == 3 ? 3 :
(printf("%s:%d: error (tpc = %d)\n", __FUNCTION__, __LINE__, dci->tpc), abort(), 0);
d->cshift = dci->n2Dmrs; /* TODO: this may be wrong,
* see openair1/PHY/LTE_TRANSPORT/dci_tools.c:generate_eNB_ulsch_params_from_dci
* there is a translation between those
*/
d->cqi_req = dci->cqiRequest;
d->padding = 0;
a->dci_length = sizeof_DCI0_10MHz_FDD_t;
a->format = format0;
}
static void fapi_convert_ul_dci(module_id_t module_idP, int CC_id, static void fapi_convert_ul_dci(module_id_t module_idP, int CC_id,
struct UlDciListElement_s *dci, DCI_ALLOC_t *a) struct UlDciListElement_s *dci, DCI_ALLOC_t *a)
...@@ -512,6 +456,7 @@ static void fapi_convert_ul_dci(module_id_t module_idP, int CC_id, ...@@ -512,6 +456,7 @@ static void fapi_convert_ul_dci(module_id_t module_idP, int CC_id,
switch (PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_UL) { switch (PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_UL) {
case 25: fapi_convert_ul_5MHz_FDD(module_idP, CC_id, dci, a); break; case 25: fapi_convert_ul_5MHz_FDD(module_idP, CC_id, dci, a); break;
case 50: fapi_convert_ul_10MHz_FDD(module_idP, CC_id, dci, a); break; case 50: fapi_convert_ul_10MHz_FDD(module_idP, CC_id, dci, a); break;
case 100: fapi_convert_ul_20MHz_FDD(module_idP, CC_id, dci, a); break;
default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort(); default: printf("%s:%d: TODO\n", __FUNCTION__, __LINE__); abort();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment