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

Add configurable UE as param for nr_generate_dlsch_pdu()

Browse Source
This commit is contained in:
Robert Schmidt
2020-10-05 13:14:58 +02:00
parent eb263af39e
commit 2e41782a12
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+2 -6
View File
@@ -58,6 +58,7 @@
//#define SIZE_OF_POINTER sizeof (void *) //#define SIZE_OF_POINTER sizeof (void *)
int nr_generate_dlsch_pdu(module_id_t module_idP, int nr_generate_dlsch_pdu(module_id_t module_idP,
NR_UE_sched_ctrl_t *ue_sched_ctl,
unsigned char *sdus_payload, unsigned char *sdus_payload,
unsigned char *mac_pdu, unsigned char *mac_pdu,
unsigned char num_sdus, unsigned char num_sdus,
@@ -74,12 +75,6 @@ int nr_generate_dlsch_pdu(module_id_t module_idP,
// MAC CEs // MAC CEs
uint8_t mac_header_control_elements[16], *ce_ptr; uint8_t mac_header_control_elements[16], *ce_ptr;
ce_ptr = &mac_header_control_elements[0]; ce_ptr = &mac_header_control_elements[0];
uint16_t UE_id = 0; //TODO need to get as a function parameter or need to invoke api to UE_id using module Id and RNTI
gNB_MAC_INST *gNB_mac = RC.nrmac[module_idP];
NR_UE_info_t *UE_info = &gNB_mac->UE_info;
NR_UE_sched_ctrl_t *ue_sched_ctl = NULL;
//NR_CellGroupConfig_t *config = UE_info->secondaryCellGroup[UE_id];
ue_sched_ctl = &(UE_info->UE_sched_ctrl[UE_id]);
// 1) Compute MAC CE and related subheaders // 1) Compute MAC CE and related subheaders
@@ -768,6 +763,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
const int offset = nr_generate_dlsch_pdu( const int offset = nr_generate_dlsch_pdu(
module_id, module_id,
sched_ctrl,
(unsigned char *)mac_sdus, (unsigned char *)mac_sdus,
(unsigned char *)buf, (unsigned char *)buf,
num_sdus, // num_sdus num_sdus, // num_sdus
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+1
View File
@@ -743,6 +743,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
} }
offset = nr_generate_dlsch_pdu(module_idP, offset = nr_generate_dlsch_pdu(module_idP,
&UE_info->UE_sched_ctrl[UE_id],
(unsigned char *) mac_sdus, (unsigned char *) mac_sdus,
(unsigned char *) gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0], (unsigned char *) gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0],
num_sdus, //num_sdus num_sdus, //num_sdus
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+1
View File
@@ -67,6 +67,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
frame_t frame_rxP, sub_frame_t slot_rxP); frame_t frame_rxP, sub_frame_t slot_rxP);
int nr_generate_dlsch_pdu(module_id_t Mod_idP, int nr_generate_dlsch_pdu(module_id_t Mod_idP,
NR_UE_sched_ctrl_t *ue_sched_ctl,
unsigned char *sdus_payload, unsigned char *sdus_payload,
unsigned char *mac_pdu, unsigned char *mac_pdu,
unsigned char num_sdus, unsigned char num_sdus,