Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
5808864a
Commit
5808864a
authored
Jun 18, 2018
by
Cedric Roux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop
parents
d7899827
1ea80a2b
Changes
38
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
168 additions
and
166 deletions
+168
-166
openair1/PHY/LTE_TRANSPORT/prach_common.c
openair1/PHY/LTE_TRANSPORT/prach_common.c
+1
-1
openair1/PHY/LTE_TRANSPORT/transport_common.h
openair1/PHY/LTE_TRANSPORT/transport_common.h
+3
-3
openair1/PHY/LTE_TRANSPORT/transport_proto.h
openair1/PHY/LTE_TRANSPORT/transport_proto.h
+1
-1
openair1/PHY/defs_common.h
openair1/PHY/defs_common.h
+3
-3
openair1/PHY/defs_eNB.h
openair1/PHY/defs_eNB.h
+12
-12
openair1/SCHED/sched_eNB.h
openair1/SCHED/sched_eNB.h
+1
-1
openair2/COMMON/mac_rrc_primitives.h
openair2/COMMON/mac_rrc_primitives.h
+2
-2
openair2/ENB_APP/flexran_agent_ran_api.c
openair2/ENB_APP/flexran_agent_ran_api.c
+3
-3
openair2/LAYER2/MAC/config_ue.c
openair2/LAYER2/MAC/config_ue.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+6
-6
openair2/LAYER2/MAC/eNB_scheduler_mch.c
openair2/LAYER2/MAC/eNB_scheduler_mch.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
+1
-1
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+6
-6
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/mac_proto.h
+4
-4
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+1
-1
openair2/LAYER2/MAC/ra_procedures.c
openair2/LAYER2/MAC/ra_procedures.c
+2
-2
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+3
-3
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+4
-4
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
+4
-4
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+14
-14
openair2/LAYER2/PDCP_v10.1.0/pdcp_proto_extern.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_proto_extern.h
+1
-1
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
+1
-1
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.h
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.h
+1
-1
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+1
-1
openair2/LAYER2/RLC/rlc.h
openair2/LAYER2/RLC/rlc.h
+4
-4
openair2/LAYER2/RLC/rlc_mac.c
openair2/LAYER2/RLC/rlc_mac.c
+4
-4
openair2/LAYER2/RLC/rlc_mpls.c
openair2/LAYER2/RLC/rlc_mpls.c
+1
-1
openair2/LAYER2/RLC/rlc_rrc.c
openair2/LAYER2/RLC/rlc_rrc.c
+19
-19
openair2/NETWORK_DRIVER/UE_IP/common.c
openair2/NETWORK_DRIVER/UE_IP/common.c
+1
-1
openair2/NETWORK_DRIVER/UE_IP/local.h
openair2/NETWORK_DRIVER/UE_IP/local.h
+2
-2
openair2/RRC/LTE/L2_interface_ue.c
openair2/RRC/LTE/L2_interface_ue.c
+2
-2
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+4
-4
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_UE.c
+40
-40
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_defs.h
+4
-2
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+4
-4
openair2/RRC/LTE/rrc_proto.h
openair2/RRC/LTE/rrc_proto.h
+1
-1
openair3/GTPV1-U/gtpv1u_eNB.c
openair3/GTPV1-U/gtpv1u_eNB.c
+2
-2
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/lte-uesoftmodem.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/prach_common.c
View file @
5808864a
...
...
@@ -570,7 +570,7 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t su
uint8_t
prach_ConfigIndex
=
frame_parms
->
prach_config_common
.
prach_ConfigInfo
.
prach_ConfigIndex
;
int
prach_mask
=
is_prach_subframe0
(
frame_parms
,
prach_ConfigIndex
,
frame
,
subframe
);
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
int
i
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
...
...
openair1/PHY/LTE_TRANSPORT/transport_common.h
View file @
5808864a
...
...
@@ -105,7 +105,7 @@ typedef enum {
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
typedef
enum
{
CEmodeA
=
0
,
CEmodeB
=
1
...
...
@@ -138,7 +138,7 @@ typedef enum {
HARQ_SR_CQI
}
UCI_type_t
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
typedef
enum
{
NOCE
,
CEMODEA
,
...
...
@@ -183,7 +183,7 @@ typedef struct {
PRACH_TDD_PREAMBLE_MAP_elem
map
[
6
];
}
PRACH_TDD_PREAMBLE_MAP
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
typedef
struct
{
uint16_t
slss_id
;
...
...
openair1/PHY/LTE_TRANSPORT/transport_proto.h
View file @
5808864a
...
...
@@ -578,7 +578,7 @@ void rx_prach(PHY_VARS_eNB *phy_vars_eNB,RU_t *ru,
uint16_t
*
max_preamble_energy
,
uint16_t
*
max_preamble_delay
,
uint16_t
Nf
,
uint8_t
tdd_mapindex
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
uint8_t
br_flag
#endif
...
...
openair1/PHY/defs_common.h
View file @
5808864a
...
...
@@ -159,7 +159,7 @@ typedef struct {
PRACH_CONFIG_INFO
prach_ConfigInfo
;
}
PRACH_CONFIG_COMMON
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// PRACH-eMTC-Config from 36.331 RRC spec
typedef
struct
{
...
...
@@ -192,7 +192,7 @@ typedef struct {
/// prach_Config_enabled=1 means enabled. \vr{[0..1]}
uint8_t
prach_Config_enabled
;
/// PRACH Configuration Information
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
PRACH_eMTC_CONFIG_INFO
prach_ConfigInfo
;
#endif
}
PRACH_eMTC_CONFIG_COMMON
;
...
...
@@ -644,7 +644,7 @@ typedef struct {
uint8_t
nb_antenna_ports_eNB
;
/// PRACH_CONFIG
PRACH_CONFIG_COMMON
prach_config_common
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// PRACH_eMTC_CONFIG
PRACH_eMTC_CONFIG_COMMON
prach_emtc_config_common
;
#endif
...
...
openair1/PHY/defs_eNB.h
View file @
5808864a
...
...
@@ -359,7 +359,7 @@ typedef struct RU_t_s{
int
(
*
wakeup_rxtx
)(
struct
PHY_VARS_eNB_s
*
eNB
,
struct
RU_t_s
*
ru
);
/// function pointer to wakeup routine in lte-enb.
void
(
*
wakeup_prach_eNB
)(
struct
PHY_VARS_eNB_s
*
eNB
,
struct
RU_t_s
*
ru
,
int
frame
,
int
subframe
);
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// function pointer to wakeup routine in lte-enb.
void
(
*
wakeup_prach_eNB_br
)(
struct
PHY_VARS_eNB_s
*
eNB
,
struct
RU_t_s
*
ru
,
int
frame
,
int
subframe
);
#endif
...
...
@@ -484,7 +484,7 @@ typedef struct RRU_config_s {
int
prach_FreqOffset
[
MAX_BANDS_PER_RRU
];
/// prach_ConfigIndex for IF4p5
int
prach_ConfigIndex
[
MAX_BANDS_PER_RRU
];
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
int
emtc_prach_CElevel_enable
[
MAX_BANDS_PER_RRU
][
4
];
/// emtc_prach_FreqOffset for IF4p5 per CE Level
int
emtc_prach_FreqOffset
[
MAX_BANDS_PER_RRU
][
4
];
...
...
@@ -619,7 +619,7 @@ typedef struct {
int32_t
**
prach_ifft
[
4
];
/// repetition number
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// indicator of first frame in a group of PRACH repetitions
int
first_frame
[
4
];
/// current repetition for each CE level
...
...
@@ -706,7 +706,7 @@ typedef struct eNB_proc_t_s {
int
subframe_rx
;
/// subframe to act upon for PRACH
int
subframe_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// subframe to act upon for reception of prach BL/CE UEs
int
subframe_prach_br
;
#endif
...
...
@@ -716,7 +716,7 @@ typedef struct eNB_proc_t_s {
int
frame_tx
;
/// frame to act upon for PRACH
int
frame_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// frame to act upon for PRACH BL/CE UEs
int
frame_prach_br
;
#endif
...
...
@@ -726,7 +726,7 @@ typedef struct eNB_proc_t_s {
int
instance_cnt_te
;
/// \internal This variable is protected by \ref mutex_prach.
int
instance_cnt_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// \internal This variable is protected by \ref mutex_prach for BL/CE UEs.
int
instance_cnt_prach_br
;
#endif
...
...
@@ -748,7 +748,7 @@ typedef struct eNB_proc_t_s {
pthread_attr_t
attr_single
;
/// pthread attributes for prach processing thread
pthread_attr_t
attr_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// pthread attributes for prach processing thread BL/CE UEs
pthread_attr_t
attr_prach_br
;
#endif
...
...
@@ -762,7 +762,7 @@ typedef struct eNB_proc_t_s {
struct
sched_param
sched_param_single
;
/// scheduling parameters for prach thread
struct
sched_param
sched_param_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// scheduling parameters for prach thread
struct
sched_param
sched_param_prach_br
;
#endif
...
...
@@ -774,7 +774,7 @@ typedef struct eNB_proc_t_s {
pthread_t
pthread_te
;
/// pthread structure for PRACH thread
pthread_t
pthread_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// pthread structure for PRACH thread BL/CE UEs
pthread_t
pthread_prach_br
;
#endif
...
...
@@ -784,7 +784,7 @@ typedef struct eNB_proc_t_s {
pthread_cond_t
cond_te
;
/// condition variable for PRACH processing thread;
pthread_cond_t
cond_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// condition variable for PRACH processing thread BL/CE UEs;
pthread_cond_t
cond_prach_br
;
#endif
...
...
@@ -796,7 +796,7 @@ typedef struct eNB_proc_t_s {
pthread_mutex_t
mutex_te
;
/// mutex for PRACH thread
pthread_mutex_t
mutex_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// mutex for PRACH thread for BL/CE UEs
pthread_mutex_t
mutex_prach_br
;
#endif
...
...
@@ -812,7 +812,7 @@ typedef struct eNB_proc_t_s {
int
RU_mask
;
/// mask for RUs serving eNB (PRACH)
int
RU_mask_prach
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// mask for RUs serving eNB (PRACH)
int
RU_mask_prach_br
;
#endif
...
...
openair1/SCHED/sched_eNB.h
View file @
5808864a
...
...
@@ -127,7 +127,7 @@ void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_t *proc);
@param phy_vars_eNB Pointer to eNB variables on which to act
@param br_flag indicator for eMTC PRACH
*/
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
void
prach_procedures
(
PHY_VARS_eNB
*
eNB
,
int
br_flag
);
#else
...
...
openair2/COMMON/mac_rrc_primitives.h
View file @
5808864a
...
...
@@ -365,7 +365,7 @@ typedef struct {
#endif
);
unsigned
int
(
*
mac_rlc_data_req
)(
module_id_t
,
unsigned
int
,
const
unsigned
int
,
char
*
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
uint32_t
,
uint32_t
#endif
...
...
@@ -373,7 +373,7 @@ typedef struct {
void
(
*
mac_rlc_data_ind
)(
module_id_t
,
logical_chan_id_t
,
char
*
,
tb_size_t
,
num_tb_t
,
crc_t
*
);
mac_rlc_status_resp_t
(
*
mac_rlc_status_ind
)
(
module_id_t
enb_mod_idP
,
module_id_t
ue_mod_idP
,
frame_t
frameP
,
sub_frame_t
subframeP
,
eNB_flag_t
eNB_flagP
,
MBMS_flag_t
MBMS_flagP
,
logical_chan_id_t
channel_idP
,
tb_size_t
tb_sizeP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
uint32_t
sourceL2Id
,
uint32_t
destinationL2Id
#endif
...
...
openair2/ENB_APP/flexran_agent_ran_api.c
View file @
5808864a
...
...
@@ -141,7 +141,7 @@ rlc_buffer_occupancy_t flexran_get_tx_queue_size(mid_t mod_id, mid_t ue_id, logi
frame_t
frame
=
flexran_get_current_frame
(
mod_id
);
sub_frame_t
subframe
=
flexran_get_current_subframe
(
mod_id
);
mac_rlc_status_resp_t
rlc_status
=
mac_rlc_status_ind
(
mod_id
,
rnti
,
mod_id
,
frame
,
subframe
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
channel_id
,
0
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -154,7 +154,7 @@ rlc_buffer_occupancy_t flexran_get_num_pdus_buffer(mid_t mod_id, mid_t ue_id, lo
frame_t
frame
=
flexran_get_current_frame
(
mod_id
);
sub_frame_t
subframe
=
flexran_get_current_subframe
(
mod_id
);
mac_rlc_status_resp_t
rlc_status
=
mac_rlc_status_ind
(
mod_id
,
rnti
,
mod_id
,
frame
,
subframe
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
channel_id
,
0
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -167,7 +167,7 @@ frame_t flexran_get_hol_delay(mid_t mod_id, mid_t ue_id, logical_chan_id_t chann
frame_t
frame
=
flexran_get_current_frame
(
mod_id
);
sub_frame_t
subframe
=
flexran_get_current_subframe
(
mod_id
);
mac_rlc_status_resp_t
rlc_status
=
mac_rlc_status_ind
(
mod_id
,
rnti
,
mod_id
,
frame
,
subframe
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
channel_id
,
0
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
openair2/LAYER2/MAC/config_ue.c
View file @
5808864a
...
...
@@ -138,7 +138,7 @@ rrc_mac_config_req_ue(module_id_t Mod_idP,
#ifdef CBA
,
uint8_t
num_active_cba_groups
,
uint16_t
cba_rnti
#endif
#if
defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0)
)
,
config_action_t
config_action
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
...
...
@@ -590,7 +590,7 @@ rrc_mac_config_req_ue(module_id_t Mod_idP,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
//for D2D
#if
defined(Rel10) || defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(10, 0, 0)
)
switch
(
config_action
)
{
case
CONFIG_ACTION_ADD
:
if
(
sourceL2Id
){
...
...
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
5808864a
...
...
@@ -1004,7 +1004,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
if
(
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
>
0
)
{
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
DCCH
,
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -1019,7 +1019,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
sdu_lengths
[
0
]
=
mac_rlc_data_req
(
module_idP
,
rnti
,
module_idP
,
frameP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
DCCH
,
TBS
,
//not used
(
char
*
)
&
dlsch_buffer
[
0
]
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -1113,7 +1113,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
if
(
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
>
0
)
{
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
DCCH
+
1
,
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -1129,7 +1129,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
sdu_lengths
[
num_sdus
]
+=
mac_rlc_data_req
(
module_idP
,
rnti
,
module_idP
,
frameP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
DCCH
+
1
,
TBS
,
//not used
(
char
*
)
&
dlsch_buffer
[
sdu_length_total
]
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -1184,7 +1184,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
MBMS_FLAG_NO
,
lcid
,
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -1202,7 +1202,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
sdu_lengths
[
num_sdus
]
=
mac_rlc_data_req
(
module_idP
,
rnti
,
module_idP
,
frameP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
lcid
,
TBS
,
//not used
(
char
*
)
&
dlsch_buffer
[
sdu_length_total
]
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_mch.c
View file @
5808864a
...
...
@@ -633,7 +633,7 @@ schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
MTCH
,
TBS
-
header_len_mcch
-
header_len_msi
-
sdu_length_total
-
header_len_mtch
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -652,7 +652,7 @@ schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
sdu_lengths
[
num_sdus
]
=
mac_rlc_data_req
(
module_idP
,
0
,
module_idP
,
frameP
,
ENB_FLAG_YES
,
MBMS_FLAG_YES
,
MTCH
,
0
,
//not used
(
char
*
)
&
mch_buffer
[
sdu_length_total
]
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
View file @
5808864a
...
...
@@ -325,7 +325,7 @@ void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t s
0
,
// n_srs
get_TBS_UL
(
mcs
,
nb_rb
)
);
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
if
(
UE_template
->
rach_resource_type
>
0
)
{
// This is a BL/CE UE allocation
fill_nfapi_ulsch_config_request_emtc
(
&
ul_req
->
ul_config_pdu_list
[
ul_req
->
number_of_pdus
],
UE_template
->
rach_resource_type
>
2
?
2
:
1
,
...
...
openair2/LAYER2/MAC/mac.h
View file @
5808864a
...
...
@@ -1435,12 +1435,12 @@ typedef struct {
RAR_PDU
RAR_pdu
;
/// Incoming DLSCH pdu for PHY
DLSCH_PDU
DLSCH_pdu
[
MAX_MOBILES_PER_ENB
][
2
];
#if
def Rel14
int
sltx_active
;
SLSCH_t
slsch
;
SLDCH_t
sldch
;
ULSCH_PDU
slsch_pdu
;
int
slsch_lcid
;
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
int
sltx_active
;
SLSCH_t
slsch
;
SLDCH_t
sldch
;
ULSCH_PDU
slsch_pdu
;
int
slsch_lcid
;
#endif
/// number of attempt for rach
uint8_t
RA_attempt_number
;
...
...
openair2/LAYER2/MAC/mac_proto.h
View file @
5808864a
...
...
@@ -1029,10 +1029,10 @@ int rrc_mac_config_req_ue(module_id_t module_idP,
,
uint8_t
num_active_cba_groups
,
uint16_t
cba_rnti
#endif
#if
defined(Rel14
)
,
config_action_t
config_action
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0)
)
,
config_action_t
config_action
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
#endif
);
...
...
openair2/LAYER2/MAC/pre_processor.c
View file @
5808864a
...
...
@@ -134,7 +134,7 @@ store_dlsch_buffer(module_id_t Mod_id, slice_id_t slice_id, frame_t frameP,
rlc_status
=
mac_rlc_status_ind
(
Mod_id
,
rnti
,
Mod_id
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
i
,
0
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
openair2/LAYER2/MAC/ra_procedures.c
View file @
5808864a
...
...
@@ -410,7 +410,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
UE_mac_inst
[
module_idP
].
crnti
,
eNB_indexP
,
frameP
,
subframeP
,
ENB_FLAG_NO
,
MBMS_FLAG_NO
,
DCCH
,
6
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -431,7 +431,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
sdu_lengths
[
0
]
=
mac_rlc_data_req
(
module_idP
,
UE_mac_inst
[
module_idP
].
crnti
,
eNB_indexP
,
frameP
,
ENB_FLAG_NO
,
MBMS_FLAG_NO
,
DCCH
,
6
,
//not used
(
char
*
)
&
ulsch_buff
[
0
]
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
openair2/LAYER2/MAC/ue_procedures.c
View file @
5808864a
...
...
@@ -1853,7 +1853,7 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
lcid
,
buflen_remain
,
(
char
*
)
&
ulsch_buff
[
sdu_length_total
]
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -2840,7 +2840,7 @@ update_bsr(module_id_t module_idP, frame_t frameP,
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
UE_mac_inst
[
module_idP
].
crnti
,
eNB_index
,
frameP
,
subframeP
,
ENB_FLAG_NO
,
MBMS_FLAG_NO
,
lcid
,
0xFFFF
//TBS is not used in RLC at this step, set a special value for debug
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -3291,7 +3291,7 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
ue
->
slsch_lcid
,
req
,
(
char
*
)(
ue
->
slsch_pdu
.
payload
+
sizeof
(
SLSCH_SUBHEADER_24_Bit_DST_LONG
))
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
ue
->
sourceL2Id
,
ue
->
destinationL2Id
#endif
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
5808864a
...
...
@@ -83,7 +83,7 @@ boolean_t pdcp_data_req(
const
sdu_size_t
sdu_buffer_sizeP
,
unsigned
char
*
const
sdu_buffer_pP
,
const
pdcp_transmission_mode_t
modeP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
#endif
...
...
@@ -170,7 +170,7 @@ boolean_t pdcp_data_req(
sdu_buffer_sizeP
);
#endif
rlc_status
=
rlc_data_req
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_YES
,
rb_idP
,
muiP
,
confirmP
,
sdu_buffer_sizeP
,
pdcp_pdu_p
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -360,7 +360,7 @@ boolean_t pdcp_data_req(
LOG_F
(
PDCP
,
"
\n
"
);
#endif
rlc_status
=
rlc_data_req
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
sourceL2Id
,
destinationL2Id
#endif
...
...
@@ -982,7 +982,7 @@ pdcp_run (
RRC_DCCH_DATA_REQ
(
msg_p
).
sdu_size
,
RRC_DCCH_DATA_REQ
(
msg_p
).
sdu_p
,
RRC_DCCH_DATA_REQ
(
msg_p
).
mode
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
View file @
5808864a
...
...
@@ -260,7 +260,7 @@ public_pdcp(boolean_t pdcp_data_req(
const
sdu_size_t
sdu_buffer_size
,
unsigned
char
*
const
sdu_buffer
,
const
pdcp_transmission_mode_t
mode
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
#endif
...
...
@@ -437,7 +437,7 @@ typedef struct pdcp_data_req_header_s {
sdu_size_t
data_size
;
signed
int
inst
;
ip_traffic_type_t
traffic_type
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
uint32_t
sourceL2Id
;
uint32_t
destinationL2Id
;
#endif
...
...
@@ -448,7 +448,7 @@ typedef struct pdcp_data_ind_header_s {
sdu_size_t
data_size
;
signed
int
inst
;
ip_traffic_type_t
dummy_traffic_type
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
uint32_t
sourceL2Id
;
uint32_t
destinationL2Id
;
#endif
...
...
@@ -462,7 +462,7 @@ struct pdcp_netlink_element_s {
};
//TTN for D2D (PC5S)
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#define PDCP_SOCKET_PORT_NO 9999 //temporary value
#define PC5_SIGNALLING_PAYLOAD_SIZE 100 //should be updated with a correct value
int
pdcp_pc5_sockfd
;
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
5808864a
...
...
@@ -202,7 +202,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP)
cont
=
0
;
//TTN - for D2D (PC5S)
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
sidelink_pc5s_element
*
sl_pc5s_msg_recv
=
NULL
;
char
send_buf
[
BUFSIZE
];
int
rb_id
=
((
pdcp_data_ind_header_t
*
)(
sdu_p
->
data
))
->
rb_id
;
...
...
@@ -452,7 +452,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
rab_id
,
RLC_MUI_UNDEFINED
,
RLC_SDU_CONFIRM_NO
,
len
,
(
unsigned
char
*
)
nl_rx_buf
,
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -488,7 +488,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_t
*
pdcp_p
=
NULL
;
//TTN for D2D (PC5S)
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
int
prose_addr_len
;
char
send_buf
[
BUFSIZE
],
receive_buf
[
BUFSIZE
];
// Panos: Remove the following definitions due to warnings of unused variables.
...
...
@@ -568,7 +568,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
data_p
->
pdcp_read_header
.
data_size
,
data_p
->
data
,
pdcp_mode
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -596,7 +596,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
data_p
->
pdcp_read_header
.
data_size
,
data_p
->
data
,
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -613,7 +613,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
data_p
->
pdcp_read_header
.
data_size
,
data_p
->
data
,
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -633,7 +633,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
//TTN for D2D (PC5S)
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
prose_addr_len
=
sizeof
(
prose_pdcp_addr
);
// receive a message from ProSe App
memset
(
receive_buf
,
0
,
BUFSIZE
);
...
...
@@ -775,7 +775,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pc5s_header
->
data_size
,
(
unsigned
char
*
)
receive_buf
,
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
&
pc5s_header
->
sourceL2Id
,
&
pc5s_header
->
destinationL2Id
#endif
...
...
@@ -833,7 +833,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pc5s_header
->
data_size
,
(
unsigned
char
*
)
receive_buf
,
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
&
pc5s_header
->
sourceL2Id
,
&
pc5s_header
->
destinationL2Id
#endif
...
...
@@ -980,7 +980,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -1017,7 +1017,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -1083,7 +1083,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
&
pdcp_read_header_g
.
sourceL2Id
,
&
pdcp_read_header_g
.
destinationL2Id
#endif
...
...
@@ -1141,7 +1141,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
&
pdcp_read_header_g
.
sourceL2Id
,
&
pdcp_read_header_g
.
destinationL2Id
#endif
...
...
@@ -1189,7 +1189,7 @@ void pdcp_fifo_read_input_sdus_from_otg (const protocol_ctxt_t* const ctxt_pP)
}
//TTN for D2D (PC5S)
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
void
pdcp_pc5_socket_init
()
{
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_proto_extern.h
View file @
5808864a
...
...
@@ -53,7 +53,7 @@ extern int reception_from_rohc_bs(void);
extern
BOOL
pdcp_data_ind
(
module_id_t
module_idP
,
rb_id_t
rab_idP
,
sdu_size_t
data_sizeP
,
mem_block_t
*
sduP
,
uint8_t
is_data_plane
);
extern
BOOL
pdcp_data_req
(
module_id_t
module_id
,
uint32_t
frame
,
uint8_t
eNB_flag
,
rb_id_t
rab_id
,
uint32_t
muiP
,
uint32_t
confirmP
,
sdu_size_t
sdu_buffer_size
,
unsigned
char
*
sdu_buffer
,
uint8_t
is_data_pdu
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
#endif
...
...
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c
View file @
5808864a
...
...
@@ -94,7 +94,7 @@ void config_req_rlc_um_asn1 (
const
DL_UM_RLC_t
*
const
dl_rlc_pP
,
const
rb_id_t
rb_idP
,
const
logical_chan_id_t
chan_idP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.h
View file @
5808864a
...
...
@@ -116,7 +116,7 @@ public_rlc_um_control_primitives( void config_req_rlc_um_asn1 (
const
DL_UM_RLC_t
*
const
dl_rlc_pP
,
const
rb_id_t
rb_idP
,
const
logical_chan_id_t
chan_idP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
openair2/LAYER2/RLC/rlc.c
View file @
5808864a
...
...
@@ -320,7 +320,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t* const ctxt_pP,
confirm_t
confirmP
,
sdu_size_t
sdu_sizeP
,
mem_block_t
*
sdu_pP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
*
const
sourceL2Id
,
const
uint32_t
*
const
destinationL2Id
#endif
...
...
openair2/LAYER2/RLC/rlc.h
View file @
5808864a
...
...
@@ -399,7 +399,7 @@ public_rlc_rrc(rlc_op_status_t rrc_rlc_remove_rlc (const protocol_ctxt_t* cons
* \return A status about the processing, OK or error code.
*/
private_rlc_rrc
(
rlc_union_t
*
rrc_rlc_add_rlc
(
const
protocol_ctxt_t
*
const
,
const
srb_flag_t
,
const
MBMS_flag_t
MBMS_flagP
,
const
rb_id_t
,
logical_chan_id_t
,
rlc_mode_t
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
@@ -465,7 +465,7 @@ public_rlc_rrc(void rrc_rlc_register_rrc (rrc_data_ind_cb_t rrc_data_indP, rrc_d
* \return A status about the processing, OK or error code.
*/
public_rlc_mac
(
tbs_size_t
mac_rlc_data_req
(
const
module_id_t
,
const
rnti_t
,
const
eNB_index_t
,
const
frame_t
,
const
eNB_flag_t
,
const
MBMS_flag_t
,
logical_chan_id_t
,
const
tb_size_t
,
char
*
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
@@ -500,7 +500,7 @@ public_rlc_mac(void mac_rlc_data_ind (const module_id_t, co
* \return The maximum number of bytes that the RLC instance can send in the next transmission sequence.
*/
public_rlc_mac
(
mac_rlc_status_resp_t
mac_rlc_status_ind
(
const
module_id_t
,
const
rnti_t
,
const
eNB_index_t
,
const
frame_t
,
const
sub_frame_t
,
const
eNB_flag_t
,
const
MBMS_flag_t
,
logical_chan_id_t
,
tb_size_t
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
@@ -555,7 +555,7 @@ public_rlc(rlc_op_status_t rlc_data_req (
const
confirm_t
,
const
sdu_size_t
,
mem_block_t
*
const
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
*
const
,
const
uint32_t
*
const
#endif
...
...
openair2/LAYER2/RLC/rlc_mac.c
View file @
5808864a
...
...
@@ -127,7 +127,7 @@ tbs_size_t mac_rlc_data_req(
const
logical_chan_id_t
channel_idP
,
const
tb_size_t
tb_sizeP
,
char
*
buffer_pP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
@@ -179,7 +179,7 @@ tbs_size_t mac_rlc_data_req(
}
}
else
{
key
=
RLC_COLL_KEY_LCID_VALUE
(
module_idP
,
rntiP
,
enb_flagP
,
channel_idP
,
srb_flag
);
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
if
((
sourceL2Id
>
0
)
&&
(
destinationL2Id
>
0
))
key
=
RLC_COLL_KEY_LCID_SOURCE_DEST_VALUE
(
module_idP
,
rntiP
,
enb_flagP
,
channel_idP
,
sourceL2Id
,
destinationL2Id
,
srb_flag
);
#endif
...
...
@@ -329,7 +329,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
const
MBMS_flag_t
MBMS_flagP
,
const
logical_chan_id_t
channel_idP
,
const
tb_size_t
tb_sizeP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
@@ -362,7 +362,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
key
=
RLC_COLL_KEY_MBMS_VALUE
(
module_idP
,
rntiP
,
enb_flagP
,
mbms_id_p
->
service_id
,
mbms_id_p
->
session_id
);
}
else
{
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
if
((
sourceL2Id
>
0
)
&&
(
destinationL2Id
>
0
))
{
key
=
RLC_COLL_KEY_SOURCE_DEST_VALUE
(
module_idP
,
rntiP
,
enb_flagP
,
channel_idP
,
sourceL2Id
,
destinationL2Id
,
srb_flag
);
}
else
...
...
openair2/LAYER2/RLC/rlc_mpls.c
View file @
5808864a
...
...
@@ -41,7 +41,7 @@ rlc_op_status_t mpls_rlc_data_req (
//-----------------------------------------------------------------------------
// third arg should be set to 1 or 0
return
rlc_data_req
(
ctxtP
,
SRB_FLAG_NO
,
MBMS_FLAG_NO
,
rb_idP
,
RLC_MUI_UNDEFINED
,
RLC_SDU_CONFIRM_NO
,
sdu_sizeP
,
sduP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
openair2/LAYER2/RLC/rlc_rrc.c
View file @
5808864a
...
...
@@ -107,7 +107,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_am
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_YES
,
MBMS_FLAG_NO
,
rb_id
,
lc_id
,
RLC_MODE_AM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -127,7 +127,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_um_Bi_Directional
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_YES
,
MBMS_FLAG_NO
,
rb_id
,
lc_id
,
RLC_MODE_UM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -141,7 +141,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
.
um_Bi_Directional
.
ul_UM_RLC
,
&
srb_toaddmod_p
->
rlc_Config
->
choice
.
explicitValue
.
choice
.
um_Bi_Directional
.
dl_UM_RLC
,
rb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -155,7 +155,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_um_Uni_Directional_UL
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_YES
,
MBMS_FLAG_NO
,
rb_id
,
lc_id
,
RLC_MODE_UM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -169,7 +169,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
.
um_Uni_Directional_UL
.
ul_UM_RLC
,
NULL
,
rb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -183,7 +183,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_um_Uni_Directional_DL
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_YES
,
MBMS_FLAG_NO
,
rb_id
,
lc_id
,
RLC_MODE_UM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -197,7 +197,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
NULL
,
&
srb_toaddmod_p
->
rlc_Config
->
choice
.
explicitValue
.
choice
.
um_Uni_Directional_DL
.
dl_UM_RLC
,
rb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -230,7 +230,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
config_am_pP
->
ul_AM_RLC
.
maxRetxThreshold
=
UL_AM_RLC__maxRetxThreshold_t4
;
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_YES
,
MBMS_FLAG_NO
,
rb_id
,
lc_id
,
RLC_MODE_AM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -299,7 +299,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_am
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_NO
,
MBMS_FLAG_NO
,
drb_id
,
lc_id
,
RLC_MODE_AM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -315,7 +315,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_um_Bi_Directional
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_NO
,
MBMS_FLAG_NO
,
drb_id
,
lc_id
,
RLC_MODE_UM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
sourceL2Id
,
destinationL2Id
#endif
...
...
@@ -329,7 +329,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
&
drb_toaddmod_p
->
rlc_Config
->
choice
.
um_Bi_Directional
.
ul_UM_RLC
,
&
drb_toaddmod_p
->
rlc_Config
->
choice
.
um_Bi_Directional
.
dl_UM_RLC
,
drb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
sourceL2Id
,
destinationL2Id
#endif
...
...
@@ -340,7 +340,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_um_Uni_Directional_UL
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_NO
,
MBMS_FLAG_NO
,
drb_id
,
lc_id
,
RLC_MODE_UM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -354,7 +354,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
&
drb_toaddmod_p
->
rlc_Config
->
choice
.
um_Uni_Directional_UL
.
ul_UM_RLC
,
NULL
,
drb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -364,7 +364,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
case
RLC_Config_PR_um_Uni_Directional_DL
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
SRB_FLAG_NO
,
MBMS_FLAG_NO
,
drb_id
,
lc_id
,
RLC_MODE_UM
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -378,7 +378,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
NULL
,
&
drb_toaddmod_p
->
rlc_Config
->
choice
.
um_Uni_Directional_DL
.
dl_UM_RLC
,
drb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -469,7 +469,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
NULL
,
&
dl_um_rlc
,
rb_id
,
lc_id
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -654,7 +654,7 @@ rlc_union_t* rrc_rlc_add_rlc (
const
rb_id_t
rb_idP
,
const
logical_chan_id_t
chan_idP
,
const
rlc_mode_t
rlc_modeP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
...
...
@@ -802,7 +802,7 @@ rlc_op_status_t rrc_rlc_config_req (
case
CONFIG_ACTION_ADD
:
if
(
rrc_rlc_add_rlc
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
rb_idP
,
rlc_infoP
.
rlc_mode
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
...
...
@@ -881,7 +881,7 @@ rlc_op_status_t rrc_rlc_data_req (
if
(
sdu
!=
NULL
)
{
memcpy
(
sdu
->
data
,
sduP
,
sdu_sizeP
);
return
rlc_data_req
(
ctxt_pP
,
SRB_FLAG_YES
,
MBMS_flagP
,
rb_idP
,
muiP
,
confirmP
,
sdu_sizeP
,
sdu
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
openair2/NETWORK_DRIVER/UE_IP/common.c
View file @
5808864a
...
...
@@ -248,7 +248,7 @@ ue_ip_common_ip2wireless(
//---------------------------------------------------------------------------
struct
pdcp_data_req_header_s
pdcph
;
ue_ip_priv_t
*
priv_p
=
netdev_priv
(
ue_ip_dev
[
instP
]);
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
ipversion_t
*
ipv_p
=
NULL
;
unsigned
int
hard_header_len
=
0
;
unsigned
char
*
src_addr
=
0
;
...
...
openair2/NETWORK_DRIVER/UE_IP/local.h
View file @
5808864a
...
...
@@ -89,7 +89,7 @@ typedef struct pdcp_data_req_header_s {
sdu_size_t
data_size
;
signed
int
inst
;
ip_traffic_type_t
traffic_type
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
uint32_t
sourceL2Id
;
uint32_t
destinationL2Id
;
#endif
...
...
@@ -100,7 +100,7 @@ typedef struct pdcp_data_ind_header_s {
sdu_size_t
data_size
;
signed
int
inst
;
ip_traffic_type_t
dummy_traffic_type
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
uint32_t
sourceL2Id
;
uint32_t
destinationL2Id
;
#endif
...
...
openair2/RRC/LTE/L2_interface_ue.c
View file @
5808864a
...
...
@@ -67,7 +67,7 @@ mac_rrc_data_req_ue(
#endif
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
LOG_D
(
RRC
,
"[UE %d] Frame %d Filling SL DISCOVERY SRB_ID %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
);
...
...
@@ -331,7 +331,7 @@ rrc_data_req_ue(
sdu_sizeP
,
buffer_pP
,
modeP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
5808864a
...
...
@@ -598,7 +598,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
uint8_t
MBMS_flag
=
RC
.
rrc
[
Mod_id
]
->
carrier
[
CC_id
].
MBMS_flag
;
#endif
#if
defined(Rel10) || defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(10, 0, 0)
)
//TTN - for D2D
SystemInformationBlockType18_r12_t
**
sib18
=
&
RC
.
rrc
[
Mod_id
]
->
carrier
[
CC_id
].
sib18
;
SystemInformationBlockType19_r12_t
**
sib19
=
&
RC
.
rrc
[
Mod_id
]
->
carrier
[
CC_id
].
sib19
;
...
...
@@ -649,7 +649,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
#endif
#if
defined(Rel10) || defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(10, 0, 0)
)
//TTN - for D2D
sib18_part
=
CALLOC
(
1
,
sizeof
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
));
sib19_part
=
CALLOC
(
1
,
sizeof
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
));
...
...
@@ -1003,7 +1003,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
// SIB13
// fill in all elements of SIB13 if present
#if (RRC_VERSION >= MAKE_VERSION(
10
, 0, 0))
#if (RRC_VERSION >= MAKE_VERSION(
9
, 0, 0))
if
(
MBMS_flag
>
0
)
{
// Notification for mcch change
...
...
@@ -1063,7 +1063,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
#endif
#if
defined(Rel10) || defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(10, 0, 0)
)
//TTN - for D2D
// SIB18
//commRxPool_r12
...
...
openair2/RRC/LTE/rrc_UE.c
View file @
5808864a
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_defs.h
View file @
5808864a
...
...
@@ -192,7 +192,9 @@ void *send_UE_status_notification(void *);
#include "AS-Context.h"
#include "UE-EUTRA-Capability.h"
#include "MeasResults.h"
#if (RRC_VERSION >= MAKE_VERSION(12, 0, 0))
#include "SidelinkUEInformation-r12.h"
#endif
/* for ImsiMobileIdentity_t */
#include "MobileIdentity.h"
...
...
@@ -761,7 +763,7 @@ typedef struct UE_RRC_INST_s {
SystemInformationBlockType10_t
*
sib10
[
NB_CNX_UE
];
SystemInformationBlockType11_t
*
sib11
[
NB_CNX_UE
];
uint8_t
*
MIB
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
//SIB18
SystemInformationBlockType18_r12_t
*
sib18
[
NB_CNX_UE
];
SystemInformationBlockType19_r12_t
*
sib19
[
NB_CNX_UE
];
...
...
@@ -829,7 +831,7 @@ typedef struct UE_RRC_INST_s {
CipheringAlgorithm_r12_t
ciphering_algorithm
;
e_SecurityAlgorithmConfig__integrityProtAlgorithm
integrity_algorithm
;
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// Used for Sidelink Preconfiguration
DRB_ToAddModList_t
*
DRB_configList
;
#endif
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
5808864a
...
...
@@ -555,7 +555,7 @@ static void init_MBMS(
NULL
,
// DRB_ToReleaseList
&
(
RC
.
rrc
[
enb_mod_idP
]
->
carrier
[
CC_id
].
mcch_message
->
pmch_InfoList_r9
)
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
@@ -4490,7 +4490,7 @@ check_handovers(
ue_context_p
->
ue_context
.
handover_info
->
size
,
ue_context_p
->
ue_context
.
handover_info
->
buf
,
PDCP_TRANSMISSION_MODE_CONTROL
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
@@ -7806,7 +7806,7 @@ rrc_eNB_generate_RRCConnectionReconfiguration_Sidelink(
(
struct
RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList
*
)
NULL
,
(
SL_CommConfig_r12_t
*
)
&
sl_CommConfig
,
(
SL_DiscConfig_r12_t
*
)
NULL
#if
defined(Rel10) || defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(10, 0, 0)
)
,
(
SCellToAddMod_r10_t
*
)
NULL
#endif
);
...
...
@@ -7829,7 +7829,7 @@ rrc_eNB_generate_RRCConnectionReconfiguration_Sidelink(
(
struct
RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList
*
)
NULL
,
(
SL_CommConfig_r12_t
*
)
NULL
,
(
SL_DiscConfig_r12_t
*
)
&
sl_DiscConfig
#if
defined(Rel10) || defined(Rel14
)
#if
(RRC_VERSION >= MAKE_VERSION(10, 0, 0)
)
,
(
SCellToAddMod_r10_t
*
)
NULL
#endif
);
...
...
openair2/RRC/LTE/rrc_proto.h
View file @
5808864a
...
...
@@ -106,7 +106,7 @@ rrc_ue_decode_dcch(
const
uint8_t
eNB_indexP
);
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
int
decode_SL_Discovery_Message
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
const
uint8_t
eNB_index
,
...
...
openair3/GTPV1-U/gtpv1u_eNB.c
View file @
5808864a
...
...
@@ -63,7 +63,7 @@ extern boolean_t pdcp_data_req(
const sdu_size_t sdu_buffer_sizeP,
unsigned char *const sdu_buffer_pP,
const pdcp_transmission_mode_t modeP
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,const uint32_t * const sourceL2Id
,const uint32_t * const destinationL2Id
#endif
...
...
@@ -363,7 +363,7 @@ NwGtpv1uRcT gtpv1u_eNB_process_stack_req(
buffer_len
,
buffer
,
PDCP_TRANSMISSION_MODE_DATA
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
...
...
targets/RT/USER/lte-uesoftmodem.c
View file @
5808864a
...
...
@@ -904,7 +904,7 @@ int main( int argc, char **argv )
#endif
//TTN for D2D
#if
def Rel14
#if
(RRC_VERSION >= MAKE_VERSION(14, 0, 0))
printf
(
"RRC control socket
\n
"
);
rrc_control_socket_init
();
printf
(
"PDCP PC5S socket
\n
"
);
...
...
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