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

Merge remote-tracking branch 'origin/cmake-refactor' into integration_2023_w27

Browse Source
This commit is contained in:
Robert Schmidt
2023-07-08 13:29:55 +02:00
parent 4e18ce02e3 079866bf4f
commit 4ae73af46f
78 changed files with 398 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+1 -1
View File
File diff suppressed because one or more lines are too long
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+2 -8
View File
@@ -41,14 +41,8 @@
#include <stdlib.h>
#include <string.h>
#include <linux/version.h>
#if defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403
#include <lapacke/lapacke_utils.h>
#include <lapacke/lapacke.h>
#else
#include <lapacke_utils.h>
#include <lapacke.h>
#endif
#include <cblas.h>
#include <lapacke_utils.h>
#include <lapacke.h>
#include "linear_preprocessing_rec.h"
//#define DEBUG_MMSE
openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
-5
View File
@@ -14,13 +14,8 @@ data storage. */
#include <cblas.h>
#include <string.h>
#include <linux/version.h>
#if defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796 && RHEL_RELEASE_CODE != 2403
#include <lapacke/lapacke_utils.h>
#include <lapacke/lapacke.h>
#else
#include <lapacke_utils.h>
#include <lapacke.h>
#endif
//#define DEBUG_PREPROC
openair1/PHY/TOOLS/CMakeLists.txt
+7
View File
@@ -29,6 +29,13 @@
#* \warning
#*/
find_library(forms NAMES forms)
if(NOT forms)
message(FATAL_ERROR "required library forms not found for building scopes")
else()
message(STATUS "libforms library, required for scopes, found at ${forms}")
endif()
include_directories ("/usr/include/X11")
add_library(xforms_common OBJECT
lte_phy_scope.c
openair1/PHY/TOOLS/calibration_test.c
+2 -12
View File
@@ -50,7 +50,6 @@ int main(int argc, char **argv) {
int N_RB=50;
int subCarrierFreq=30e3;
int sampling_rate=30.72e6;
int DFT=2048;
int TxAdvanceInDFTSize=12;
@@ -325,17 +324,8 @@ int main(int argc, char **argv) {
while(!oai_exit) {
for (int i=0; i<antennas; i++)
read(fd, samplesTx[i], DFT*sizeof(c16_t));
int readBlockSize = rfdevice.trx_read_func(&rfdevice,
&timestamp,
samplesRx,
DFT,
antennas);
int txs = rfdevice.trx_write_func(&rfdevice,
timestamp+TxAdvanceInDFTSize*DFT,
samplesTx,
DFT,
antennas,
0);
rfdevice.trx_read_func(&rfdevice, &timestamp, samplesRx, DFT, antennas);
rfdevice.trx_write_func(&rfdevice, timestamp + TxAdvanceInDFTSize * DFT, samplesTx, DFT, antennas, 0);
}
return 0;