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
wangwenhui
OpenXG-RAN
Commits
56af9c60
Commit
56af9c60
authored
Mar 05, 2019
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation/linking errors in lte-uesoftmodem
parent
f9c4c501
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
11 deletions
+14
-11
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SCHED_UE/phy_procedures_lte_ue.c
+2
-1
openair2/F1AP/f1ap_du_rrc_message_transfer.c
openair2/F1AP/f1ap_du_rrc_message_transfer.c
+0
-4
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+10
-6
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+2
-0
No files found.
openair1/SCHED_UE/phy_procedures_lte_ue.c
View file @
56af9c60
...
...
@@ -73,7 +73,6 @@
extern
double
cpuf
;
void
Msg1_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
void
Msg3_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
...
...
@@ -2628,6 +2627,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
// we received a CRNTI, so we're in PUSCH
if
(
ue
->
UE_mode
[
eNB_id
]
!=
PUSCH
)
{
if
(
LOG_DEBUGFLAG
(
DEBUG_UE_PHYPROC
))
{
LOG_D
(
PHY
,
"[UE %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH
\n
"
,
ue
->
Mod_id
,
frame_rx
,
subframe_rx
,
ue
->
pdcch_vars
[
subframe_rx
&
1
][
eNB_id
]
->
crnti
);
}
//dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);
ue
->
UE_mode
[
eNB_id
]
=
PUSCH
;
...
...
openair2/F1AP/f1ap_du_rrc_message_transfer.c
View file @
56af9c60
...
...
@@ -66,7 +66,6 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
#ifndef UETARGET
LOG_D
(
F1AP
,
"DU_handle_DL_RRC_MESSAGE_TRANSFER
\n
"
);
F1AP_DLRRCMessageTransfer_t
*
container
;
...
...
@@ -578,7 +577,6 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
return
ret
;
}
// if pdcp_pdu_p
#endif
return
0
;
}
...
...
@@ -760,7 +758,6 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t module_idP,
rnti_t
rntiP
,
uint8_t
*
sduP
,
sdu_size_t
sdu_lenP
)
{
#ifndef UETARGET
F1AP_F1AP_PDU_t
pdu
;
F1AP_InitialULRRCMessageTransfer_t
*
out
;
F1AP_InitialULRRCMessageTransferIEs_t
*
ie
;
...
...
@@ -853,7 +850,6 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t module_idP,
ue_context_p
->
ue_context
.
Srb0
.
Active
=
1
;
RB_INSERT
(
rrc_ue_tree_s
,
&
RC
.
rrc
[
module_idP
]
->
rrc_ue_head
,
ue_context_p
);
du_f1ap_itti_send_sctp_data_req
(
module_idP
,
f1ap_du_data
->
assoc_id
,
buffer
,
len
,
f1ap_du_data
->
default_sctp_stream_id
);
#endif
return
0
;
}
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
56af9c60
...
...
@@ -60,7 +60,9 @@
# include "gtpv1u.h"
#include "ENB_APP/enb_config.h"
#ifndef UETARGET
#include "LAYER2/PROTO_AGENT/proto_agent.h"
#endif
extern
int
otg_enabled
;
extern
uint8_t
nfapi_mode
;
...
...
@@ -188,6 +190,7 @@ boolean_t pdcp_data_req(
sdu_buffer_sizeP
);
LOG_UI
(
PDCP
,
"Before rlc_data_req 1, srb_flagP: %d, rb_idP: %d
\n
"
,
srb_flagP
,
rb_idP
);
}
#ifndef UETARGET
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_eNB_CU
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_ng_eNB_CU
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_gNB_CU
)
{
...
...
@@ -197,7 +200,9 @@ boolean_t pdcp_data_req(
/* assume good status */
rlc_status
=
RLC_OP_STATUS_OK
;
}
else
{
}
else
#endif
{
rlc_status
=
rlc_data_req
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_YES
,
rb_idP
,
muiP
,
confirmP
,
sdu_buffer_sizeP
,
pdcp_pdu_p
,
NULL
,
NULL
...
...
@@ -368,6 +373,7 @@ boolean_t pdcp_data_req(
LOG_D
(
PDCP
,
"pdcp data req on drb %d, size %d, rnti %x, node_type %d
\n
"
,
rb_idP
,
pdcp_pdu_size
,
ctxt_pP
->
rnti
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
);
#ifndef UETARGET
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_eNB_CU
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_ng_eNB_CU
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_gNB_CU
)
{
...
...
@@ -384,9 +390,9 @@ boolean_t pdcp_data_req(
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_gNB_DU
){
LOG_E
(
PDCP
,
"Can't be DU, bad node type %d
\n
"
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
);
ret
=
FALSE
;
}
else
{
}
else
#endif
{
rlc_status
=
rlc_data_req
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
,
sourceL2Id
,
destinationL2Id
...
...
@@ -418,8 +424,6 @@ boolean_t pdcp_data_req(
break
;
}
// switch case
}
/* end if node_type is CU */
rlc_status
=
ack_result
;
}
else
// SRB
{
...
...
openair2/LAYER2/RLC/rlc.c
View file @
56af9c60
...
...
@@ -625,6 +625,7 @@ void rlc_data_ind (
F1AP_UL_RRC_MESSAGE
(
msg
).
rrc_container_length
=
sdu_sizeP
;
itti_send_msg_to_task
(
TASK_DU_F1
,
ENB_MODULE_ID_TO_INSTANCE
(
ctxt_pP
->
module_id
),
msg
);
}
#ifndef UETARGET
else
proto_agent_send_pdcp_data_ind
(
ctxt_pP
,
...
...
@@ -633,6 +634,7 @@ void rlc_data_ind (
rb_idP
,
sdu_sizeP
,
sdu_pP
);
#endif
break
;
...
...
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