adding hackrf support

Author: sdr-x

CMakeLists.txt

@@ -50,8 +50,21 @@ FIND_PACKAGE( BLAS REQUIRED )
 FIND_PACKAGE( LAPACK REQUIRED )
 FIND_PACKAGE( FFTW REQUIRED )
 INCLUDE_DIRECTORIES("${FFTW_INCLUDE_DIR}")
+
 FIND_PACKAGE( RTLSDR REQUIRED )
 INCLUDE_DIRECTORIES("${RTLSDR_INCLUDE_DIR}")
+
+FIND_PACKAGE( HACKRF )
+IF ( HACKRF_FOUND )
+  INCLUDE_DIRECTORIES("${HACKRF_INCLUDE_DIR}")
+  MESSAGE(STATUS "Found HACKRF: ${HACKRF_LIBRARIES}")
+  SET( HAVE_HACKRF "HAVE_HACKRF")
+ELSE ( HACKRF_FOUND )
+  MESSAGE(STATUS "HACKRF not found")
+  SET( HAVE_HACKRF "NO_HACKRF")
+ENDIF ( HACKRF_FOUND )
+
+
 FIND_PACKAGE( Curses REQUIRED )
 INCLUDE_DIRECTORIES("${CURSES_INCLUDE_DIR}")
 

cmake/Modules/FindHACKRF.cmake

@@ -0,0 +1,52 @@
+# - Find HACKRF
+# Find the native HACKRF includes and library
+# This module defines
+#  HACKRF_INCLUDE_DIR, where to find rtlsdr.h, etc.
+#  HACKRF_LIBRARIES, the libraries needed to use HACKRF.
+#  HACKRF_FOUND, If false, do not try to use HACKRF.
+# also defined, but not for general use are
+#  HACKRF_LIBRARY, where to find the HACKRF library.
+
+#MESSAGE("HACKRF_DIR set to ${HACKRF_DIR}" )
+
+FIND_PATH(HACKRF_INCLUDE_DIR hackrf.h
+  ${HACKRF_DIR}/include
+  /usr/local/include/libhackrf
+)
+
+FIND_LIBRARY(HACKRF_LIBRARY
+  NAMES hackrf
+  PATHS ${HACKRF_DIR}/libs
+  "${HACKRF_DIR}\\win32\\lib"
+  /usr/pkgs64/lib
+  /usr/lib64
+  /usr/lib
+  /usr/local/lib
+  NO_DEFAULT_PATH
+)
+
+IF (HACKRF_LIBRARY AND HACKRF_INCLUDE_DIR)
+  SET(HACKRF_LIBRARIES ${HACKRF_LIBRARY})
+  SET(HACKRF_FOUND "YES")
+ELSE (HACKRF_LIBRARY AND HACKRF_INCLUDE_DIR)
+  SET(HACKRF_FOUND "NO")
+ENDIF (HACKRF_LIBRARY AND HACKRF_INCLUDE_DIR)
+
+IF (HACKRF_FOUND)
+  IF (NOT HACKRF_FIND_QUIETLY)
+    MESSAGE(STATUS "Found HACKRF: ${HACKRF_LIBRARIES}")
+  ENDIF (NOT HACKRF_FIND_QUIETLY)
+ELSE (HACKRF_FOUND)
+  IF (HACKRF_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find HACKRF library")
+  ENDIF (HACKRF_FIND_REQUIRED)
+ENDIF (HACKRF_FOUND)
+
+# Deprecated declarations.
+GET_FILENAME_COMPONENT (NATIVE_HACKRF_LIB_PATH ${HACKRF_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  HACKRF_LIBRARY
+  HACKRF_INCLUDE_DIR
+)
+

include/capbuf.h

@@ -15,12 +15,34 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#ifdef HAVE_HACKRF
+#include "hackrf.h"
+#else
+typedef struct hackrf_device hackrf_device;
+#endif
+
 #ifndef HAVE_CAPBUF_H
 #define HAVE_CAPBUF_H
 
 // Number of complex samples to capture.
 #define CAPLENGTH 153600
 
+
+typedef struct {
+  std::vector <unsigned char> * buf;
+  rtlsdr_dev_t * dev;
+} callback_package_t;
+
+#ifdef HAVE_HACKRF
+
+typedef struct {
+  std::vector <unsigned char> * buf;
+  hackrf_device * dev;
+} callback_hackrf_package_t;
+
+#endif
+
 double calculate_fc_programmed_in_context(
   // Inputs
   const double & fc_requested,
@@ -51,6 +73,8 @@ int capture_data(
   const char * load_bin_filename,
   const std::string & str,
   rtlsdr_dev_t * & dev,
+  hackrf_device * & hackrf_dev,
+  const dev_type_t::dev_type_t & dev_use,
   // Output
   itpp::cvec & capbuf,
   double & fc_programmed,

include/common.h.in

@@ -3,6 +3,8 @@
 
 #define @USE_OPENCL@
 
+#define @HAVE_HACKRF@
+
 // This is filled in by cmake
 #define MAJOR_VERSION @CellSearch_MAJOR_VERSION@
 #define MINOR_VERSION @CellSearch_MINOR_VERSION@
@@ -47,6 +49,11 @@ typedef std::vector < std::vector < float > > vf2d;
 
 // Some enums must be enclosed in their own namespace because their
 // names conflict with each other and also with ITPP declared enums.
+
+namespace dev_type_t {
+  enum dev_type_t { UNKNOWN = -4321, RTLSDR=9832, HACKRF=432134 };
+}
+
 namespace cp_type_t {
   enum cp_type_t { UNKNOWN = 0, NORMAL, EXTENDED };
 }

src/CMakeLists.txt

@@ -1,11 +1,19 @@
 # Create a library of all the shared functions.
 add_library(LTE_MISC capbuf.cpp constants.cpp itpp_ext.cpp macros.cpp searcher.cpp common.cpp dsp.cpp lte_lib.cpp from_osmocom.cpp)
 
-IF ( OPENCL_FOUND )
-  SET (common_link_libs ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${RTLSDR_LIBRARIES} ${CURSES_LIBRARIES} ${OPENCL_LIBRARIES})
-ELSE ( OPENCL_FOUND )
-  SET (common_link_libs ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${RTLSDR_LIBRARIES} ${CURSES_LIBRARIES})
-ENDIF ( OPENCL_FOUND )
+IF ( HACKRF_FOUND )
+  IF ( OPENCL_FOUND )
+    SET (common_link_libs ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${RTLSDR_LIBRARIES} ${HACKRF_LIBRARIES} ${CURSES_LIBRARIES} ${OPENCL_LIBRARIES})
+  ELSE ( OPENCL_FOUND )
+    SET (common_link_libs ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${RTLSDR_LIBRARIES} ${HACKRF_LIBRARIES} ${CURSES_LIBRARIES})
+  ENDIF ( OPENCL_FOUND )
+ELSE ( HACKRF_FOUND )
+  IF ( OPENCL_FOUND )
+    SET (common_link_libs ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${RTLSDR_LIBRARIES} ${CURSES_LIBRARIES} ${OPENCL_LIBRARIES})
+  ELSE ( OPENCL_FOUND )
+    SET (common_link_libs ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${RTLSDR_LIBRARIES} ${CURSES_LIBRARIES})
+  ENDIF ( OPENCL_FOUND )
+ENDIF ( HACKRF_FOUND )
 
 # Create the cell search executable
 ADD_EXECUTABLE (CellSearch CellSearch.cpp)