Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常顺宇
OpenXG-RAN
Commits
80cd6940
Commit
80cd6940
authored
5 years ago
by
laurent
Committed by
Florian Kaltenberger
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modifications
parent
ee6b18d3
Changes
46
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
46 changed files
with
187 additions
and
348 deletions
+187
-348
common/utils/LOG/log.c
common/utils/LOG/log.c
+2
-1
common/utils/hashtable/hashtable.c
common/utils/hashtable/hashtable.c
+0
-74
common/utils/hashtable/hashtable.h
common/utils/hashtable/hashtable.h
+0
-3
executables/nr-ue.c
executables/nr-ue.c
+1
-1
openair1/PHY/NR_TRANSPORT/nr_dlsch.h
openair1/PHY/NR_TRANSPORT/nr_dlsch.h
+1
-0
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+2
-1
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+3
-3
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+1
-1
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/fapi_nr_l1.c
+1
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+1
-1
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+3
-3
openair2/COMMON/gtpv1_u_messages_types.h
openair2/COMMON/gtpv1_u_messages_types.h
+2
-2
openair2/COMMON/pdcp_messages_types.h
openair2/COMMON/pdcp_messages_types.h
+1
-1
openair2/COMMON/platform_types.h
openair2/COMMON/platform_types.h
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+5
-5
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/mac_defs.h
+2
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+8
-4
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+28
-50
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
+1
-1
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+25
-93
openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c
+1
-1
openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c
+5
-5
openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
+1
-1
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
+5
-5
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h
+2
-2
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
+1
-1
openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm.h
openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm.h
+1
-1
openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.c
openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.c
+2
-2
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
+3
-3
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
+2
-2
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
+10
-10
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
+1
-1
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+9
-9
openair2/LAYER2/RLC/rlc.h
openair2/LAYER2/RLC/rlc.h
+1
-1
openair2/LAYER2/RLC/rlc_rrc.c
openair2/LAYER2/RLC/rlc_rrc.c
+23
-23
openair2/NETWORK_DRIVER/MESH/common.c
openair2/NETWORK_DRIVER/MESH/common.c
+2
-2
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/L2_interface.c
+5
-5
openair2/RRC/LTE/L2_interface_common.c
openair2/RRC/LTE/L2_interface_common.c
+2
-2
openair2/RRC/LTE/L2_interface_ue.c
openair2/RRC/LTE/L2_interface_ue.c
+10
-10
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_UE.c
+2
-2
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+6
-6
openair2/RRC/LTE/rrc_eNB_GTPV1U.c
openair2/RRC/LTE/rrc_eNB_GTPV1U.c
+1
-1
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/L2_nr_interface.c
+1
-1
openair2/UTIL/FIFO/pad_list.c
openair2/UTIL/FIFO/pad_list.c
+1
-1
openair2/UTIL/MEM/mem_block.h
openair2/UTIL/MEM/mem_block.h
+0
-2
openair3/GTPV1-U/gtpv1u_eNB.c
openair3/GTPV1-U/gtpv1u_eNB.c
+1
-1
No files found.
common/utils/LOG/log.c
View file @
80cd6940
...
...
@@ -324,7 +324,8 @@ void log_getconfig(log_t *g_log)
config_get
(
logparams_debug
,(
sizeof
(
log_maskmap
)
/
sizeof
(
mapping
))
-
1
,
CONFIG_STRING_LOG_PREFIX
);
config_get
(
logparams_dump
,(
sizeof
(
log_maskmap
)
/
sizeof
(
mapping
))
-
1
,
CONFIG_STRING_LOG_PREFIX
);
config_check_unknown_cmdlineopt
(
CONFIG_STRING_LOG_PREFIX
);
if
(
config_check_unknown_cmdlineopt
(
CONFIG_STRING_LOG_PREFIX
)
>
0
)
exit
(
1
);;
/* set the debug mask according to the debug parameters values */
for
(
int
i
=
0
;
log_maskmap
[
i
].
name
!=
NULL
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
common/utils/hashtable/hashtable.c
View file @
80cd6940
...
...
@@ -162,34 +162,6 @@ hashtable_rc_t hashtable_is_key_exists (const hash_table_t *const hashtblP, cons
return
HASH_TABLE_KEY_NOT_EXISTS
;
}
//-------------------------------------------------------------------------------------------------------------------------------
hashtable_rc_t
hashtable_apply_funct_on_elements
(
hash_table_t
*
const
hashtblP
,
void
functP
(
hash_key_t
keyP
,
void
*
dataP
,
void
*
parameterP
),
void
*
parameterP
)
//-------------------------------------------------------------------------------------------------------------------------------
{
hash_node_t
*
node
=
NULL
;
unsigned
int
i
=
0
;
unsigned
int
num_elements
=
0
;
if
(
hashtblP
==
NULL
)
{
return
HASH_TABLE_BAD_PARAMETER_HASHTABLE
;
}
while
((
num_elements
<
hashtblP
->
num_elements
)
&&
(
i
<
hashtblP
->
size
))
{
if
(
hashtblP
->
nodes
[
i
]
!=
NULL
)
{
node
=
hashtblP
->
nodes
[
i
];
while
(
node
)
{
num_elements
+=
1
;
functP
(
node
->
key
,
node
->
data
,
parameterP
);
node
=
node
->
next
;
}
}
i
+=
1
;
}
return
HASH_TABLE_OK
;
}
//-------------------------------------------------------------------------------------------------------------------------------
hashtable_rc_t
hashtable_dump_content
(
const
hash_table_t
*
const
hashtblP
,
char
*
const
buffer_pP
,
int
*
const
remaining_bytes_in_buffer_pP
)
//-------------------------------------------------------------------------------------------------------------------------------
{
...
...
@@ -266,7 +238,6 @@ hashtable_rc_t hashtable_insert(hash_table_t *const hashtblP, const hash_key_t k
}
hashtblP
->
nodes
[
hash
]
=
node
;
hashtblP
->
num_elements
+=
1
;
return
HASH_TABLE_OK
;
}
//-------------------------------------------------------------------------------------------------------------------------------
...
...
@@ -295,7 +266,6 @@ hashtable_rc_t hashtable_remove(hash_table_t *const hashtblP, const hash_key_t k
}
free
(
node
);
hashtblP
->
num_elements
-=
1
;
return
HASH_TABLE_OK
;
}
...
...
@@ -335,47 +305,3 @@ hashtable_rc_t hashtable_get(const hash_table_t *const hashtblP, const hash_key_
*
dataP
=
NULL
;
return
HASH_TABLE_KEY_NOT_EXISTS
;
}
//-------------------------------------------------------------------------------------------------------------------------------
/*
* Resizing
* The number of elements in a hash table is not always known when creating the table.
* If the number of elements grows too large, it will seriously reduce the performance of most hash table operations.
* If the number of elements are reduced, the hash table will waste memory. That is why we provide a function for resizing the table.
* Resizing a hash table is not as easy as a realloc(). All hash values must be recalculated and each element must be inserted into its new position.
* We create a temporary hash_table_t object (newtbl) to be used while building the new hashes.
* This allows us to reuse hashtable_insert() and hashtable_remove(), when moving the elements to the new table.
* After that, we can just free the old table and copy the elements from newtbl to hashtbl.
*/
hashtable_rc_t
hashtable_resize
(
hash_table_t
*
const
hashtblP
,
const
hash_size_t
sizeP
)
{
hash_table_t
newtbl
;
hash_size_t
n
;
hash_node_t
*
node
,
*
next
;
if
(
hashtblP
==
NULL
)
{
return
HASH_TABLE_BAD_PARAMETER_HASHTABLE
;
}
newtbl
.
size
=
sizeP
;
newtbl
.
hashfunc
=
hashtblP
->
hashfunc
;
newtbl
.
num_elements
=
0
;
if
(
!
(
newtbl
.
nodes
=
calloc
(
sizeP
,
sizeof
(
hash_node_t
*
))))
return
-
1
;
for
(
n
=
0
;
n
<
hashtblP
->
size
;
++
n
)
{
for
(
node
=
hashtblP
->
nodes
[
n
];
node
;
node
=
next
)
{
next
=
node
->
next
;
hashtable_insert
(
&
newtbl
,
node
->
key
,
node
->
data
);
// Lionel GAUTHIER: BAD CODE TO BE REWRITTEN
hashtable_remove
(
hashtblP
,
node
->
key
);
}
}
free
(
hashtblP
->
nodes
);
hashtblP
->
size
=
newtbl
.
size
;
hashtblP
->
nodes
=
newtbl
.
nodes
;
return
HASH_TABLE_OK
;
}
This diff is collapsed.
Click to expand it.
common/utils/hashtable/hashtable.h
View file @
80cd6940
...
...
@@ -49,7 +49,6 @@ typedef struct hash_node_s {
typedef
struct
hash_table_s
{
hash_size_t
size
;
hash_size_t
num_elements
;
struct
hash_node_s
**
nodes
;
hash_size_t
(
*
hashfunc
)(
const
hash_key_t
);
void
(
*
freefunc
)(
void
*
);
...
...
@@ -60,12 +59,10 @@ void hash_free_int_func(void *memoryP);
hash_table_t
*
hashtable_create
(
const
hash_size_t
size
,
hash_size_t
(
*
hashfunc
)(
const
hash_key_t
),
void
(
*
freefunc
)(
void
*
));
hashtable_rc_t
hashtable_destroy
(
hash_table_t
**
hashtbl
);
hashtable_rc_t
hashtable_is_key_exists
(
const
hash_table_t
*
const
hashtbl
,
const
uint64_t
key
);
hashtable_rc_t
hashtable_apply_funct_on_elements
(
hash_table_t
*
const
hashtblP
,
void
funct
(
hash_key_t
keyP
,
void
*
dataP
,
void
*
parameterP
),
void
*
parameterP
);
hashtable_rc_t
hashtable_dump_content
(
const
hash_table_t
*
const
hashtblP
,
char
*
const
buffer_pP
,
int
*
const
remaining_bytes_in_buffer_pP
);
hashtable_rc_t
hashtable_insert
(
hash_table_t
*
const
hashtbl
,
const
hash_key_t
key
,
void
*
data
);
hashtable_rc_t
hashtable_remove
(
hash_table_t
*
const
hashtbl
,
const
hash_key_t
key
);
hashtable_rc_t
hashtable_get
(
const
hash_table_t
*
const
hashtbl
,
const
hash_key_t
key
,
void
**
dataP
);
hashtable_rc_t
hashtable_resize
(
hash_table_t
*
const
hashtbl
,
const
hash_size_t
size
);
...
...
This diff is collapsed.
Click to expand it.
executables/nr-ue.c
View file @
80cd6940
...
...
@@ -419,7 +419,7 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
UE
->
Mod_id
,
ENB_FLAG_NO
,
0x1234
,
proc
->
frame_rx
,
proc
->
nr_tti_rx
,
0
);
//
pdcp_run(&ctxt);
pdcp_run
(
&
ctxt
);
pdcp_fifo_flush_sdus
(
&
ctxt
);
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_dlsch.h
View file @
80cd6940
...
...
@@ -87,6 +87,7 @@ void clean_gNB_dlsch(NR_gNB_DLSCH_t *dlsch);
void
clean_gNB_ulsch
(
NR_gNB_ULSCH_t
*
ulsch
);
int16_t
find_nr_dlsch
(
uint16_t
rnti
,
PHY_VARS_gNB
*
gNB
,
find_type_t
type
);
int16_t
find_nr_ulsch
(
uint16_t
rnti
,
PHY_VARS_gNB
*
gNB
,
find_type_t
type
);
int
nr_dlsch_encoding
(
unsigned
char
*
a
,
int
frame
,
uint8_t
slot
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @
80cd6940
...
...
@@ -311,7 +311,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
int16_t
z
[
68
*
384
];
int8_t
l
[
68
*
384
];
uint8_t
kc
;
uint8_t
kc
=
255
;
uint8_t
Ilbrm
=
0
;
uint32_t
Tbslbrm
=
950984
;
double
Coderate
=
0
.
0
;
...
...
@@ -568,6 +568,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
pv
[
i
]
=
_mm_loadu_si128
((
__m128i
*
)(
&
harq_process
->
d
[
r
][
8
*
j
]));
}
AssertFatal
(
kc
!=
255
,
""
);
for
(
i
=
Kr_bytes
,
j
=
K_bytes_F
-
((
2
*
p_decParams
->
Z
)
>>
3
);
i
<
((
kc
*
p_decParams
->
Z
)
>>
3
);
i
++
,
j
++
)
{
pv
[
i
]
=
_mm_loadu_si128
((
__m128i
*
)(
&
harq_process
->
d
[
r
][
8
*
j
]));
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
View file @
80cd6940
...
...
@@ -205,10 +205,10 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
unsigned
int
pilot_cnt
;
int16_t
ch
[
2
],
*
pil
,
*
rxF
,
*
dl_ch
,
*
fl
,
*
fm
,
*
fr
;
int
ch_offset
,
symbol_offset
;
int
slot_pbch
;
fapi_nr_pbch_config_t
*
pbch_config
=
&
ue
->
nrUE_config
.
pbch_config
;
//
int slot_pbch;
//
fapi_nr_pbch_config_t *pbch_config = &ue->nrUE_config.pbch_config;
// initialized to 5ms in nr_init_ue for scenarios where UE is not configured (otherwise acquired by cell configuration from gNB or LTE)
uint8_t
ssb_periodicity
=
10
;
// ue->ssb_periodicity;
//
uint8_t ssb_periodicity = 10;// ue->ssb_periodicity;
//uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
View file @
80cd6940
...
...
@@ -124,7 +124,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
ulsch_ue
->
length_dmrs
=
length_dmrs
;
ulsch_ue
->
rnti
=
n_rnti
;
ulsch_ue
->
Nid_cell
=
Nid_cell
;
ulsch_ue
->
nb_re_dmrs
=
UE
->
dmrs_UplinkConfig
.
pusch_maxLength
*
(
UE
->
dmrs_UplinkConfig
.
pusch_dmrs_type
==
pusch_dmrs_type1
)
?
6
:
4
;
ulsch_ue
->
nb_re_dmrs
=
UE
->
dmrs_UplinkConfig
.
pusch_maxLength
*
(
UE
->
dmrs_UplinkConfig
.
pusch_dmrs_type
==
pusch_dmrs_type1
?
6
:
4
)
;
N_RE_prime
=
NR_NB_SC_PER_RB
*
harq_process_ul_ue
->
number_of_symbols
-
ulsch_ue
->
nb_re_dmrs
-
N_PRB_oh
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR/fapi_nr_l1.c
View file @
80cd6940
...
...
@@ -139,7 +139,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
gNB
=
RC
.
gNB
[
Mod_id
][
CC_id
];
uint8_t
number_dl_pdu
=
DL_req
->
dl_config_request_body
.
number_pdu
;
uint8_t
number_ul_pdu
=
UL_tti_req
->
n_pdus
;
//
uint8_t number_ul_pdu = UL_tti_req->n_pdus;
nfapi_nr_dl_config_request_pdu_t
*
dl_config_pdu
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
80cd6940
...
...
@@ -86,7 +86,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind( const module_id_t module_idP,
const
tb_size_t
tb_sizeP
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
)
{
mac_rlc_status_resp_t
mac_rlc_status_resp
;
return
mac_rlc_status_resp
;}
{
mac_rlc_status_resp_t
mac_rlc_status_resp
=
{
0
}
;
return
mac_rlc_status_resp
;}
tbs_size_t
mac_rlc_data_req
(
const
module_id_t
module_idP
,
const
rnti_t
rntiP
,
const
eNB_index_t
eNB_index
,
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
80cd6940
...
...
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
uint16_t
N_RB_DL
=
106
,
N_RB_UL
=
106
,
mu
=
1
;
//unsigned char frame_type = 0;
int
number_of_frames
=
1
;
int
frame_length_complex_samples
,
frame_length_complex_samples_no_prefix
;
int
frame_length_complex_samples
;
NR_DL_FRAME_PARMS
*
frame_parms
;
int
loglvl
=
OAILOG_WARNING
;
uint64_t
SSB_positions
=
0x01
;
...
...
@@ -409,7 +409,7 @@ int main(int argc, char **argv)
//init_eNB_afterRU();
frame_length_complex_samples
=
frame_parms
->
samples_per_subframe
;
frame_length_complex_samples_no_prefix
=
frame_parms
->
samples_per_subframe_wCP
;
//
frame_length_complex_samples_no_prefix = frame_parms->samples_per_subframe_wCP;
//configure UE
UE
=
malloc
(
sizeof
(
PHY_VARS_NR_UE
));
...
...
@@ -443,7 +443,7 @@ int main(int argc, char **argv)
unsigned
char
harq_pid
=
0
;
unsigned
int
TBS
;
unsigned
int
available_bits
;
uint8_t
nb_re_dmrs
=
UE
->
dmrs_UplinkConfig
.
pusch_maxLength
*
(
UE
->
dmrs_UplinkConfig
.
pusch_dmrs_type
==
pusch_dmrs_type1
)
?
6
:
4
;
uint8_t
nb_re_dmrs
=
UE
->
dmrs_UplinkConfig
.
pusch_maxLength
*
(
UE
->
dmrs_UplinkConfig
.
pusch_dmrs_type
==
pusch_dmrs_type1
?
6
:
4
)
;
uint8_t
length_dmrs
=
1
;
unsigned
char
mod_order
;
uint16_t
code_rate
;
...
...
This diff is collapsed.
Click to expand it.
openair2/COMMON/gtpv1_u_messages_types.h
View file @
80cd6940
...
...
@@ -133,7 +133,7 @@ typedef struct gtpv1u_enb_data_forwarding_req_s {
typedef
struct
gtpv1u_enb_data_forwarding_ind_s
{
uint32_t
frame
;
uint8_t
enb_flag
;
uint32
_t
rb_id
;
rb_id
_t
rb_id
;
uint32_t
muip
;
uint32_t
confirmp
;
uint32_t
sdu_size
;
...
...
@@ -155,7 +155,7 @@ typedef struct gtpv1u_enb_end_marker_req_s {
typedef
struct
gtpv1u_enb_end_marker_ind_s
{
uint32_t
frame
;
uint8_t
enb_flag
;
uint32
_t
rb_id
;
rb_id
_t
rb_id
;
uint32_t
muip
;
uint32_t
confirmp
;
uint32_t
sdu_size
;
...
...
This diff is collapsed.
Click to expand it.
openair2/COMMON/pdcp_messages_types.h
View file @
80cd6940
...
...
@@ -40,7 +40,7 @@
typedef
struct
RrcDcchDataReq_s
{
uint32_t
frame
;
uint8_t
enb_flag
;
uint32
_t
rb_id
;
rb_id
_t
rb_id
;
uint32_t
muip
;
uint32_t
confirmp
;
uint32_t
sdu_size
;
...
...
This diff is collapsed.
Click to expand it.
openair2/COMMON/platform_types.h
View file @
80cd6940
...
...
@@ -71,8 +71,8 @@ typedef uint8_t slice_id_t;
typedef
uint8_t
eNB_index_t
;
typedef
uint16_t
ue_id_t
;
typedef
int16_t
smodule_id_t
;
typedef
uint16_t
rb_id_t
;
typedef
uint16_t
srb_id_t
;
typedef
long
rb_id_t
;
typedef
long
srb_id_t
;
typedef
boolean_t
MBMS_flag_t
;
#define MBMS_FLAG_NO FALSE
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
80cd6940
...
...
@@ -573,8 +573,8 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
uint8_t
slice_allocation
[
MAX_NUM_CCs
][
N_RBG_MAX
];
int
UE_id
,
i
;
uint16_t
j
,
c
;
uint16_t
nb_rbs_required
[
MAX_NUM_CCs
][
NUMBER_OF_UE_MAX
];
uint16_t
nb_rbs_required_remaining
[
MAX_NUM_CCs
][
NUMBER_OF_UE_MAX
];
uint16_t
nb_rbs_required
[
MAX_NUM_CCs
][
MAX_MOBILES_PER_ENB
];
uint16_t
nb_rbs_required_remaining
[
MAX_NUM_CCs
][
MAX_MOBILES_PER_ENB
];
// uint16_t nb_rbs_required_remaining_1[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
uint16_t
average_rbs_per_user
[
MAX_NUM_CCs
]
=
{
0
};
rnti_t
rnti
;
...
...
@@ -617,7 +617,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
frameP
,
subframeP
,
min_rb_unit
,
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required
,
(
uint16_t
(
*
)[
MAX_MOBILES_PER_ENB
])
nb_rbs_required
,
rballoc_sub
,
MIMO_mode_indicator
,
mbsfn_flag
);
...
...
@@ -701,8 +701,8 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
CC_id
,
N_RBG
[
CC_id
],
min_rb_unit
[
CC_id
],
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required
,
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required_remaining
,
(
uint16_t
(
*
)[
MAX_MOBILES_PER_ENB
])
nb_rbs_required
,
(
uint16_t
(
*
)[
MAX_MOBILES_PER_ENB
])
nb_rbs_required_remaining
,
rballoc_sub
,
slice_allocation
,
MIMO_mode_indicator
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/mac_defs.h
View file @
80cd6940
...
...
@@ -63,7 +63,8 @@
typedef
enum
{
SFN_C_MOD_2_EQ_0
,
SFN_C_MOD_2_EQ_1
SFN_C_MOD_2_EQ_1
,
SFN_C_IMPOSSIBLE
}
SFN_C_TYPE
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
80cd6940
...
...
@@ -441,10 +441,10 @@ int8_t nr_ue_decode_mib(
float
big_o
;
float
big_m
;
uint32_t
temp
;
SFN_C_TYPE
sfn_c
;
// only valid for mux=1
uint32_t
n_c
;
uint32_t
number_of_search_space_per_slot
;
uint32_t
first_symbol_index
;
SFN_C_TYPE
sfn_c
=
SFN_C_IMPOSSIBLE
;
// only valid for mux=1
uint32_t
n_c
=
UINT_MAX
;
uint32_t
number_of_search_space_per_slot
=
UINT_MAX
;
uint32_t
first_symbol_index
=
UINT_MAX
;
uint32_t
search_space_duration
;
// element of search space
uint32_t
coreset_duration
;
// element of coreset
...
...
@@ -582,6 +582,7 @@ int8_t nr_ue_decode_mib(
search_space_duration
=
1
;
}
AssertFatal
(
number_of_search_space_per_slot
!=
UINT_MAX
,
""
);
coreset_duration
=
num_symbols
*
number_of_search_space_per_slot
;
mac
->
type0_pdcch_dci_config
.
number_of_candidates
[
0
]
=
table_38213_10_1_1_c2
[
0
];
...
...
@@ -591,8 +592,11 @@ int8_t nr_ue_decode_mib(
mac
->
type0_pdcch_dci_config
.
number_of_candidates
[
4
]
=
table_38213_10_1_1_c2
[
4
];
// CCE aggregation level = 16
mac
->
type0_pdcch_dci_config
.
duration
=
search_space_duration
;
mac
->
type0_pdcch_dci_config
.
coreset
.
duration
=
coreset_duration
;
// coreset
AssertFatal
(
first_symbol_index
!=
UINT_MAX
,
""
);
mac
->
type0_pdcch_dci_config
.
monitoring_symbols_within_slot
=
(
0x3fff
<<
first_symbol_index
)
&
(
0x3fff
>>
(
14
-
coreset_duration
-
first_symbol_index
))
&
0x3fff
;
AssertFatal
(
sfn_c
!=
SFN_C_IMPOSSIBLE
,
""
);
AssertFatal
(
n_c
!=
UINT_MAX
,
""
);
mac
->
type0_pdcch_ss_sfn_c
=
sfn_c
;
mac
->
type0_pdcch_ss_n_c
=
n_c
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
80cd6940
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
View file @
80cd6940
...
...
@@ -87,7 +87,7 @@ extern pthread_mutex_t pdcp_mutex;
extern
pthread_cond_t
pdcp_cond
;
extern
int
pdcp_instance_cnt
;
#define PROTOCOL_PDCP_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
u
] "
#define PROTOCOL_PDCP_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
ld
] "
#define PROTOCOL_PDCP_CTXT_ARGS(CTXT_Pp, pDCP_Pp) PROTOCOL_CTXT_ARGS(CTXT_Pp),\
(pDCP_Pp->is_srb) ? "SRB" : "DRB",\
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
80cd6940
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PDCP_v10.1.0/pdcp_netlink.c
View file @
80cd6940
...
...
@@ -221,7 +221,7 @@ void *pdcp_netlink_thread_fct(void *arg)
pdcp_thread_read_state
=
1
;
memcpy
((
void
*
)
&
new_data_p
->
pdcp_read_header
,
(
void
*
)
NLMSG_DATA
(
nas_nlh_rx
),
sizeof
(
pdcp_data_req_header_t
));
LOG_I
(
PDCP
,
"[NETLINK_THREAD] RX pdcp_data_req_header_t inst %u, "
"rb_id %
u
data_size %d
\n
"
,
"rb_id %
ld
data_size %d
\n
"
,
new_data_p
->
pdcp_read_header
.
inst
,
new_data_p
->
pdcp_read_header
.
rb_id
,
new_data_p
->
pdcp_read_header
.
data_size
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PDCP_v10.1.0/pdcp_security.c
View file @
80cd6940
...
...
@@ -128,7 +128,7 @@ pdcp_apply_security(
/* SRBs */
uint8_t
*
mac_i
;
LOG_D
(
PDCP
,
"[OSA][RB %d] %s Applying control-plane security %d
\n
"
,
LOG_D
(
PDCP
,
"[OSA][RB %
l
d] %s Applying control-plane security %d
\n
"
,
rb_id
,
(
pdcp_pP
->
is_ue
!=
0
)
?
"UE -> eNB"
:
"eNB -> UE"
,
pdcp_pP
->
integrityProtAlgorithm
);
encrypt_params
.
message
=
pdcp_pdu_buffer
;
...
...
@@ -145,7 +145,7 @@ pdcp_apply_security(
encrypt_params
.
key
=
pdcp_pP
->
kRRCenc
;
// + 128 // bit key
}
else
{
LOG_D
(
PDCP
,
"[OSA][RB %d] %s Applying user-plane security
\n
"
,
LOG_D
(
PDCP
,
"[OSA][RB %
l
d] %s Applying user-plane security
\n
"
,
rb_id
,
(
pdcp_pP
->
is_ue
!=
0
)
?
"UE -> eNB"
:
"eNB -> UE"
);
encrypt_params
.
key
=
pdcp_pP
->
kUPenc
;
// + 128;
...
...
@@ -200,11 +200,11 @@ pdcp_validate_security(
decrypt_params
.
key_length
=
16
;
if
(
srb_flagP
)
{
LOG_D
(
PDCP
,
"[OSA][RB %d] %s Validating control-plane security
\n
"
,
LOG_D
(
PDCP
,
"[OSA][RB %
l
d] %s Validating control-plane security
\n
"
,
rb_id
,
(
pdcp_pP
->
is_ue
!=
0
)
?
"eNB -> UE"
:
"UE -> eNB"
);
decrypt_params
.
key
=
pdcp_pP
->
kRRCenc
;
// + 128;
}
else
{
LOG_D
(
PDCP
,
"[OSA][RB %d] %s Validating user-plane security
\n
"
,
LOG_D
(
PDCP
,
"[OSA][RB %
l
d] %s Validating user-plane security
\n
"
,
rb_id
,
(
pdcp_pP
->
is_ue
!=
0
)
?
"eNB -> UE"
:
"UE -> eNB"
);
decrypt_params
.
key
=
pdcp_pP
->
kUPenc
;
// + 128;
}
...
...
@@ -228,7 +228,7 @@ pdcp_validate_security(
" Security: failed MAC-I Algo %X UE %"
PRIx16
" "
,
pdcp_pP
->
integrityProtAlgorithm
,
ctxt_pP
->
rnti
);
LOG_E
(
PDCP
,
"[OSA][RB %d] %s failed to validate MAC-I (key %llx) of incoming PDU
\n
"
,
LOG_E
(
PDCP
,
"[OSA][RB %
l
d] %s failed to validate MAC-I (key %llx) of incoming PDU
\n
"
,
rb_id
,
(
pdcp_pP
->
is_ue
!=
0
)
?
"UE"
:
"eNB"
,((
long
long
unsigned
int
*
)
decrypt_params
.
key
)[
0
]);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_VALIDATE_SECURITY
,
VCD_FUNCTION_OUT
);
return
-
1
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
View file @
80cd6940
...
...
@@ -543,7 +543,7 @@ int proto_agent_pdcp_data_ind_process(mod_id_t mod_id, const void *params, Proto
// if (xid == 1)
// pdcp_data_ind_wifi((const protocol_ctxt_t*) ctxt_pP, (const srb_flag_t) srb_flagP, (const MBMS_flag_t) flag_MBMS, (const rb_id_t) rb_idP, pdcp_pdu_size, pdcp_pdu_p);
// else if (xid == 0) // FIXME: USE a preprocessed definition
LOG_D
(
PROTO_AGENT
,
"[inst %d] Received PDCP PDU with size %d for UE RNTI %x RB %d, Calling pdcp_data_ind
\n
"
,
ctxt_pP
.
instance
,
pdcp_pdu_size
,
ctxt_pP
.
rnti
,
rb_idP
);
LOG_D
(
PROTO_AGENT
,
"[inst %d] Received PDCP PDU with size %d for UE RNTI %x RB %
l
d, Calling pdcp_data_ind
\n
"
,
ctxt_pP
.
instance
,
pdcp_pdu_size
,
ctxt_pP
.
rnti
,
rb_idP
);
result
=
pdcp_data_ind
(
&
ctxt_pP
,
srb_flagP
,
flag_MBMS
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
View file @
80cd6940
...
...
@@ -672,7 +672,7 @@ rlc_am_mac_data_request (
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
=
0
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU size : %u
\n
"
,
tb_size_in_bytes
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Header size : %u
\n
"
,
pdu_info
.
header_size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Payload size: %u
\n
"
,
pdu_info
.
payload_size
);
...
...
@@ -771,7 +771,7 @@ rlc_am_mac_data_request (
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
=
0
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU size : %u
\n
"
,
tb_size_in_bytes
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU type : RLC AM DATA REQ: STATUS PDU
\n\n
"
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Header :
\n
"
);
...
...
@@ -874,7 +874,7 @@ rlc_am_mac_data_indication (
}
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU size : %u
\n
"
,
tb_size_in_bytes
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Header size : %u
\n
"
,
pdu_info
.
header_size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Payload size: %u
\n
"
,
pdu_info
.
payload_size
);
...
...
@@ -971,7 +971,7 @@ rlc_am_mac_data_indication (
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
=
0
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU size : %u
\n
"
,
((
struct
mac_tb_ind
*
)
(
tb_p
->
data
))
->
size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU type : RLC AM DATA IND: STATUS PDU
\n\n
"
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Header :
\n
"
);
...
...
@@ -1039,7 +1039,7 @@ rlc_am_data_req (
mui
);
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"SDU size : %u
\n
"
,
data_size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"MUI : %u
\n
"
,
mui
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"CONF : %u
\n
"
,
((
struct
rlc_am_data_req
*
)
(
sdu_pP
->
data
))
->
conf
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h
View file @
80cd6940
...
...
@@ -60,12 +60,12 @@
//# include "rlc_am_test.h"
#define PROTOCOL_RLC_AM_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
u
]"
#define PROTOCOL_RLC_AM_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
ld
]"
#define PROTOCOL_RLC_AM_CTXT_ARGS(CTXT_Pp, rLC_Pp) PROTOCOL_CTXT_ARGS(CTXT_Pp),\
(rLC_Pp->is_data_plane) ? "DRB AM" : "SRB AM",\
rLC_Pp->rb_id
#define PROTOCOL_RLC_AM_MSC_FMT "[RNTI %" PRIx16 " %s %02
u
]"
#define PROTOCOL_RLC_AM_MSC_FMT "[RNTI %" PRIx16 " %s %02
ld
]"
#define PROTOCOL_RLC_AM_MSC_ARGS(CTXT_Pp, rLC_Pp) \
CTXT_Pp->rnti,\
(rLC_Pp->is_data_plane) ? "DRB AM" : "SRB AM",\
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
View file @
80cd6940
...
...
@@ -111,7 +111,7 @@ rlc_am_send_sdu (
char
message_string
[
7000
];
size_t
message_string_size
=
0
;
int
octet_index
,
index
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
rlc_pP
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
rlc_pP
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"SDU size : %u
\n
"
,
rlc_pP
->
output_sdu_size_to_write
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"
\n
Payload :
\n
"
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"------+-------------------------------------------------|
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm.h
View file @
80cd6940
...
...
@@ -42,7 +42,7 @@
# include "mem_block.h"
# include "rlc_tm_init.h"
#define PROTOCOL_RLC_TM_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
u
]"
#define PROTOCOL_RLC_TM_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
ld
]"
#define PROTOCOL_RLC_TM_CTXT_ARGS(CTXT_Pp, rLC_Pp) PROTOCOL_CTXT_ARGS(CTXT_Pp),\
(rLC_Pp->is_data_plane) ? "DRB TM" : "SRB TM",\
rLC_Pp->rb_id
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.c
View file @
80cd6940
...
...
@@ -42,7 +42,7 @@ void config_req_rlc_tm (
if
(
h_rc
==
HASH_TABLE_OK
)
{
rlc_p
=
&
rlc_union_p
->
rlc
.
tm
;
LOG_D
(
RLC
,
PROTOCOL_RLC_TM_CTXT_FMT
" CONFIG_REQ (is_uplink_downlink=%d) RB %
u
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_RLC_TM_CTXT_FMT
" CONFIG_REQ (is_uplink_downlink=%d) RB %
ld
\n
"
,
PROTOCOL_RLC_TM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
config_tmP
->
is_uplink_downlink
,
rb_idP
);
...
...
@@ -52,7 +52,7 @@ void config_req_rlc_tm (
rlc_tm_set_debug_infos
(
ctxt_pP
,
rlc_p
,
srb_flagP
,
rb_idP
,
chan_idP
);
rlc_tm_configure
(
ctxt_pP
,
rlc_p
,
config_tmP
->
is_uplink_downlink
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_RLC_TM_CTXT_FMT
" CONFIG_REQ RB %
u
RLC NOT FOUND
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_TM_CTXT_FMT
" CONFIG_REQ RB %
ld
RLC NOT FOUND
\n
"
,
PROTOCOL_RLC_TM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
rb_idP
);
}
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
View file @
80cd6940
...
...
@@ -279,7 +279,7 @@ rlc_um_rx (const protocol_ctxt_t *const ctxt_pP, void *argP, struct mac_data_ind
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
=
0
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU size : %u
\n
"
,
tb_size_in_bytes
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Header size : %u
\n
"
,
pdu_info
.
header_size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Payload size: %u
\n
"
,
pdu_info
.
payload_size
);
...
...
@@ -525,7 +525,7 @@ rlc_um_mac_data_request (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP,cons
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
))
{
message_string_size
=
0
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
l_rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"PDU size : %u
\n
"
,
tb_size_in_bytes
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Header size : %u
\n
"
,
pdu_info
.
header_size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Payload size: %u
\n
"
,
pdu_info
.
payload_size
);
...
...
@@ -631,7 +631,7 @@ rlc_um_data_req (const protocol_ctxt_t *const ctxt_pP, void *rlc_pP, mem_block_t
if
(
LOG_DEBUGFLAG
(
DEBUG_RLC
)
)
{
data_offset
=
sizeof
(
struct
rlc_um_data_req_alloc
);
data_size
=
((
struct
rlc_um_tx_sdu_management
*
)(
sdu_pP
->
data
))
->
sdu_size
;
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
u
\n
"
,
rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"Bearer : %
ld
\n
"
,
rlc_p
->
rb_id
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"SDU size : %u
\n
"
,
data_size
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"
\n
Payload :
\n
"
);
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
"------+-------------------------------------------------|
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
View file @
80cd6940
...
...
@@ -50,13 +50,13 @@
# include "rlc_um_segment.h"
# include "rlc_um_test.h"
#define PROTOCOL_RLC_UM_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
u
] %s()"
#define PROTOCOL_RLC_UM_CTXT_FMT PROTOCOL_CTXT_FMT"[%s %02
ld
] %s()"
#define PROTOCOL_RLC_UM_CTXT_ARGS(CTXT_Pp, rLC_Pp) PROTOCOL_CTXT_ARGS(CTXT_Pp),\
(rLC_Pp->is_data_plane) ? "DRB UM" : "SRB UM",\
rLC_Pp->rb_id,\
__FUNCTION__
#define PROTOCOL_RLC_UM_MSC_FMT "[RNTI %" PRIx16 " %s %02
u
]"
#define PROTOCOL_RLC_UM_MSC_FMT "[RNTI %" PRIx16 " %s %02
ld
]"
#define PROTOCOL_RLC_UM_MSC_ARGS(CTXT_Pp, rLC_Pp) \
CTXT_Pp->rnti,\
(rLC_Pp->is_data_plane) ? "DRB UM" : "SRB UM",\
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
View file @
80cd6940
...
...
@@ -50,7 +50,7 @@ void config_req_rlc_um (
if
(
h_rc
==
HASH_TABLE_OK
)
{
rlc_p
=
&
rlc_union_p
->
rlc
.
um
;
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" CONFIG_REQ timer_reordering=%d sn_field_length=%d is_mXch=%d RB %
u
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" CONFIG_REQ timer_reordering=%d sn_field_length=%d is_mXch=%d RB %
ld
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
config_um_pP
->
timer_reordering
,
config_um_pP
->
sn_field_length
,
...
...
@@ -69,7 +69,7 @@ void config_req_rlc_um (
config_um_pP
->
is_mXch
);
}
}
else
{
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" CONFIG_REQ RB %
u
RLC UM NOT FOUND
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" CONFIG_REQ RB %
ld
RLC UM NOT FOUND
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
rb_idP
);
}
...
...
@@ -143,14 +143,14 @@ void config_req_rlc_um_asn1 (
// rb_idP,
// srb_flagP);
if
(
h_rc
!=
HASH_TABLE_OK
)
{
LOG_E
(
RLC
,
"RLC NOT FOUND enb id %u ue id %i enb flag %u rb id %
u
, srb flag %u
\n
"
,
LOG_E
(
RLC
,
"RLC NOT FOUND enb id %u ue id %i enb flag %u rb id %
ld
, srb flag %u
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
srb_flagP
);
return
;
}
rlc_p
=
&
rlc_union_p
->
rlc
.
um
;
//-----------------------------------------------------------------------------
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" CONFIG_REQ timer_reordering=%dms sn_field_length= RB %
u
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" CONFIG_REQ timer_reordering=%dms sn_field_length= RB %
ld
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
(
dl_rlc_pP
&&
dl_rlc_pP
->
t_Reordering
<
31
)
?
t_Reordering_tab
[
dl_rlc_pP
->
t_Reordering
]
:-
1
,
rb_idP
);
...
...
@@ -170,7 +170,7 @@ void config_req_rlc_um_asn1 (
break
;
default:
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
u
INVALID UL sn_FieldLength %ld, RLC NOT CONFIGURED
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
ld
INVALID UL sn_FieldLength %ld, RLC NOT CONFIGURED
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
rlc_p
->
rb_id
,
ul_rlc_pP
->
sn_FieldLength
);
...
...
@@ -198,7 +198,7 @@ void config_req_rlc_um_asn1 (
break
;
default:
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
u
INVALID DL sn_FieldLength %ld, RLC NOT CONFIGURED
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
ld
INVALID DL sn_FieldLength %ld, RLC NOT CONFIGURED
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
rlc_p
->
rb_id
,
dl_rlc_pP
->
sn_FieldLength
);
...
...
@@ -217,7 +217,7 @@ void config_req_rlc_um_asn1 (
if
(
dl_rlc_pP
->
t_Reordering
<
32
)
{
t_Reordering
=
t_Reordering_tab
[
dl_rlc_pP
->
t_Reordering
];
}
else
{
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
u
INVALID T_Reordering %ld, RLC NOT CONFIGURED
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
ld
INVALID T_Reordering %ld, RLC NOT CONFIGURED
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
rlc_p
->
rb_id
,
dl_rlc_pP
->
t_Reordering
);
...
...
@@ -382,7 +382,7 @@ void rlc_um_configure(
rlc_pP
->
rx_um_window_size
=
RLC_UM_WINDOW_SIZE_SN_5_BITS
;
rlc_pP
->
rx_header_min_length_in_bytes
=
1
;
}
else
if
(
rx_sn_field_lengthP
!=
0
)
{
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
u
INVALID RX SN LENGTH %d BITS NOT IMPLEMENTED YET, RLC NOT CONFIGURED
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
ld
INVALID RX SN LENGTH %d BITS NOT IMPLEMENTED YET, RLC NOT CONFIGURED
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
rlc_pP
->
rb_id
,
rx_sn_field_lengthP
);
...
...
@@ -400,7 +400,7 @@ void rlc_um_configure(
rlc_pP
->
tx_um_window_size
=
RLC_UM_WINDOW_SIZE_SN_5_BITS
;
rlc_pP
->
tx_header_min_length_in_bytes
=
1
;
}
else
if
(
tx_sn_field_lengthP
!=
0
)
{
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
u
INVALID RX SN LENGTH %d BITS NOT IMPLEMENTED YET, RLC NOT CONFIGURED
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [CONFIGURE] RB %
ld
INVALID RX SN LENGTH %d BITS NOT IMPLEMENTED YET, RLC NOT CONFIGURED
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
rlc_pP
->
rb_id
,
tx_sn_field_lengthP
);
...
...
@@ -428,7 +428,7 @@ void rlc_um_set_debug_infos(
const
srb_flag_t
srb_flagP
,
const
rb_id_t
rb_idP
,
const
logical_chan_id_t
chan_idP
)
{
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [SET DEBUG INFOS] rb_id %d srb_flag %d
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" [SET DEBUG INFOS] rb_id %
l
d srb_flag %d
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_pP
),
rb_idP
,
srb_flagP
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
View file @
80cd6940
...
...
@@ -50,7 +50,7 @@ rlc_um_display_rx_window(
LOG_T
(
RLC
,
"
\n
"
);
sprintf
(
time_out_str
,
"%010d"
,
rlc_pP
->
t_reordering
.
ms_duration
);
time_out_str
[
10
]
=
0
;
LOG_T
(
RLC
,
"| RLC UM RB %02d VR(UR)=%03d VR(UX)=%03d VR(UH)=%03d t-Reordering: %s %s %s |"
,
LOG_T
(
RLC
,
"| RLC UM RB %02
l
d VR(UR)=%03d VR(UX)=%03d VR(UH)=%03d t-Reordering: %s %s %s |"
,
rlc_pP
->
rb_id
,
rlc_pP
->
vr_ur
,
rlc_pP
->
vr_ux
,
rlc_pP
->
vr_uh
,
(
rlc_pP
->
t_reordering
.
running
)
?
" ON"
:
"OFF"
,
(
rlc_pP
->
t_reordering
.
running
)
?
"Time-out frameP:"
:
" "
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/rlc.c
View file @
80cd6940
...
...
@@ -137,7 +137,7 @@ rlc_op_status_t rlc_stat_req (
//AssertFatal (rb_idP < NB_RB_MAX, "RB id is too high (%u/%d)!\n", rb_idP, NB_RB_MAX);
if
(
rb_idP
>=
NB_RB_MAX
)
{
LOG_E
(
RLC
,
"RB id is too high (%
u
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
LOG_E
(
RLC
,
"RB id is too high (%
ld
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
return
RLC_OP_STATUS_BAD_PARAMETER
;
}
...
...
@@ -332,7 +332,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
rlc_mbms_id_t
*
mbms_id_p
=
NULL
;
logical_chan_id_t
log_ch_id
=
0
;
#ifdef DEBUG_RLC_DATA_REQ
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"rlc_data_req: rb_id %
u
(MAX %d), muip %d, confirmP %d, sdu_sizeP %d, sdu_pP %p
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"rlc_data_req: rb_id %
ld
(MAX %d), muip %d, confirmP %d, sdu_sizeP %d, sdu_pP %p
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
,
NB_RAB_MAX
,
...
...
@@ -351,13 +351,13 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
if
(
MBMS_flagP
)
{
//AssertFatal (rb_idP < NB_RB_MBMS_MAX, "RB id is too high (%u/%d)!\n", rb_idP, NB_RB_MBMS_MAX);
if
(
rb_idP
>=
NB_RB_MBMS_MAX
)
{
LOG_E
(
RLC
,
"RB id is too high (%
u
/%d)!
\n
"
,
rb_idP
,
NB_RB_MBMS_MAX
);
LOG_E
(
RLC
,
"RB id is too high (%
ld
/%d)!
\n
"
,
rb_idP
,
NB_RB_MBMS_MAX
);
return
RLC_OP_STATUS_BAD_PARAMETER
;
}
}
else
{
//AssertFatal (rb_idP < NB_RB_MAX, "RB id is too high (%u/%d)!\n", rb_idP, NB_RB_MAX);
if
(
rb_idP
>=
NB_RB_MAX
)
{
LOG_E
(
RLC
,
"RB id is too high (%
u
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
LOG_E
(
RLC
,
"RB id is too high (%
ld
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
return
RLC_OP_STATUS_BAD_PARAMETER
;
}
}
...
...
@@ -387,14 +387,14 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
key
=
RLC_COLL_KEY_MBMS_VALUE
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
mbms_id_p
->
service_id
,
mbms_id_p
->
session_id
);
}
else
if
(
sourceL2Id
&&
destinationL2Id
)
{
LOG_D
(
RLC
,
"RLC_COLL_KEY_VALUE: ctxt_pP->module_id: %d, ctxt_pP->rnti: %d, ctxt_pP->enb_flag: %d, rb_idP:%d, srb_flagP: %d
\n
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
LOG_D
(
RLC
,
"RLC_COLL_KEY_VALUE: ctxt_pP->module_id: %d, ctxt_pP->rnti: %d, ctxt_pP->enb_flag: %d, rb_idP:%
l
d, srb_flagP: %d
\n
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
srb_flagP
);
key
=
RLC_COLL_KEY_VALUE
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
srb_flagP
);
//Thinh's line originally uncommented
//key = RLC_COLL_KEY_SOURCE_DEST_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, rb_idP, *sourceL2Id, *destinationL2Id, srb_flagP);
//key_lcid = RLC_COLL_KEY_LCID_SOURCE_DEST_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, chan_idP, *sourceL2Id, *destinationL2Id, srb_flagP);
}
else
{
LOG_D
(
RLC
,
"RLC_COLL_KEY_VALUE: ctxt_pP->module_id: %d, ctxt_pP->rnti: %d, ctxt_pP->enb_flag: %d, rb_idP:%d, srb_flagP: %d
\n
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
LOG_D
(
RLC
,
"RLC_COLL_KEY_VALUE: ctxt_pP->module_id: %d, ctxt_pP->rnti: %d, ctxt_pP->enb_flag: %d, rb_idP:%
l
d, srb_flagP: %d
\n
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
srb_flagP
);
key
=
RLC_COLL_KEY_VALUE
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
enb_flag
,
rb_idP
,
srb_flagP
);
}
...
...
@@ -411,7 +411,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
}
if
(
MBMS_flagP
==
0
)
{
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
u
] Display of rlc_data_req:
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
ld
] Display of rlc_data_req:
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
);
#if defined(TRACE_RLC_PAYLOAD)
...
...
@@ -424,7 +424,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
switch
(
rlc_mode
)
{
case
RLC_MODE_NONE
:
free_mem_block
(
sdu_pP
,
__func__
);
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" Received RLC_MODE_NONE as rlc_type for rb_id %
u
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" Received RLC_MODE_NONE as rlc_type for rb_id %
ld
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RLC_DATA_REQ
,
VCD_FUNCTION_OUT
);
...
...
@@ -558,7 +558,7 @@ void rlc_data_ind (
const
sdu_size_t
sdu_sizeP
,
mem_block_t
*
sdu_pP
)
{
//-----------------------------------------------------------------------------
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
] Display of rlc_data_ind: size %u
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
] Display of rlc_data_ind: size %u
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/rlc.h
View file @
80cd6940
...
...
@@ -197,7 +197,7 @@ rlc_mbms_id_t rlc_mbms_lcid2service_session_id_eNB[MAX_eNB][RLC_MAX_MBMS_
#define rlc_mbms_ue_get_lcid_by_rb_id(uE_mOD,rB_iD) rlc_mbms_rbid2lcid_ue[uE_mOD][rB_iD]
#define rlc_mbms_ue_set_lcid_by_rb_id(uE_mOD,rB_iD,lOG_cH_iD) do { \
AssertFatal(rB_iD<NB_RB_MBMS_MAX, "INVALID RB ID %
u
", rB_iD); \
AssertFatal(rB_iD<NB_RB_MBMS_MAX, "INVALID RB ID %
ld
", rB_iD); \
rlc_mbms_rbid2lcid_ue[uE_mOD][rB_iD] = lOG_cH_iD; \
} while (0);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/rlc_rrc.c
View file @
80cd6940
...
...
@@ -81,7 +81,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
for
(
cnt
=
0
;
cnt
<
srb2add_listP
->
list
.
count
;
cnt
++
)
{
rb_id
=
srb2add_listP
->
list
.
array
[
cnt
]
->
srb_Identity
;
lc_id
=
rb_id
;
LOG_D
(
RLC
,
"Adding SRB %ld, rb_id %d
\n
"
,
srb2add_listP
->
list
.
array
[
cnt
]
->
srb_Identity
,
rb_id
);
LOG_D
(
RLC
,
"Adding SRB %ld, rb_id %
l
d
\n
"
,
srb2add_listP
->
list
.
array
[
cnt
]
->
srb_Identity
,
rb_id
);
srb_toaddmod_p
=
srb2add_listP
->
list
.
array
[
cnt
];
if
(
srb_toaddmod_p
->
rlc_Config
)
{
...
...
@@ -102,7 +102,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
&
srb_toaddmod_p
->
rlc_Config
->
choice
.
explicitValue
.
choice
.
am
,
rb_id
,
lc_id
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %d
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %
l
d
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_id
);
}
...
...
@@ -122,7 +122,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
rb_id
,
lc_id
,
0
,
0
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %d
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %
l
d
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_id
);
}
...
...
@@ -142,7 +142,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
rb_id
,
lc_id
,
0
,
0
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %d
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %
l
d
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_id
);
}
...
...
@@ -162,7 +162,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
rb_id
,
lc_id
,
0
,
0
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %d
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %
l
d
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_id
);
}
...
...
@@ -196,7 +196,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
&
srb_toaddmod_p
->
rlc_Config
->
choice
.
explicitValue
.
choice
.
am
,
rb_id
,
lc_id
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %d
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
" ERROR IN ALLOCATING SRB %
l
d
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_id
);
}
...
...
@@ -213,7 +213,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
NULL, // TO DO DEFAULT CONFIG
rb_id, lc_id);
} else {
LOG_D(RLC, PROTOCOL_CTXT_FMT" ERROR IN ALLOCATING SRB %d \n",
LOG_D(RLC, PROTOCOL_CTXT_FMT" ERROR IN ALLOCATING SRB %
l
d \n",
PROTOCOL_CTXT_ARGS(ctxt_pP),
rb_id);
}
...
...
@@ -379,7 +379,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t *const ctxt_pP
}
}
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
" CONFIG REQ MBMS ASN1 LC ID %u RB ID %
u
SESSION ID %u SERVICE ID %u
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
" CONFIG REQ MBMS ASN1 LC ID %u RB ID %
ld
SESSION ID %u SERVICE ID %u
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
lc_id
,
rb_id
,
...
...
@@ -502,7 +502,7 @@ rlc_op_status_t rrc_rlc_remove_rlc (
//AssertFatal (rb_idP < NB_RB_MAX, "RB id is too high (%u/%d)!\n", rb_idP, NB_RB_MAX);
if
(
rb_idP
>=
NB_RB_MAX
)
{
LOG_E
(
RLC
,
"RB id is too high (%
u
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
LOG_E
(
RLC
,
"RB id is too high (%
ld
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
return
RLC_OP_STATUS_BAD_PARAMETER
;
}
...
...
@@ -524,7 +524,7 @@ rlc_op_status_t rrc_rlc_remove_rlc (
break
;
default:
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
] RLC mode is unknown!
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
] RLC mode is unknown!
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
);
...
...
@@ -539,20 +539,20 @@ rlc_op_status_t rrc_rlc_remove_rlc (
if
((
h_rc
==
HASH_TABLE_OK
)
&&
(
h_lcid_rc
==
HASH_TABLE_OK
))
{
h_lcid_rc
=
hashtable_remove
(
rlc_coll_p
,
key_lcid
);
h_rc
=
hashtable_remove
(
rlc_coll_p
,
key
);
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
LCID %d] RELEASED %s
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
LCID %d] RELEASED %s
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
lcid
,
(
srb_flagP
)
?
"SRB"
:
"DRB"
);
}
else
if
((
h_rc
==
HASH_TABLE_KEY_NOT_EXISTS
)
||
(
h_lcid_rc
==
HASH_TABLE_KEY_NOT_EXISTS
))
{
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
LCID %d] RELEASE : RLC NOT FOUND %s, by RB-ID=%d, by LC-ID=%d
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
LCID %d] RELEASE : RLC NOT FOUND %s, by RB-ID=%d, by LC-ID=%d
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
lcid
,
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
h_rc
,
h_lcid_rc
);
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
LCID %d] RELEASE : INTERNAL ERROR %s
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
LCID %d] RELEASE : INTERNAL ERROR %s
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
lcid
,
...
...
@@ -585,7 +585,7 @@ rlc_union_t *rrc_rlc_add_rlc (
//AssertFatal (rb_idP < NB_RB_MAX, "RB id is too high (%u/%d)!\n", rb_idP, NB_RB_MAX);
//AssertFatal (chan_idP < RLC_MAX_LC, "LC id is too high (%u/%d)!\n", chan_idP, RLC_MAX_LC);
if
(
rb_idP
>=
NB_RB_MAX
)
{
LOG_E
(
RLC
,
"RB id is too high (%
u
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
LOG_E
(
RLC
,
"RB id is too high (%
ld
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
return
NULL
;
}
...
...
@@ -624,7 +624,7 @@ rlc_union_t *rrc_rlc_add_rlc (
h_rc
=
hashtable_get
(
rlc_coll_p
,
key
,
(
void
**
)
&
rlc_union_p
);
if
(
h_rc
==
HASH_TABLE_OK
)
{
LOG_W
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
] rrc_rlc_add_rlc , already exist %s
\n
"
,
LOG_W
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
] rrc_rlc_add_rlc , already exist %s
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
...
...
@@ -649,7 +649,7 @@ rlc_union_t *rrc_rlc_add_rlc (
mbms_id_p
->
service_id
,
mbms_id_p
->
session_id
);
}
else
{
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
" [%s %
u
] rrc_rlc_add_rlc %s
\n
"
,
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
" [%s %
ld
] rrc_rlc_add_rlc %s
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
...
...
@@ -659,7 +659,7 @@ rlc_union_t *rrc_rlc_add_rlc (
rlc_union_p
->
mode
=
rlc_modeP
;
return
rlc_union_p
;
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
] rrc_rlc_add_rlc FAILED %s (add by RB_id=%d; add by LC_id=%d)
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
] rrc_rlc_add_rlc FAILED %s (add by RB_id=%d; add by LC_id=%d)
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
...
...
@@ -670,7 +670,7 @@ rlc_union_t *rrc_rlc_add_rlc (
return
NULL
;
}
}
else
{
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
u
] rrc_rlc_add_rlc , INTERNAL ERROR %s
\n
"
,
LOG_E
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %
ld
] rrc_rlc_add_rlc , INTERNAL ERROR %s
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
...
...
@@ -689,13 +689,13 @@ rlc_op_status_t rrc_rlc_config_req (
const
rlc_info_t
rlc_infoP
)
{
//-----------------------------------------------------------------------------
//rlc_op_status_t status;
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
" CONFIG_REQ for RAB %
u
\n
"
,
LOG_D
(
RLC
,
PROTOCOL_CTXT_FMT
" CONFIG_REQ for RAB %
ld
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
);
//AssertFatal (rb_idP < NB_RB_MAX, "RB id is too high (%u/%d)!\n", rb_idP, NB_RB_MAX);
if
(
rb_idP
>=
NB_RB_MAX
)
{
LOG_E
(
RLC
,
"RB id is too high (%
u
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
LOG_E
(
RLC
,
"RB id is too high (%
ld
/%d)!
\n
"
,
rb_idP
,
NB_RB_MAX
);
return
RLC_OP_STATUS_BAD_PARAMETER
;
}
...
...
@@ -709,7 +709,7 @@ rlc_op_status_t rrc_rlc_config_req (
case
CONFIG_ACTION_MODIFY
:
switch
(
rlc_infoP
.
rlc_mode
)
{
case
RLC_MODE_AM
:
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
u
] MODIFY RB AM
\n
"
,
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
ld
] MODIFY RB AM
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
);
config_req_rlc_am
(
...
...
@@ -720,7 +720,7 @@ rlc_op_status_t rrc_rlc_config_req (
break
;
case
RLC_MODE_UM
:
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
u
] MODIFY RB UM
\n
"
,
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
ld
] MODIFY RB UM
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
);
config_req_rlc_um
(
...
...
@@ -731,7 +731,7 @@ rlc_op_status_t rrc_rlc_config_req (
break
;
case
RLC_MODE_TM
:
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
u
] MODIFY RB TM
\n
"
,
LOG_I
(
RLC
,
PROTOCOL_CTXT_FMT
"[RB %
ld
] MODIFY RB TM
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
rb_idP
);
config_req_rlc_tm
(
...
...
This diff is collapsed.
Click to expand it.
openair2/NETWORK_DRIVER/MESH/common.c
View file @
80cd6940
...
...
@@ -407,7 +407,7 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
if
(
bytes_wrote
!=
NAS_PDCPH_SIZE
)
{
printk
(
"NAS_COMMON_QOS_SEND: problem while writing PDCP's header (bytes wrote = %d )
\n
"
,
bytes_wrote
);
printk
(
"rb_id %d, Wrote %d, Header Size %lu
\n
"
,
pdcph
.
rb_id
,
bytes_wrote
,
NAS_PDCPH_SIZE
);
printk
(
"rb_id %
l
d, Wrote %d, Header Size %lu
\n
"
,
pdcph
.
rb_id
,
bytes_wrote
,
NAS_PDCPH_SIZE
);
#ifndef PDCP_USE_NETLINK
rtf_reset
(
NAS2PDCP_FIFO
);
#endif //PDCP_USE_NETLINK
...
...
@@ -421,7 +421,7 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
#endif //PDCP_USE_NETLINK
if
(
bytes_wrote
!=
skb
->
len
+
NAS_PDCPH_SIZE
)
{
printk
(
"NAS_COMMON_QOS_SEND: Inst %d, RB_ID %d: problem while writing PDCP's data, bytes_wrote = %d, Data_len %d, PDCPH_SIZE %lu
\n
"
,
printk
(
"NAS_COMMON_QOS_SEND: Inst %d, RB_ID %
l
d: problem while writing PDCP's data, bytes_wrote = %d, Data_len %d, PDCPH_SIZE %lu
\n
"
,
inst
,
pdcph
.
rb_id
,
bytes_wrote
,
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/L2_interface.c
View file @
80cd6940
...
...
@@ -68,7 +68,7 @@ mac_rrc_data_req(
uint8_t
sfn
=
(
uint8_t
)((
frameP
>>
2
)
&
0xff
);
if
(
LOG_DEBUGFLAG
(
DEBUG_RRC
))
{
LOG_D
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%d
\n
"
,
Mod_idP
,
Srb_id
);
LOG_D
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%
l
d
\n
"
,
Mod_idP
,
Srb_id
);
}
eNB_RRC_INST
*
rrc
;
...
...
@@ -167,7 +167,7 @@ mac_rrc_data_req(
if
(
ue_context_p
==
NULL
)
return
(
0
);
eNB_RRC_UE_t
*
ue_p
=
&
ue_context_p
->
ue_context
;
LOG_T
(
RRC
,
"[eNB %d] Frame %d CCCH request (Srb_id %d, rnti %x)
\n
"
,
Mod_idP
,
frameP
,
Srb_id
,
rnti
);
LOG_T
(
RRC
,
"[eNB %d] Frame %d CCCH request (Srb_id %
l
d, rnti %x)
\n
"
,
Mod_idP
,
frameP
,
Srb_id
,
rnti
);
Srb_info
=&
ue_p
->
Srb0
;
// check if data is there for MAC
...
...
@@ -182,7 +182,7 @@ mac_rrc_data_req(
}
if
(
(
Srb_id
&
RAB_OFFSET
)
==
PCCH
)
{
LOG_T
(
RRC
,
"[eNB %d] Frame %d PCCH request (Srb_id %d)
\n
"
,
Mod_idP
,
frameP
,
Srb_id
);
LOG_T
(
RRC
,
"[eNB %d] Frame %d PCCH request (Srb_id %
l
d)
\n
"
,
Mod_idP
,
frameP
,
Srb_id
);
// check if data is there for MAC
if
(
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sizeof_paging
[
mbsfn_sync_area
]
>
0
)
{
//Fill buffer
...
...
@@ -254,7 +254,7 @@ mac_rrc_data_ind(
//--------------------------------------------------------------------------
{
if
(
NODE_IS_DU
(
RC
.
rrc
[
module_idP
]
->
node_type
))
{
LOG_W
(
RRC
,
"[DU %d][RAPROC] Received SDU for CCCH on SRB %d length %d for UE id %d RNTI %x
\n
"
,
LOG_W
(
RRC
,
"[DU %d][RAPROC] Received SDU for CCCH on SRB %
l
d length %d for UE id %d RNTI %x
\n
"
,
module_idP
,
srb_idP
,
sdu_lenP
,
UE_id
,
rntiP
);
/* do ITTI message */
DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
...
...
@@ -279,7 +279,7 @@ mac_rrc_data_ind(
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
module_idP
,
ENB_FLAG_YES
,
rntiP
,
frameP
,
sub_frameP
,
0
);
if
((
srb_idP
&
RAB_OFFSET
)
==
CCCH
)
{
LOG_D
(
RRC
,
"[eNB %d] Received SDU for CCCH on SRB %d
\n
"
,
module_idP
,
srb_idP
);
LOG_D
(
RRC
,
"[eNB %d] Received SDU for CCCH on SRB %
l
d
\n
"
,
module_idP
,
srb_idP
);
ctxt
.
brOption
=
brOption
;
/*Srb_info = &RC.rrc[module_idP]->carrier[CC_id].Srb0;
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/L2_interface_common.c
View file @
80cd6940
...
...
@@ -123,10 +123,10 @@ rrc_data_ind(
rb_id_t
DCCH_index
=
Srb_id
;
if
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_NO
)
{
LOG_I
(
RRC
,
"[UE %x] Frame %d: received a DCCH %
d message on SRB %
d with Size %d from eNB %d
\n
"
,
LOG_I
(
RRC
,
"[UE %x] Frame %d: received a DCCH %
ld message on SRB %l
d with Size %d from eNB %d
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
DCCH_index
,
Srb_id
,
sdu_sizeP
,
ctxt_pP
->
eNB_index
);
}
else
{
LOG_D
(
RRC
,
"[eNB %d] Frame %d: received a DCCH %
d message on SRB %
d with Size %d from UE %x
\n
"
,
LOG_D
(
RRC
,
"[eNB %d] Frame %d: received a DCCH %
ld message on SRB %l
d with Size %d from UE %x
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
DCCH_index
,
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/L2_interface_ue.c
View file @
80cd6940
...
...
@@ -59,8 +59,8 @@ mac_rrc_data_req_ue(
)
//--------------------------------------------------------------------------
{
LOG_D
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%d
\n
"
,
Mod_idP
,
Srb_id
);
LOG_D
(
RRC
,
"[UE %d] Frame %d Filling SL DISCOVERY SRB_ID %d
\n
"
,
Mod_idP
,
frameP
,
Srb_id
);
LOG_D
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%
l
d
\n
"
,
Mod_idP
,
Srb_id
);
LOG_D
(
RRC
,
"[UE %d] Frame %d Filling SL DISCOVERY SRB_ID %
l
d
\n
"
,
Mod_idP
,
frameP
,
Srb_id
);
LOG_D
(
RRC
,
"[UE %d] Frame %d buffer_pP status %d,
\n
"
,
Mod_idP
,
frameP
,
UE_rrc_inst
[
Mod_idP
].
SL_Discovery
[
eNB_index
].
Tx_buffer
.
payload_size
);
//TTN (for D2D)
...
...
@@ -72,7 +72,7 @@ mac_rrc_data_req_ue(
return
(
Ret_size
);
}
LOG_D
(
RRC
,
"[UE %d] Frame %d Filling CCCH SRB_ID %d
\n
"
,
Mod_idP
,
frameP
,
Srb_id
);
LOG_D
(
RRC
,
"[UE %d] Frame %d Filling CCCH SRB_ID %
l
d
\n
"
,
Mod_idP
,
frameP
,
Srb_id
);
LOG_D
(
RRC
,
"[UE %d] Frame %d buffer_pP status %d,
\n
"
,
Mod_idP
,
frameP
,
UE_rrc_inst
[
Mod_idP
].
Srb0
[
eNB_index
].
Tx_buffer
.
payload_size
);
if
(
(
UE_rrc_inst
[
Mod_idP
].
Srb0
[
eNB_index
].
Tx_buffer
.
payload_size
>
0
)
)
{
...
...
@@ -137,7 +137,7 @@ mac_rrc_data_ind_ue(
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
module_idP
,
0
,
rntiP
,
frameP
,
sub_frameP
,
eNB_indexP
);
if
(
srb_idP
==
BCCH_SI_MBMS
)
{
LOG_D
(
RRC
,
"[UE %d] Received SDU for BCCH on MBMS SRB %d from eNB %d
\n
"
,
module_idP
,
srb_idP
,
eNB_indexP
);
LOG_D
(
RRC
,
"[UE %d] Received SDU for BCCH on MBMS SRB %
l
d from eNB %d
\n
"
,
module_idP
,
srb_idP
,
eNB_indexP
);
#if defined(ENABLE_ITTI)
{
MessageDef
*
message_p
;
...
...
@@ -167,7 +167,7 @@ mac_rrc_data_ind_ue(
}
if
(
srb_idP
==
BCCH
)
{
LOG_D
(
RRC
,
"[UE %d] Received SDU for BCCH on SRB %d from eNB %d
\n
"
,
module_idP
,
srb_idP
,
eNB_indexP
);
LOG_D
(
RRC
,
"[UE %d] Received SDU for BCCH on SRB %
l
d from eNB %d
\n
"
,
module_idP
,
srb_idP
,
eNB_indexP
);
#if defined(ENABLE_ITTI)
{
MessageDef
*
message_p
;
...
...
@@ -197,13 +197,13 @@ mac_rrc_data_ind_ue(
}
if
(
srb_idP
==
PCCH
)
{
LOG_D
(
RRC
,
"[UE %d] Received SDU for PCCH on SRB %d from eNB %d
\n
"
,
module_idP
,
srb_idP
,
eNB_indexP
);
LOG_D
(
RRC
,
"[UE %d] Received SDU for PCCH on SRB %
l
d from eNB %d
\n
"
,
module_idP
,
srb_idP
,
eNB_indexP
);
decode_PCCH_DLSCH_Message
(
&
ctxt
,
eNB_indexP
,(
uint8_t
*
)
sduP
,
sdu_lenP
);
}
if
((
srb_idP
&
RAB_OFFSET
)
==
CCCH
)
{
if
(
sdu_lenP
>
0
)
{
LOG_T
(
RRC
,
"[UE %d] Received SDU for CCCH on SRB %d from eNB %d
\n
"
,
module_idP
,
srb_idP
&
RAB_OFFSET
,
eNB_indexP
);
LOG_T
(
RRC
,
"[UE %d] Received SDU for CCCH on SRB %
l
d from eNB %d
\n
"
,
module_idP
,
srb_idP
&
RAB_OFFSET
,
eNB_indexP
);
#if defined(ENABLE_ITTI)
{
MessageDef
*
message_p
;
...
...
@@ -237,7 +237,7 @@ mac_rrc_data_ind_ue(
}
if
((
srb_idP
&
RAB_OFFSET
)
==
MCCH
)
{
LOG_T
(
RRC
,
"[UE %d] Frame %d: Received SDU on MBSFN sync area %d for MCCH on SRB %d from eNB %d
\n
"
,
LOG_T
(
RRC
,
"[UE %d] Frame %d: Received SDU on MBSFN sync area %d for MCCH on SRB %
l
d from eNB %d
\n
"
,
module_idP
,
frameP
,
mbsfn_sync_areaP
,
srb_idP
&
RAB_OFFSET
,
eNB_indexP
);
#if defined(ENABLE_ITTI)
{
...
...
@@ -266,7 +266,7 @@ mac_rrc_data_ind_ue(
//TTN (for D2D)
if
(
srb_idP
==
SL_DISCOVERY
)
{
LOG_I
(
RRC
,
"[UE %d] Received SDU (%d bytes) for SL_DISCOVERY on SRB %d from eNB %d
\n
"
,
module_idP
,
sdu_lenP
,
srb_idP
,
eNB_indexP
);
LOG_I
(
RRC
,
"[UE %d] Received SDU (%d bytes) for SL_DISCOVERY on SRB %
l
d from eNB %d
\n
"
,
module_idP
,
sdu_lenP
,
srb_idP
,
eNB_indexP
);
decode_SL_Discovery_Message
(
&
ctxt
,
eNB_indexP
,
sduP
,
sdu_lenP
);
}
...
...
@@ -350,7 +350,7 @@ rrc_data_ind_ue(
//------------------------------------------------------------------------------
{
rb_id_t
DCCH_index
=
Srb_id
;
LOG_I
(
RRC
,
"[UE %x] Frame %d: received a DCCH %
d message on SRB %
d with Size %d from eNB %d
\n
"
,
LOG_I
(
RRC
,
"[UE %x] Frame %d: received a DCCH %
ld message on SRB %l
d with Size %d from eNB %d
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
DCCH_index
,
Srb_id
,
sdu_sizeP
,
ctxt_pP
->
eNB_index
);
#if defined(ENABLE_ITTI)
{
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_UE.c
View file @
80cd6940
...
...
@@ -1307,7 +1307,7 @@ rrc_ue_process_radioResourceConfigDedicated(
// configure the first DRB ID as the default DRB ID
UE_rrc_inst
[
ctxt_pP
->
module_id
].
defaultDRB
=
malloc
(
sizeof
(
rb_id_t
));
*
UE_rrc_inst
[
ctxt_pP
->
module_id
].
defaultDRB
=
radioResourceConfigDedicated
->
drb_ToAddModList
->
list
.
array
[
0
]
->
drb_Identity
;
LOG_I
(
RRC
,
"[UE %d] default DRB = %d
\n
"
,
ctxt_pP
->
module_id
,
*
UE_rrc_inst
[
ctxt_pP
->
module_id
].
defaultDRB
);
LOG_I
(
RRC
,
"[UE %d] default DRB = %
l
d
\n
"
,
ctxt_pP
->
module_id
,
*
UE_rrc_inst
[
ctxt_pP
->
module_id
].
defaultDRB
);
}
uint8_t
*
kUPenc
=
NULL
;
...
...
@@ -1889,7 +1889,7 @@ rrc_ue_decode_dcch(
MessageDef
*
msg_p
;
if
(
Srb_id
!=
1
)
{
LOG_E
(
RRC
,
"[UE %d] Frame %d: Received message on DL-DCCH (SRB%d), should not have ...
\n
"
,
LOG_E
(
RRC
,
"[UE %d] Frame %d: Received message on DL-DCCH (SRB%
l
d), should not have ...
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
Srb_id
);
return
;
}
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
80cd6940
...
...
@@ -4774,7 +4774,7 @@ check_handovers(
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
frame
,
0
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
eNB_index
);
LOG_D
(
RRC
,
PROTOCOL_CTXT_FMT
"[check_handovers]Received %s from %s: instance %d, rb_id %d, muiP %d, confirmP %d, mode %d
\n
"
,
LOG_D
(
RRC
,
PROTOCOL_CTXT_FMT
"[check_handovers]Received %s from %s: instance %d, rb_id %
l
d, muiP %d, confirmP %d, mode %d
\n
"
,
PROTOCOL_CTXT_ARGS
(
&
ctxt
),
ITTI_MSG_NAME
(
msg_p
),
ITTI_MSG_ORIGIN_NAME
(
msg_p
),
...
...
@@ -4783,7 +4783,7 @@ check_handovers(
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
muip
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
confirmp
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
mode
);
LOG_I
(
RRC
,
"Before calling pdcp_data_req from check_handovers! GTPV1U_ENB_DATA_FORWARDING_IND (msg_p).rb_id: %d
\n
"
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
rb_id
);
LOG_I
(
RRC
,
"Before calling pdcp_data_req from check_handovers! GTPV1U_ENB_DATA_FORWARDING_IND (msg_p).rb_id: %
l
d
\n
"
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
rb_id
);
result
=
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
rb_id
,
...
...
@@ -4842,7 +4842,7 @@ check_handovers(
GTPV1U_ENB_END_MARKER_IND
(
msg_p
).
frame
,
0
,
GTPV1U_ENB_END_MARKER_IND
(
msg_p
).
eNB_index
);
LOG_I
(
RRC
,
PROTOCOL_CTXT_FMT
"[check_handovers]Received %s from %s: instance %d, rb_id %d, muiP %d, confirmP %d, mode %d
\n
"
,
LOG_I
(
RRC
,
PROTOCOL_CTXT_FMT
"[check_handovers]Received %s from %s: instance %d, rb_id %
l
d, muiP %d, confirmP %d, mode %d
\n
"
,
PROTOCOL_CTXT_ARGS
(
&
ctxt
),
ITTI_MSG_NAME
(
msg_p
),
ITTI_MSG_ORIGIN_NAME
(
msg_p
),
...
...
@@ -4851,7 +4851,7 @@ check_handovers(
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
muip
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
confirmp
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
mode
);
LOG_D
(
RRC
,
"Before calling pdcp_data_req from check_handovers! GTPV1U_ENB_DATA_FORWARDING_IND (msg_p).rb_id: %d
\n
"
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
rb_id
);
LOG_D
(
RRC
,
"Before calling pdcp_data_req from check_handovers! GTPV1U_ENB_DATA_FORWARDING_IND (msg_p).rb_id: %
l
d
\n
"
,
GTPV1U_ENB_DATA_FORWARDING_IND
(
msg_p
).
rb_id
);
result
=
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
GTPV1U_ENB_END_MARKER_IND
(
msg_p
).
rb_id
,
...
...
@@ -7144,11 +7144,11 @@ rrc_eNB_decode_dcch(
T_INT
(
ctxt_pP
->
subframe
),
T_INT
(
ctxt_pP
->
rnti
));
if
((
Srb_id
!=
1
)
&&
(
Srb_id
!=
2
))
{
LOG_E
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Received message on SRB%d, should not have ...
\n
"
,
LOG_E
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Received message on SRB%
l
d, should not have ...
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
Srb_id
);
}
else
{
LOG_D
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Received message on SRB%d
\n
"
,
LOG_D
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Received message on SRB%
l
d
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
Srb_id
);
}
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB_GTPV1U.c
View file @
80cd6940
...
...
@@ -112,7 +112,7 @@ gtpv_data_req(
LOG_I
(
GTPU
,
"gtpv_data_req sdu_sizeP == 0"
);
return
FALSE
;
}
LOG_D
(
GTPU
,
"gtpv_data_req ue rnti %x sdu_sizeP %d rb id %d"
,
ctxt_pP
->
rnti
,
sdu_sizeP
,
rb_idP
);
LOG_D
(
GTPU
,
"gtpv_data_req ue rnti %x sdu_sizeP %d rb id %
l
d"
,
ctxt_pP
->
rnti
,
sdu_sizeP
,
rb_idP
);
#if defined(ENABLE_ITTI)
{
MessageDef
*
message_p
;
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/L2_nr_interface.c
View file @
80cd6940
...
...
@@ -58,7 +58,7 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP,
uint8_t
sfn_msb
=
(
uint8_t
)((
frameP
>>
4
)
&
0x3f
);
#ifdef DEBUG_RRC
LOG_D
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%d
\n
"
,
Mod_idP
,
Srb_id
);
LOG_D
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%
l
d
\n
"
,
Mod_idP
,
Srb_id
);
#endif
gNB_RRC_INST
*
rrc
;
...
...
This diff is collapsed.
Click to expand it.
openair2/UTIL/FIFO/pad_list.c
View file @
80cd6940
...
...
@@ -591,7 +591,7 @@ void pkt_list_display (Packet_OTG_List_t *listP) {
if
(
cursor
)
{
while
(
cursor
!=
NULL
)
{
printf
(
"Pkt (DST %d, RB %d)
\n
"
,
(
cursor
->
otg_pkt
).
dst_id
,
(
cursor
->
otg_pkt
).
rb_id
);
printf
(
"Pkt (DST %d, RB %
l
d)
\n
"
,
(
cursor
->
otg_pkt
).
dst_id
,
(
cursor
->
otg_pkt
).
rb_id
);
//msg ("From (%d,%d) To (%d,%d)\n", (cursor->job).node1, (cursor->job).master1, (cursor->job).node2, (cursor->job).master2);
cursor
=
cursor
->
next
;
nb_elements
++
;
...
...
This diff is collapsed.
Click to expand it.
openair2/UTIL/MEM/mem_block.h
View file @
80cd6940
...
...
@@ -180,8 +180,6 @@ typedef struct {
}
mem_pool
;
mem_pool
*
memBlockVar
;
#define mem_block_var (*memBlockVar)
#ifdef __cplusplus
}
...
...
This diff is collapsed.
Click to expand it.
openair3/GTPV1-U/gtpv1u_eNB.c
View file @
80cd6940
...
...
@@ -831,7 +831,7 @@ int gtpv1u_delete_x2u_tunnel(
if
(
hash_rc
==
HASH_TABLE_OK
)
{
for
(
erab_index
=
0
;
erab_index
<
ue_context_p
->
ue_context
.
nb_x2u_e_rabs
;
erab_index
++
)
{
eps_bearer_id
=
ue_context_p
->
ue_context
.
enb_gtp_x2u_ebi
[
erab_index
];
LOG_I
(
GTPU
,
"gtpv1u_delete_x2u_tunnel user rnti %x teNB X2U teid %u eps bearer id %
u
\n
"
,
LOG_I
(
GTPU
,
"gtpv1u_delete_x2u_tunnel user rnti %x teNB X2U teid %u eps bearer id %
ld
\n
"
,
req_pP
->
rnti
,
gtpv1u_ue_data_p
->
bearers
[
eps_bearer_id
-
GTPV1U_BEARER_OFFSET
].
teid_teNB
,
ue_context_p
->
ue_context
.
enb_gtp_x2u_ebi
[
erab_index
]);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment