Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration

Conflicts:
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
This commit is contained in:
Raymond Knopp
2019-12-04 16:55:16 +01:00
34 changed files with 711 additions and 466 deletions
+1 -1
View File
@@ -112,7 +112,7 @@ typedef struct {
typedef struct {
uint8_t Mod_id;
int CC_id;
nfapi_nr_config_request_t *cfg;
nfapi_nr_config_request_scf_t *cfg;
} NR_PHY_Config_t;
typedef struct NR_IF_Module_s {