maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into bugfix-48-L1L2signaling

Browse Source 
Conflicts:
	targets/ARCH/COMMON/common_lib.c
	targets/RT/USER/lte-softmodem.c
This commit is contained in:
gauthier
2015-12-16 11:12:28 +01:00
parent 33860c1604 37d7fa8d30
commit ede2152862
70 changed files with 8031 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/COMMON/common_lib.c
+2 -1
View File
@@ -53,7 +53,8 @@ int openair0_device_init(openair0_device *device, openair0_config_t *openair0_cf
printf("openair0_dev_init_exmimo...\n");
return(openair0_dev_init_exmimo(device, openair0_cfg));
#elif OAI_USRP
device->type=USRP_IF;
device->type=USRP_B200_IF;
openair0_dev_init_usrp(device, openair0_cfg);
printf("openair0_dev_init_usrp ...\n");
return(openair0_dev_init_usrp(device, openair0_cfg));