Skip to content

O
OpenXG-RAN
Commit 529b717d authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

RX SLSCH path tested with 1:many (1 RX tested)

parent d498cd43
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 14 deletions
openair2/LAYER2/MAC/ue_procedures.c
View file @ 529b717d
......@@ -867,19 +867,21 @@ void ue_send_sl_sdu(module_id_t module_idP,
for (j = 0; j< MAX_NUM_LCID; j++){
if ((longh->LCID < MAX_NUM_LCID_DATA) && (j < MAX_NUM_LCID_DATA)){
if ((UE_mac_inst[module_idP].sl_info[j].destinationL2Id == sourceL2Id) && (UE_mac_inst[module_idP].sl_info[j].sourceL2Id == destinationL2Id)) {
lcid = UE_mac_inst[module_idP].sl_info[j].LCID;
lcid = longh->LCID; //UE_mac_inst[module_idP].sl_info[j].LCID;
break;
}
}
if ((longh->LCID >= MAX_NUM_LCID_DATA) && (j >= MAX_NUM_LCID_DATA)){
//PC5-S (receive message after transmitting, e.g, security-command...)
if ((UE_mac_inst[module_idP].sl_info[j].sourceL2Id == destinationL2Id) && (UE_mac_inst[module_idP].sl_info[j].destinationL2Id == 0)) {
if (UE_mac_inst[module_idP].sl_info[j].LCID > 0) lcid = UE_mac_inst[module_idP].sl_info[j].LCID;
if (UE_mac_inst[module_idP].sl_info[j].LCID > 0) lcid = longh->LCID;//UE_mac_inst[module_idP].sl_info[j].LCID;
break;
}
}
}
/*
int k = 0;
if (j == MAX_NUM_LCID) {
......@@ -938,7 +940,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
LOG_D(MAC, "SL_RESET_RLC_FLAG_NO\n");
}
LOG_I(MAC,"sending sdu of size %d, lcid %d to RLC\n",rlc_sdu_len,lcid);
LOG_D(MAC,"%d.%d sending sdu of size %d, lcid %d to RLC\n",frameP,subframeP,rlc_sdu_len,lcid);
mac_rlc_data_ind(
module_idP,
......
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @ 529b717d
......@@ -30,7 +30,7 @@
*/
#define PDCP_FIFO_C
#define PDCP_DEBUG 1
//#define PDCP_DEBUG 1
//#define DEBUG_PDCP_FIFO_FLUSH_SDU
extern int otg_enabled;
......@@ -189,7 +189,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP)
#endif /* defined(ENABLE_USE_MME) */
#ifdef PDCP_DEBUG
LOG_D(PDCP, "PDCP->IP TTI %d INST %d: Preparing %d Bytes of data from rab %d to Nas_mesh\n",
LOG_I(PDCP, "PDCP->IP TTI %d INST %d: Preparing %d Bytes of data from rab %d to Nas_mesh\n",
ctxt_pP->frame, ((pdcp_data_ind_header_t *)(sdu_p->data))->inst,
((pdcp_data_ind_header_t *)(sdu_p->data))->data_size, ((pdcp_data_ind_header_t *)(sdu_p->data))->rb_id);
#endif //PDCP_DEBUG
......@@ -250,7 +250,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP)
#endif //PDCP_USE_RT_FIFO
#ifdef PDCP_DEBUG
LOG_D(PDCP, "Frame %d Sent %d Bytes of header to Nas_mesh\n",
LOG_I(PDCP, "Frame %d Sent %d Bytes of header to Nas_mesh\n",
ctxt_pP->frame,
bytes_wrote);
#endif //PDCP_DEBUG
......@@ -307,7 +307,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP)
#endif // PDCP_USE_RT_FIFO
#ifdef PDCP_DEBUG
LOG_D(PDCP, "PDCP->IP Frame %d INST %d: Sent %d Bytes of data from rab %d to higher layers\n",
LOG_I(PDCP, "PDCP->IP Frame %d INST %d: Sent %d Bytes of data from rab %d to higher layers\n",
ctxt_pP->frame,
((pdcp_data_ind_header_t *)(sdu_p->data))->inst,
bytes_wrote,
......@@ -338,6 +338,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP)
}
} else {
LOG_W(PDCP, "2: RADIO->IP SEND SDU CONGESTION!\n");
AssertFatal(1==0,"congestion, aborting\n");
}
} else {
LOG_W(PDCP, "3: RADIO->IP SEND SDU CONGESTION!\n");
......
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
View file @ 529b717d
......@@ -268,7 +268,7 @@ rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind
#if TRACE_RLC_UM_PDU || MESSAGE_CHART_GENERATOR
if (data_indP.data.nb_elements > 0) {
LOG_I(RLC, PROTOCOL_RLC_UM_CTXT_FMT" MAC_DATA_IND %d TBs\n",
LOG_D(RLC, PROTOCOL_RLC_UM_CTXT_FMT" MAC_DATA_IND %d TBs\n",
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,l_rlc_p),
data_indP.data.nb_elements);
......@@ -396,7 +396,7 @@ rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind
sn = pdu_mem_pP->b1 & 0x1F;
}
LOG_I(RLC, "[rlc_um_rx]DEBUG SN %d, rlc_pP->vr_uh %d rlc_pP->vr_ur %d, l_rlc_p->vr_ux %d \n", sn, l_rlc_p->vr_uh, l_rlc_p->vr_ur, l_rlc_p->vr_ux);
LOG_D(RLC, "[rlc_um_rx]DEBUG SN %d, rlc_pP->vr_uh %d rlc_pP->vr_ur %d, l_rlc_p->vr_ux %d \n", sn, l_rlc_p->vr_uh, l_rlc_p->vr_ur, l_rlc_p->vr_ux);
l_rlc_p->vr_ur = sn;
l_rlc_p->vr_uh = sn;
......@@ -749,7 +749,7 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
char message_string[7000];
#endif
LOG_I(RLC, PROTOCOL_RLC_UM_CTXT_FMT" RLC_UM_DATA_REQ size %d Bytes, BO %d , NB SDU %d\n",
LOG_D(RLC, PROTOCOL_RLC_UM_CTXT_FMT" RLC_UM_DATA_REQ size %d Bytes, BO %d , NB SDU %d\n",
PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,rlc_p),
((struct rlc_um_data_req *) (sdu_pP->data))->data_size,
rlc_p->buffer_occupancy,
......@@ -832,7 +832,6 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
LOG_T(RLC, "%s", message_string);
#endif
*/
LOG_I(RLC,"%s",message_string);
# endif
RLC_UM_MUTEX_LOCK(&rlc_p->lock_input_sdus, ctxt_pP, rlc_p);
rlc_p->buffer_occupancy += ((struct rlc_um_tx_sdu_management *) (sdu_pP->data))->sdu_size;
......
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
View file @ 529b717d
......@@ -1007,7 +1007,7 @@ rlc_um_receive_process_dar (
}
LOG_I(RLC, "DEBUG SN %d, rlc_pP->vr_uh %d rlc_pP->vr_ur %d \n", sn, rlc_pP->vr_uh, rlc_pP->vr_ur);
LOG_D(RLC, "DEBUG SN %d, rlc_pP->vr_uh %d rlc_pP->vr_ur %d \n", sn, rlc_pP->vr_uh, rlc_pP->vr_ur);
RLC_UM_MUTEX_LOCK(&rlc_pP->lock_dar_buffer, ctxt_pP, rlc_pP);
in_window = rlc_um_in_window(ctxt_pP, rlc_pP, rlc_pP->vr_uh - rlc_pP->rx_um_window_size, sn, rlc_pP->vr_ur);
......
openair2/LAYER2/RLC/rlc_mac.c
View file @ 529b717d
......@@ -253,12 +253,13 @@ void mac_rlc_data_ind (
#ifdef DEBUG_MAC_INTERFACE
if (num_tbP) {
LOG_I(RLC, PROTOCOL_CTXT_FMT" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, Num_tb %d\n",
LOG_D(RLC, PROTOCOL_CTXT_FMT" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, Num_tb %d tb_size %d\n",
PROTOCOL_CTXT_ARGS(&ctxt),
channel_idP,
RLC_MAX_LC,
NB_RB_MAX,
num_tbP);
num_tbP,
tb_sizeP);
}
#endif // DEBUG_MAC_INTERFACE
......
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