maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set rnti at gnb and remove uci crc length at ue

Browse Source
This commit is contained in:
Hongzhi Wang
2020-09-10 12:51:58 +02:00
parent 54ba635cf7
commit 99d220c3e1
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+10 -10
View File
@@ -506,15 +506,15 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
/* TS 38.212 6.3.1.2 Code block segmentation and CRC attachment */ /* TS 38.212 6.3.1.2 Code block segmentation and CRC attachment */
/* crc attachment can be done depending of payload size */ /* crc attachment can be done depending of payload size */
if (N_UCI < 11) { // if (N_UCI < 11) {
O_CRC = 0; /* no additional crc bits */ // O_CRC = 0; /* no additional crc bits */
} // }
else if ((N_UCI >= 12) && (N_UCI <= 19)) { // else if ((N_UCI >= 12) && (N_UCI <= 19)) {
O_CRC = 6; /* number of additional crc bits */ // O_CRC = 6; /* number of additional crc bits */
} // }
else if (N_UCI >= 20) { // else if (N_UCI >= 20) {
O_CRC = 11; /* number of additional crc bits */ // O_CRC = 11; /* number of additional crc bits */
} // }
N_UCI = N_UCI + O_CRC; N_UCI = N_UCI + O_CRC;
@@ -1306,7 +1306,7 @@ int get_csi_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint32_t *csi_payload)
float rsrp_db[7]; float rsrp_db[7];
int nElem = 98; int nElem = 98;
int rsrp_offset = 17; int rsrp_offset = 17;
int csi_status = 12; int csi_status = 11;
rsrp_db[0] = get_nr_RSRP(0,0,0); rsrp_db[0] = get_nr_RSRP(0,0,0);
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+1
View File
@@ -649,6 +649,7 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
if (pucchres->pucch_ResourceId == *resource_id) { if (pucchres->pucch_ResourceId == *resource_id) {
res_found = 1; res_found = 1;
pucch_pdu->prb_start = pucchres->startingPRB; pucch_pdu->prb_start = pucchres->startingPRB;
pucch_pdu->rnti = 0x1234; // temporarily set same value as oai ue
// FIXME why there is only one frequency hopping flag // FIXME why there is only one frequency hopping flag
// what about inter slot frequency hopping? // what about inter slot frequency hopping?
pucch_pdu->freq_hop_flag = pucchres->intraSlotFrequencyHopping!= NULL ? 1 : 0; pucch_pdu->freq_hop_flag = pucchres->intraSlotFrequencyHopping!= NULL ? 1 : 0;