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

Save TB in MAC, transmit TX_req also on retx

Browse Source
This commit is contained in:
Robert Schmidt
2021-02-07 10:39:39 +01:00
parent 80e23a179e
commit 78da8c9345
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+20 -13
View File
@@ -805,7 +805,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
retInfo->mcs, retInfo->mcs,
retInfo->numDmrsCdmGrpsNoData); retInfo->numDmrsCdmGrpsNoData);
/* we do not have to do anything, since we do not require to get data /* we do not have to do anything, since we do not require to get data
* from RLC, encode MAC CEs, or copy data to FAPI structures */ * from RLC or encode MAC CEs. The TX_req structure is filled below */
LOG_W(MAC, LOG_W(MAC,
"%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d\n", "%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d\n",
frame, frame,
@@ -815,20 +815,16 @@ void nr_schedule_ue_spec(module_id_t module_id,
current_harq_pid, current_harq_pid,
harq->round, harq->round,
harq->ndi); harq->ndi);
AssertFatal(harq->tb_size == TBS,
"UE %d mismatch between scheduled TBS and buffered TB for HARQ PID %d\n",
UE_id,
current_harq_pid);
} else { /* initial transmission */ } else { /* initial transmission */
LOG_D(MAC, "[%s] Initial HARQ transmission in %d.%d\n", __FUNCTION__, frame, slot); LOG_D(MAC, "[%s] Initial HARQ transmission in %d.%d\n", __FUNCTION__, frame, slot);
const int ntx_req = gNB_mac->TX_req[CC_id].Number_of_PDUs;
nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[ntx_req]; harq->tb_size = TBS;
tx_req->PDU_length = TBS; uint8_t *buf = (uint8_t *) harq->tb;
tx_req->PDU_index = pduindex;
tx_req->num_TLV = 1;
tx_req->TLVs[0].length = TBS + 2;
/* pointer to directly generate the PDU into the nFAPI structure */
uint8_t *buf = (uint8_t *) tx_req->TLVs[0].value.direct;
gNB_mac->TX_req[CC_id].Number_of_PDUs++;
gNB_mac->TX_req[CC_id].SFN = frame;
gNB_mac->TX_req[CC_id].Slot = slot;
/* first, write all CEs that might be there */ /* first, write all CEs that might be there */
int written = nr_write_ce_dlsch_pdu(module_id, int written = nr_write_ce_dlsch_pdu(module_id,
@@ -952,9 +948,20 @@ void nr_schedule_ue_spec(module_id_t module_id,
} }
T(T_GNB_MAC_DL_PDU_WITH_DATA, T_INT(module_id), T_INT(CC_id), T_INT(rnti), T(T_GNB_MAC_DL_PDU_WITH_DATA, T_INT(module_id), T_INT(CC_id), T_INT(rnti),
T_INT(frame), T_INT(slot), T_INT(current_harq_pid), T_BUFFER(buf, TBS)); T_INT(frame), T_INT(slot), T_INT(current_harq_pid), T_BUFFER(harq->tb, TBS));
} }
const int ntx_req = gNB_mac->TX_req[CC_id].Number_of_PDUs;
nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[ntx_req];
tx_req->PDU_length = TBS;
tx_req->PDU_index = pduindex;
tx_req->num_TLV = 1;
tx_req->TLVs[0].length = TBS + 2;
memcpy(tx_req->TLVs[0].value.direct, harq->tb, TBS);
gNB_mac->TX_req[CC_id].Number_of_PDUs++;
gNB_mac->TX_req[CC_id].SFN = frame;
gNB_mac->TX_req[CC_id].Slot = slot;
/* mark UE as scheduled */ /* mark UE as scheduled */
sched_ctrl->rbSize = 0; sched_ctrl->rbSize = 0;
} }
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+4
View File
@@ -346,6 +346,10 @@ typedef struct NR_UE_harq {
uint8_t ndi; uint8_t ndi;
uint8_t round; uint8_t round;
uint16_t feedback_slot; uint16_t feedback_slot;
/* Transport block to be sent using this HARQ process */
uint32_t tb[16384];
uint32_t tb_size;
} NR_UE_harq_t; } NR_UE_harq_t;
typedef struct NR_UE_old_sched { typedef struct NR_UE_old_sched {