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
lizhongxiao
OpenXG-RAN
Commits
2a1e7b73
Commit
2a1e7b73
authored
3 years ago
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix gcc warnings, hardcode gtpu debug level for ci debug
parent
c739058c
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
71 deletions
+49
-71
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
+0
-1
openair2/F1AP/f1ap_du_task.c
openair2/F1AP/f1ap_du_task.c
+1
-12
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+3
-18
openair3/ocp-gtpu/gtp_itf.cpp
openair3/ocp-gtpu/gtp_itf.cpp
+45
-40
No files found.
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
View file @
2a1e7b73
...
...
@@ -68,7 +68,6 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance,
/* GNB_DU_UE_F1AP_ID */
F1AP_FIND_PROTOCOLIE_BY_ID
(
F1AP_InitialULRRCMessageTransferIEs_t
,
ie
,
container
,
F1AP_ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID
,
true
);
instance_t
du_ue_f1ap_id
=
ie
->
value
.
choice
.
GNB_DU_UE_F1AP_ID
;
/* NRCGI
* Fixme: process NRCGI
*/
...
...
This diff is collapsed.
Click to expand it.
openair2/F1AP/f1ap_du_task.c
View file @
2a1e7b73
...
...
@@ -90,18 +90,7 @@ void du_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
tmp
=
&
RC
.
nrmac
[
instance
]
->
eth_params_n
;
else
tmp
=
&
RC
.
mac
[
instance
]
->
eth_params_n
;
const
cudu_params_t
params
=
{
.
local_ipv4_address
=
tmp
->
my_addr
,
.
local_port
=
tmp
->
my_portd
,
.
remote_ipv4_address
=
tmp
->
remote_addr
,
.
remote_port
=
tmp
->
remote_portd
};
/*
if (!RC.nrrrc)
AssertFatal(proto_agent_start(instance, ¶ms) == 0,
"could not start PROTO_AGENT for F1U on instance %ld!\n", instance);
*/
DU_send_F1_SETUP_REQUEST
(
instance
);
}
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
2a1e7b73
...
...
@@ -153,15 +153,6 @@ typedef struct xer_sprint_string_s {
size_t
string_index
;
}
xer_sprint_string_t
;
#define asn1cCallocOne(VaR, VaLue) \
VaR = calloc(1,sizeof(*VaR)); *VaR=VaLue;
#define asn1cCalloc(VaR, lOcPtr) \
typeof(VaR) lOcPtr = VaR = calloc(1,sizeof(*VaR));
#define asn1cSequenceAdd(VaR, TyPe, lOcPtr) \
TyPe *lOcPtr= calloc(1,sizeof(TyPe)); \
ASN_SEQUENCE_ADD(&VaR,lOcPtr);
//replace LTE
//extern unsigned char NB_eNB_INST;
extern
unsigned
char
NB_gNB_INST
;
...
...
@@ -310,9 +301,6 @@ uint8_t do_MIB_NR(gNB_RRC_INST *rrc,uint32_t frame) {
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
#define asn1cCalloc(VaR, TyPe, lOcPtr) TyPe *lOcPtr=VaR=(TyPe*) calloc(1,sizeof(TyPe));
#define asn1cCallocOne(VaR, VaLue) VaR=calloc(1,sizeof(*VaR)); *VaR=VaLue;
#define asn1cSequenceAdd(VaR, TyPe, lOcPtr) TyPe *lOcPtr=(TyPe*) calloc(1,sizeof(TyPe)); ASN_SEQUENCE_ADD(&VaR,lOcPtr);
uint8_t
do_SIB1_NR
(
rrc_gNB_carrier_data_t
*
carrier
,
gNB_RrcConfigurationReq
*
configuration
...
...
@@ -342,7 +330,7 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
asn1cSequenceAdd
(
sib1
->
cellAccessRelatedInfo
.
plmn_IdentityList
.
list
,
struct
NR_PLMN_IdentityInfo
,
nr_plmn_info
);
for
(
int
i
=
0
;
i
<
num_plmn
;
++
i
)
{
asn1cSequenceAdd
(
nr_plmn_info
->
plmn_IdentityList
.
list
,
struct
NR_PLMN_Identity
,
nr_plmn
);
asn1cCalloc
(
nr_plmn
->
mcc
,
struct
NR_MCC
,
mcc
);
asn1cCalloc
(
nr_plmn
->
mcc
,
mcc
);
int
confMcc
=
configuration
->
mcc
[
i
];
asn1cSequenceAdd
(
mcc
->
list
,
NR_MCC_MNC_Digit_t
,
mcc0
);
*
mcc0
=
(
confMcc
/
100
)
%
10
;
...
...
@@ -411,8 +399,7 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
ASN_SEQUENCE_ADD(&sib1->si_SchedulingInfo->schedulingInfoList.list,schedulingInfo);*/
// servingCellConfigCommon
asn1cCalloc
(
sib1
->
servingCellConfigCommon
,
struct
NR_ServingCellConfigCommonSIB
,
ServCellCom
);
asn1cCalloc
(
sib1
->
servingCellConfigCommon
,
ServCellCom
);
NR_BWP_DownlinkCommon_t
*
initialDownlinkBWP
=&
ServCellCom
->
downlinkConfigCommon
.
initialDownlinkBWP
;
initialDownlinkBWP
->
genericParameters
=
configuration
->
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
;
...
...
@@ -547,19 +534,17 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
ServCellCom
->
downlinkConfigCommon
.
pcch_Config
.
ns
=
NR_PCCH_Config__ns_one
;
asn1cCalloc
(
ServCellCom
->
downlinkConfigCommon
.
pcch_Config
.
firstPDCCH_MonitoringOccasionOfPO
,
struct
NR_PCCH_Config__firstPDCCH_MonitoringOccasionOfPO
,
P0
);
P0
->
present
=
NR_PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_sCS120KHZoneT_SCS60KHZhalfT_SCS30KHZquarterT_SCS15KHZoneEighthT
;
asn1cCalloc
(
P0
->
choice
.
sCS120KHZoneT_SCS60KHZhalfT_SCS30KHZquarterT_SCS15KHZoneEighthT
,
struct
NR_PCCH_Config__firstPDCCH_MonitoringOccasionOfPO__sCS120KHZoneT_SCS60KHZhalfT_SCS30KHZquarterT_SCS15KHZoneEighthT
,
Z8
);
asn1cSequenceAdd
(
Z8
->
list
,
long
,
ZoneEight
);
asn1cCallocOne
(
ZoneEight
,
0
);
asn1cCalloc
(
ServCellCom
->
uplinkConfigCommon
,
struct
NR_UplinkConfigCommonSIB
,
UL
)
asn1cCalloc
(
ServCellCom
->
uplinkConfigCommon
,
UL
)
asn_set_empty
(
&
UL
->
frequencyInfoUL
.
scs_SpecificCarrierList
.
list
);
for
(
int
i
=
0
;
i
<
configuration
->
scc
->
uplinkConfigCommon
->
frequencyInfoUL
->
scs_SpecificCarrierList
.
list
.
count
;
i
++
)
{
ASN_SEQUENCE_ADD
(
&
UL
->
frequencyInfoUL
.
scs_SpecificCarrierList
.
list
,
...
...
This diff is collapsed.
Click to expand it.
openair3/ocp-gtpu/gtp_itf.cpp
View file @
2a1e7b73
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