Merge remote-tracking branch 'origin/develop' into enhancement-74-SoDeRa

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/COMMON/common_lib.h
	targets/RT/USER/lte-softmodem.c
This commit is contained in:
kaltenbe
2016-02-16 15:45:12 +01:00
38 changed files with 4605 additions and 1561 deletions
@@ -812,11 +812,15 @@ void trx_lms_end(openair0_device *device) {
}
int openair0_dev_init_lms(openair0_device *device, openair0_config_t *openair0_cfg){
extern "C" {
/*! \brief Initialize Openair LMSSDR target. It returns 0 if OK
* \param device the hardware to use
* \param openair0_cfg RF frontend parameters set by application
*/
int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
printf("LMSSDR: Initializing openair0_device for %s ...\n", ((device->func_type == BBU_FUNC) ? "BBU": "RRH"));
printf("LMSSDR: Initializing openair0_device for %s ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"));
switch ((int)openair0_cfg[0].sample_rate) {
case 30720000:
@@ -872,3 +876,4 @@ int openair0_dev_init_lms(openair0_device *device, openair0_config_t *openair0_c
return 0;
}
}