Commit 69017682 authored by Thomas Schlichter's avatar Thomas Schlichter

make mac_sdus an array instead of a pointer

parent 1e63219b
...@@ -334,7 +334,8 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources, ...@@ -334,7 +334,8 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
int nr_tti_tx){ int nr_tti_tx){
NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id); NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
uint8_t lcid = UL_SCH_LCID_CCCH_MSG3, *mac_sdus, *payload, ra_ResponseWindow; uint8_t mac_sdus[MAX_NR_ULSCH_PAYLOAD_BYTES];
uint8_t lcid = UL_SCH_LCID_CCCH_MSG3, *payload, ra_ResponseWindow;
uint8_t config_index, mu; uint8_t config_index, mu;
int is_nr_prach_slot; int is_nr_prach_slot;
uint16_t size_sdu = 0; uint16_t size_sdu = 0;
...@@ -412,10 +413,9 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources, ...@@ -412,10 +413,9 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
num_sdus = 1; num_sdus = 1;
post_padding = 1; post_padding = 1;
if (IS_SOFTMODEM_NOS1){ if (0){
// initialisation by RRC // initialisation by RRC
// CCCH PDU // CCCH PDU
mac_sdus = &payload[sizeof(NR_MAC_SUBHEADER_SHORT)];
// size_sdu = (uint16_t) mac_rrc_data_req_ue(mod_id, // size_sdu = (uint16_t) mac_rrc_data_req_ue(mod_id,
// CC_id, // CC_id,
// frame, // frame,
...@@ -426,12 +426,10 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources, ...@@ -426,12 +426,10 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
// 0); // 0);
LOG_D(MAC,"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n", mod_id, frame, size_sdu); LOG_D(MAC,"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n", mod_id, frame, size_sdu);
} else { } else {
uint8_t sdus[MAX_NR_ULSCH_PAYLOAD_BYTES];
// fill ulsch_buffer with random data // fill ulsch_buffer with random data
for (int i = 0; i < TBS_bytes; i++){ for (int i = 0; i < TBS_bytes; i++){
sdus[i] = (unsigned char) (lrand48()&0xff); mac_sdus[i] = (unsigned char) (lrand48()&0xff);
} }
mac_sdus = sdus;
//Sending SDUs with size 1 //Sending SDUs with size 1
//Initialize elements of sdu_lcids and sdu_lengths //Initialize elements of sdu_lcids and sdu_lengths
sdu_lcids[0] = lcid; sdu_lcids[0] = lcid;
......
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