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
9b96543c
Commit
9b96543c
authored
Feb 22, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use diff files and 'patch' instead of copying full files.
parent
7a50a276
Changes
13
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
85 additions
and
3101 deletions
+85
-3101
cmake_targets/tools/fix_asn1
cmake_targets/tools/fix_asn1
+23
-23
cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h
.../tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h
+0
-109
cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
...s/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
+23
-0
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c
..._targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c
+0
-412
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff
...ets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff
+8
-0
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c
..._targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c
+0
-1041
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff
...ets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff
+4
-0
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c
..._targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c
+0
-412
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff
...ets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff
+8
-0
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h
...1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h
+0
-63
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
...a/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
+15
-0
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c
..._targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c
+0
-1041
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff
...ets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff
+4
-0
No files found.
cmake_targets/tools/fix_asn1
View file @
9b96543c
#!/bin/bash
#!/bin/bash
# in those arrays, each line is:
# in those arrays, each line is:
# <file> <sha1sum of file> <
replacement
file>
# <file> <sha1sum of file> <
patch to apply to
file>
RRC_Rel10
=(
RRC_Rel10
=(
"SystemInformation-r8-IEs.h"
819eda3db27516f7c6780d832fb3c462e2264ea7
"fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h"
"SystemInformation-r8-IEs.h"
819eda3db27516f7c6780d832fb3c462e2264ea7
"fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h
.diff
"
)
)
X2AP_Rel11_2
=(
X2AP_Rel11_2
=(
"X2ap-CriticalityDiagnostics-IE-List.h"
f0e2414992bfacfbc4b9fd15c977241d6d7fabeb
"fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h"
"X2ap-CriticalityDiagnostics-IE-List.h"
f0e2414992bfacfbc4b9fd15c977241d6d7fabeb
"fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h
.diff
"
"NativeInteger.c"
e23034083a0fb9d4a2e523e2a64286161e621f27
"fix_asn1.data/X2AP.rel11.2/NativeInteger.c"
"NativeInteger.c"
e23034083a0fb9d4a2e523e2a64286161e621f27
"fix_asn1.data/X2AP.rel11.2/NativeInteger.c
.diff
"
"constr_SET_OF.c"
5fb65da648a57ea61f008fa226b707cf343c1c0c
"fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c"
"constr_SET_OF.c"
5fb65da648a57ea61f008fa226b707cf343c1c0c
"fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c
.diff
"
)
)
S1AP_Rel10_5
=(
S1AP_Rel10_5
=(
"NativeInteger.c"
e23034083a0fb9d4a2e523e2a64286161e621f27
"fix_asn1.data/S1AP.rel10.5/NativeInteger.c"
"NativeInteger.c"
e23034083a0fb9d4a2e523e2a64286161e621f27
"fix_asn1.data/S1AP.rel10.5/NativeInteger.c
.diff
"
"constr_SET_OF.c"
5fb65da648a57ea61f008fa226b707cf343c1c0c
"fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c"
"constr_SET_OF.c"
5fb65da648a57ea61f008fa226b707cf343c1c0c
"fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c
.diff
"
)
)
red_color
=
"
\x
1b[31m
"
red_color
=
"
$(
tput setaf 1
)
"
green_color
=
"
\x
1b[32m
"
green_color
=
"
$(
tput setaf 2
)
"
reset_color
=
"
\x
1b[0m
"
reset_color
=
"
$(
tput sgr0
)
"
function
error
()
function
error
()
{
{
...
@@ -46,21 +46,21 @@ function check_sha1()
...
@@ -46,21 +46,21 @@ function check_sha1()
fi
fi
}
}
function
copy
_file
()
function
patch
_file
()
{
{
local
file
=
"
$1
"
local
patch
=
"
$1
"
local
destination
=
"
$2
"
local
file
=
"
$2
"
echo
-e
"
$green_color
""
copy file
$OPENAIR_DIR
/cmake_targets/tools/
$file
to
$destination
""
$reset_color
"
echo
-e
"
$green_color
""
patch file
$file
with
$OPENAIR_DIR
/cmake_targets/tools/
$patch
""
$reset_color
"
cp
-f
"
$OPENAIR_DIR
/cmake_targets/tools/
$file
"
"
$destination
"
patch
"
$file
"
"
$OPENAIR_DIR
/cmake_targets/tools/
$patch
"
if
[
$?
-ne
0
]
if
[
$?
-ne
0
]
then
then
error
"
copy of
$file
to
$destination
failed"
error
"
patching of
$file
with
$OPENAIR_DIR
/cmake_targets/tools/
$patch
failed"
fi
fi
}
}
function
patch
()
function
apply_patches
()
{
{
local
directory
=
"
$1
"
local
directory
=
"
$1
"
local
array
=
$2
local
array
=
$2
...
@@ -69,7 +69,7 @@ function patch()
...
@@ -69,7 +69,7 @@ function patch()
local
i
local
i
local
file
local
file
local
sha1
local
sha1
local
replace
local
patch
local
item
local
item
for
((
i
=
0
;
i <
$len
;
i +
=
3
))
for
((
i
=
0
;
i <
$len
;
i +
=
3
))
...
@@ -77,9 +77,9 @@ function patch()
...
@@ -77,9 +77,9 @@ function patch()
# special bash syntax to access the array
# special bash syntax to access the array
item
=
$array
[
$i
]
;
file
=
${
!item
}
item
=
$array
[
$i
]
;
file
=
${
!item
}
item
=
$array
[
$((
i+1
))
]
;
sha1
=
${
!item
}
item
=
$array
[
$((
i+1
))
]
;
sha1
=
${
!item
}
item
=
$array
[
$((
i+2
))
]
;
replace
=
${
!item
}
item
=
$array
[
$((
i+2
))
]
;
patch
=
${
!item
}
check_sha1
"
$directory
/
$file
"
"
$sha1
"
check_sha1
"
$directory
/
$file
"
"
$sha1
"
copy_file
"
$replace
"
"
$directory
"
patch_file
"
$patch
"
"
$directory
/
$file
"
done
done
}
}
...
@@ -91,7 +91,7 @@ function patch_rrc()
...
@@ -91,7 +91,7 @@ function patch_rrc()
case
"
$version
"
in
case
"
$version
"
in
Rel10
)
Rel10
)
echo
"patching RRC files release 10"
echo
"patching RRC files release 10"
patch
"
$directory
"
RRC_Rel10
${#
RRC_Rel10
[*]
}
apply_patches
"
$directory
"
RRC_Rel10
${#
RRC_Rel10
[*]
}
;;
;;
*
)
*
)
error unknwon/unhandled RRC version
\'
"
$version
"
\'
error unknwon/unhandled RRC version
\'
"
$version
"
\'
...
@@ -107,7 +107,7 @@ function patch_x2ap()
...
@@ -107,7 +107,7 @@ function patch_x2ap()
case
"
$version
"
in
case
"
$version
"
in
R11
)
R11
)
echo
"patching X2AP files release 11.2"
echo
"patching X2AP files release 11.2"
patch
"
$directory
"
X2AP_Rel11_2
${#
X2AP_Rel11_2
[*]
}
apply_patches
"
$directory
"
X2AP_Rel11_2
${#
X2AP_Rel11_2
[*]
}
;;
;;
*
)
*
)
error unknwon/unhandled X2AP version
\'
"
$version
"
\'
error unknwon/unhandled X2AP version
\'
"
$version
"
\'
...
@@ -123,7 +123,7 @@ function patch_s1ap()
...
@@ -123,7 +123,7 @@ function patch_s1ap()
case
"
$version
"
in
case
"
$version
"
in
R10
)
R10
)
echo
"patching S1AP files release 10.5"
echo
"patching S1AP files release 10.5"
patch
"
$directory
"
S1AP_Rel10_5
${#
S1AP_Rel10_5
[*]
}
apply_patches
"
$directory
"
S1AP_Rel10_5
${#
S1AP_Rel10_5
[*]
}
;;
;;
*
)
*
)
error unknwon/unhandled S1AP version
\'
"
$version
"
\'
error unknwon/unhandled S1AP version
\'
"
$version
"
\'
...
...
cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h
deleted
100644 → 0
View file @
7a50a276
/*
* Generated by asn1c-0.9.24 (http://lionet.info/asn1c)
* From ASN.1 module "EUTRA-RRC-Definitions"
* found in "fixed_grammar.asn"
* `asn1c -gen-PER`
*/
#ifndef _SystemInformation_r8_IEs_H_
#define _SystemInformation_r8_IEs_H_
#include <asn_application.h>
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
#include "SystemInformationBlockType2.h"
#include "SystemInformationBlockType3.h"
#include "SystemInformationBlockType4.h"
#include "SystemInformationBlockType5.h"
#include "SystemInformationBlockType6.h"
#include "SystemInformationBlockType7.h"
#include "SystemInformationBlockType8.h"
#include "SystemInformationBlockType9.h"
#include "SystemInformationBlockType10.h"
#include "SystemInformationBlockType11.h"
#include "SystemInformationBlockType12-r9.h"
#include "SystemInformationBlockType13-r9.h"
#include <constr_CHOICE.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
extern
"C"
{
#endif
/* Dependencies */
typedef
enum
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR
{
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_NOTHING
,
/* No components present */
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib2
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib3
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib4
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib5
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib6
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib7
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib8
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib9
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib10
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib11
,
/* Extensions may appear below */
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib12_v920
,
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib13_v920
}
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR
;
/* Forward declarations */
struct
SystemInformation_v8a0_IEs
;
union
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_u
{
SystemInformationBlockType2_t
sib2
;
SystemInformationBlockType3_t
sib3
;
SystemInformationBlockType4_t
sib4
;
SystemInformationBlockType5_t
sib5
;
SystemInformationBlockType6_t
sib6
;
SystemInformationBlockType7_t
sib7
;
SystemInformationBlockType8_t
sib8
;
SystemInformationBlockType9_t
sib9
;
SystemInformationBlockType10_t
sib10
;
SystemInformationBlockType11_t
sib11
;
/*
* This type is extensible,
* possible extensions are below.
*/
SystemInformationBlockType12_r9_t
sib12_v920
;
SystemInformationBlockType13_r9_t
sib13_v920
;
};
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
{
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR
present
;
union
SystemInformation_r8_IEs__sib_TypeAndInfo__Member_u
choice
;
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t
_asn_ctx
;
};
/* SystemInformation-r8-IEs */
typedef
struct
SystemInformation_r8_IEs
{
struct
SystemInformation_r8_IEs__sib_TypeAndInfo
{
A_SEQUENCE_OF
(
struct
SystemInformation_r8_IEs__sib_TypeAndInfo__Member
)
list
;
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t
_asn_ctx
;
}
sib_TypeAndInfo
;
struct
SystemInformation_v8a0_IEs
*
nonCriticalExtension
/* OPTIONAL */
;
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t
_asn_ctx
;
}
SystemInformation_r8_IEs_t
;
/* Implementation */
extern
asn_TYPE_descriptor_t
asn_DEF_SystemInformation_r8_IEs
;
#ifdef __cplusplus
}
#endif
/* Referred external types */
#include "SystemInformation-v8a0-IEs.h"
#endif
/* _SystemInformation_r8_IEs_H_ */
#include <asn_internal.h>
cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
0 → 100644
View file @
9b96543c
57,61d56
< /* SystemInformation-r8-IEs */
< typedef struct SystemInformation_r8_IEs {
< struct SystemInformation_r8_IEs__sib_TypeAndInfo {
< A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
< SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
79c74,78
< } choice;
---
> };
>
> struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
> SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
> union SystemInformation_r8_IEs__sib_TypeAndInfo__Member_u choice;
83c82,87
< } ) list;
---
> };
>
> /* SystemInformation-r8-IEs */
> typedef struct SystemInformation_r8_IEs {
> struct SystemInformation_r8_IEs__sib_TypeAndInfo {
> A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member) list;
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c
deleted
100644 → 0
View file @
7a50a276
This diff is collapsed.
Click to expand it.
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff
0 → 100644
View file @
9b96543c
282c282
< int dynamic = 0;
---
> //int dynamic = 0;
289c289
< dynamic = 1;
---
> //dynamic = 1;
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c
deleted
100644 → 0
View file @
7a50a276
This diff is collapsed.
Click to expand it.
cmake_targets/tools/fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff
0 → 100644
View file @
9b96543c
1007c1007
< (int)nelems, (int)ct ? ct->effective_bits : -1);
---
> (int)nelems, ct ? ct->effective_bits : -1);
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c
deleted
100644 → 0
View file @
7a50a276
This diff is collapsed.
Click to expand it.
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff
0 → 100644
View file @
9b96543c
282c282
< int dynamic = 0;
---
> //int dynamic = 0;
289c289
< dynamic = 1;
---
> //dynamic = 1;
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h
deleted
100644 → 0
View file @
7a50a276
/*
* Generated by asn1c-0.9.24 (http://lionet.info/asn1c)
* From ASN.1 module "X2AP-IEs"
* found in "/roux/comments/openairinterface5g/openair2/X2AP/MESSAGES/ASN1/R11.2/X2AP-IEs.asn"
* `asn1c -gen-PER`
*/
#ifndef _X2ap_CriticalityDiagnostics_IE_List_H_
#define _X2ap_CriticalityDiagnostics_IE_List_H_
#include <asn_application.h>
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
#include "X2ap-Criticality.h"
#include "X2ap-ProtocolIE-ID.h"
#include "X2ap-TypeOfError.h"
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
#ifdef __cplusplus
extern
"C"
{
#endif
/* Forward declarations */
struct
X2ap_IE_Extensions
;
struct
X2ap_CriticalityDiagnostics_IE_List__Member
{
X2ap_Criticality_t
iECriticality
;
X2ap_ProtocolIE_ID_t
iE_ID
;
X2ap_TypeOfError_t
typeOfError
;
struct
X2ap_IE_Extensions
*
iE_Extensions
/* OPTIONAL */
;
/*
* This type is extensible,
* possible extensions are below.
*/
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t
_asn_ctx
;
};
/* X2ap-CriticalityDiagnostics-IE-List */
typedef
struct
X2ap_CriticalityDiagnostics_IE_List
{
A_SEQUENCE_OF
(
struct
X2ap_CriticalityDiagnostics_IE_List__Member
)
list
;
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t
_asn_ctx
;
}
X2ap_CriticalityDiagnostics_IE_List_t
;
/* Implementation */
extern
asn_TYPE_descriptor_t
asn_DEF_X2ap_CriticalityDiagnostics_IE_List
;
#ifdef __cplusplus
}
#endif
/* Referred external types */
#include "X2ap-IE-Extensions.h"
#endif
/* _X2ap_CriticalityDiagnostics_IE_List_H_ */
#include <asn_internal.h>
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
0 → 100644
View file @
9b96543c
29,31c29
< /* X2ap-CriticalityDiagnostics-IE-List */
< typedef struct X2ap_CriticalityDiagnostics_IE_List {
< A_SEQUENCE_OF(struct X2ap_CriticalityDiagnostics_IE_List__Member {
---
> struct X2ap_CriticalityDiagnostics_IE_List__Member {
43c41,46
< } ) list;
---
> };
>
> /* X2ap-CriticalityDiagnostics-IE-List */
> typedef struct X2ap_CriticalityDiagnostics_IE_List {
> A_SEQUENCE_OF(struct X2ap_CriticalityDiagnostics_IE_List__Member
> ) list;
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c
deleted
100644 → 0
View file @
7a50a276
This diff is collapsed.
Click to expand it.
cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff
0 → 100644
View file @
9b96543c
1007c1007
< (int)nelems, (int)ct ? ct->effective_bits : -1);
---
> (int)nelems, ct ? ct->effective_bits : -1);
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