Commit Graph
2626 Commits
Author SHA1 Message Date
Cedric Roux d89dbb4882 Merge remote-tracking branch 'origin/feature-s1ap-r14-based-on-new-asn1c' into develop_integration_2018_w29
Conflicts:
	targets/SIMU/PROC/channel_sim_proc.c
	targets/SIMU/USER/oaisim_pad.c
2018-07-20 12:10:15 +02:00
Cedric Roux c836ef28f4 Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/UTIL/LOG/log.c
	targets/RT/USER/lte-uesoftmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
2018-07-20 12:06:26 +02:00
WEI-TAI CHEN 66e4dc7169 LTE eNB RRC update to Rel15 2018-07-20 01:55:57 -07:00
Calvin HSU 33bd476c85 UE: Fixed mac/ue_procedures 2018-07-19 18:27:50 +02:00
hongzhi wang 3a5f22d99d UE: add MAC and RRC instance initialization 2018-07-19 17:37:36 +02:00
WEI-TAI CHEN 9b1c03d10e -Update LTE RRC ASN to Rel15, but there is a parameter that does not meet the specifications since I modify asn file.
-I modify the name of the parameter "maxRS-IndexCellQual-r15" to "maxRS-IndexCellQualNR-r15" in structure,
 otherwise it will be conflict with the Macro define "#define maxRS_IndexCellQual_r15 (16)" in asn1_constant.h
2018-07-19 07:17:01 -07:00
WEI-TAI CHEN a487b71bd7 Update RRC .asn to f21 2018-07-18 01:22:35 -07:00
Calvin HSU 04a0fa5831 UE: linked IF module, ready for testing 2018-07-17 14:33:55 +02:00
Calvin HSU c7b297cf68 UE: modify pdcch config common, config_ue.c to compatiable RRC setup/release mechanism
deleted files not use
2018-07-16 17:16:29 +02:00
Calvin HSU 3e32b94f02 UE: add IF module initialization in nr-ue.c
update author contact information
2018-07-16 15:35:23 +02:00
Raymond Knopp 3539761c28 Log review step 1: legacy VCD removal, LOG macro modified, TTracer enabled at build time by default, in a way it, by default configuration, provides console logs, as in previous versions 2018-07-13 16:43:34 +02:00
WEI-TAI CHEN 754c92d4e2 signature 2018-07-13 02:02:08 -07:00
Haruki NAOI eb030b6a29 fix: compile error using "--mu" build option. 2018-07-13 14:53:14 +09:00
Haruki NAOI b033317286 Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1
# Conflicts:
#	openair2/UTIL/LOG/log.c
2018-07-13 14:13:10 +09:00
Bi-Ruei, Chiu 0071fb6173 Add ASN files of LTE-RRC, S1AP and X2AP of 2018 Jun release 2018-07-13 10:04:46 +08:00
Bi-Ruei, Chiu a247907d3a Use an un-official community collaboration version of asn1c
1. It's no need to modify LTE-RRC's ASN.1 file for enabling option group
   feature in generate_asn1.
2. It's no need to patch the C header files generated from
   LTE-RRC/S1AP/X2AP's ASN.1 in fix_asn1.
3. It's no need to pre-process S1AP/X2AP's ASN.1 for enabling information
   object class feature by asn1tostruct.py.

This commit requires an un-official version of asn1c which are
collaboration of asn1c community members and `build_helper` is modified
in this commit accordingly :

  https://github.com/brchiu/asn1c/tree/velichkov_s1ap_plus_option_group

This asn1c can also convert ASN.1 of 5G NR RRC (38.331, v15.1.0) and
generate C files with -findirect-choice command line option without
tweaking ASN.1 file.

Examples for how to use this asn1c for S1AP are in S1AP files, e.g.
s1ap_eNB_nas_procedures.c and s1ap_eNB_handler.c.

There is an modified openair-cn (based on tag 0.5.0) with this new asn1c at :

  https://github.com/brchiu/openair-cn/tree/new-asn1c

Basic S1AP interaction and data transfer operation between OAI eNB and
this modified openair-cn has been tested.

Note: Community version of asn1c is keeping evolved to provide better usage.
2018-07-13 10:04:46 +08:00
WEI-TAI CHEN 48f721bf6e Merge remote-tracking branch 'origin/develop-nr' into nr-rrc-additions 2018-07-12 02:23:38 -07:00
WEI-TAI CHEN c360601735 fix error and warning 2018-07-12 02:10:56 -07:00
WEI-TAI CHEN e8e8c877b1 Fix warning in upper layer 2018-07-12 01:12:20 -07:00
WEI-TAI CHEN fb38d1ae95 fix warning for MIB 2018-07-12 00:54:47 -07:00
WEI-TAI CHEN 8c0b196f21 Fix the BIT STRING ERROR problem in MIB 2018-07-12 00:49:40 -07:00
Bi-Ruei, Chiu df1e5b21c8 Change 'RRC/LITE' to 'RRC/LTE' 2018-07-12 15:33:31 +08:00
WEI-TAI CHEN 2b3818ce60 Solve undeclared 2018-07-11 08:16:58 -07:00
WEI-TAI CHEN 2077defc24 slove conflict 2018-07-11 07:25:36 -07:00
WEI-TAI CHEN bb293b7742 In NR,systemFrameNumber : 10 bits, MIB carry 6 bit MSB 2018-07-11 07:22:18 -07:00
Raphael Defosseux 3c3e928fb6 Merge remote-tracking branch 'origin/develop' into issue324_gccwarnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-07-11 15:01:41 +02:00
Raphael Defosseux e8ea2f10cc Merge branch 'remove_wrong_prototypes_rlc_pdcp' into 'develop'
Remove wrong prototypes rlc pdcp

See merge request oai/openairinterface5g!338
2018-07-11 14:19:09 +02:00
Raymond Knopp 0d4b7069d8 Testing MIB ASN1 encoder fail 2018-07-11 13:17:49 +02:00
Guy De Souza 8a6260d40a Merge branch 'nr-rrc-additions' into develop-nr 2018-07-11 10:37:45 +02:00
WEI-TAI CHEN 7cbc0dc18e fix some warning 2018-07-10 15:48:30 -07:00
Calvin HSU cf3682e3f1 Fixed error during build procedure 2018-07-10 19:38:47 +02:00
WEI-TAI CHEN b0bc5e65e2 merge develop-nr 2018-07-10 08:57:08 -07:00
WEI-TAI CHEN f95989e7e2 Adding function NR_UL_indication 2018-07-10 07:02:07 -07:00
Guy De Souza bedee9e37c RRC branch merge fix 2018-07-10 14:50:16 +02:00
WEI-TAI CHEN b5a55ba93b In NR_UL_indication function call gNB_dlsch_ulsch_scheduler 2018-07-10 03:25:36 -07:00
WEI-TAI CHEN b7de9abb04 merge nr-develop 2018-07-10 01:45:04 -07:00
WEI-TAI CHEN 26d61373ba gNB_scheduler in testing not complete yet 2018-07-10 01:35:39 -07:00
Calvin HSU d5234dd1fd add P5 config request message for MIB config, system_frame_number, ssb_subcarrier_offset and half_frame_bit
add gitignore for ignoring log, bin, ran_build folders
2018-07-09 16:50:33 +02:00
WEI-TAI CHEN 2070c982e7 Adding the NR MIB scheduler in eNB_ulsch_dlsch_scheduler, re-use LTE MAC 2018-07-09 04:27:26 -07:00
oai 719762ccab fix basic_simulator compilation failure 2018-07-06 15:30:02 +02:00
Calvin HSU 4a05841325 ue add IF module, calculation of system frame and ssb_index 2018-07-06 10:49:58 +02:00
Raymond Knopp 494348e2f0 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-07-06 06:24:31 +02:00
oai bfecc0110b Remove compilation warnings, also fix telnet server compilation failure and NB-IoT shared lib compilation failure introduced when reviewing L1 sources organization 2018-07-05 17:37:38 +02:00
Haruki NAOI 823c838d21 Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1 2018-07-05 11:15:30 +09:00
Raphael Defosseux f3b5f5433c Merge branch 'develop' into '322-code-cleanup-log_m-to-replace-write_output'
# Conflicts:
#   openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
2018-07-03 15:48:19 +02:00
laurent d9bf7c8c6b fix in megre 2018-07-03 15:42:26 +02:00
laurent 912e579100 merge with others 2018-07-03 15:31:29 +02:00
laurent d76ac32759 remove public/protected macros in lists, mem_blocks 2018-07-03 14:54:55 +02:00
laurent 45599fe4a2 full remove of prototype macros in rlc and dpcp 2018-07-03 13:50:59 +02:00
laurent fcd4aba0de after correct compile 2018-07-03 12:56:20 +02:00