Merge pull request #50 from TitanMKD/master

New license BSD 3-Clause License for libhackrf and moved examples to hackrf-tools

host/hackrf-tools/CMakeLists.txt

@@ -0,0 +1,43 @@
+# Copyright 2012 Jared Boone
+#
+# This file is part of HackRF.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+# Based heavily upon the libftdi cmake setup.
+
+project(hackrf-tools)
+set(MAJOR_VERSION 0)
+set(MINOR_VERSION 1)
+set(PACKAGE hackrf-tools)
+set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
+set(VERSION ${VERSION_STRING})
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+
+cmake_minimum_required(VERSION 2.8)
+
+add_definitions(-Wall)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+
+find_package(USB1 REQUIRED)
+include_directories(${LIBUSB_INCLUDE_DIR})
+
+include_directories(${CMAKE_SOURCE_DIR}/../libhackrf/src)
+link_directories(${CMAKE_SOURCE_DIR}/../libhackrf/src)
+
+add_subdirectory(src)

host/hackrf-tools/FindUSB1.cmake

@@ -0,0 +1,38 @@
+# - Try to find the freetype library
+# Once done this defines
+#
+#  LIBUSB_FOUND - system has libusb
+#  LIBUSB_INCLUDE_DIR - the libusb include directory
+#  LIBUSB_LIBRARIES - Link these to use libusb
+
+# Copyright (c) 2006, 2008  Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+
+  # in cache already
+  set(LIBUSB_FOUND TRUE)
+
+else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+  IF (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_LIBUSB libusb-1.0)
+  ENDIF(NOT WIN32)
+
+  FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
+    PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
+
+  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
+    PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)
+
+  MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+
+endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)

host/hackrf-tools/Readme.md

@@ -0,0 +1,34 @@
+This repository contains hardware designs and software for HackRF, a project to
+produce a low cost, open source software radio platform.
+
+![Jawbreaker](https://raw.github.com/mossmann/hackrf/master/doc/jawbreaker.jpeg)
+
+How to build host software on Windows:
+prerequisite for cygwin or mingw:
+* cmake-2.8.10.2 or more see http://www.cmake.org/cmake/resources/software.html
+* libusbx-1.0.14 or more see http://sourceforge.net/projects/libusbx/files/latest/download?source=files
+* Install Windows driver for HackRF hardware or use Zadig see http://sourceforge.net/projects/libwdi/files/zadig
+  - If you want to use Zadig  select HackRF USB device and just install/replace it with WinUSB driver.
+* Build libhackrf before to build this library, see host/libhackrf/Readme.md.
+  
+For Cygwin:
+cmake -G "Unix Makefiles" -DCMAKE_LEGACY_CYGWIN_WIN32=1 -DLIBUSB_INCLUDE_DIR=/usr/local/include/libusb-1.0/
+make
+make install
+
+For Mingw:
+#normal version
+cmake -G "MSYS Makefiles" -DLIBUSB_INCLUDE_DIR=/usr/local/include/libusb-1.0/
+#debug version
+cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DLIBUSB_INCLUDE_DIR=/usr/local/include/libusb-1.0/
+make
+make install
+
+How to build host software on Linux:
+cmake ./
+make
+make install
+
+principal author: Michael Ossmann <mike@ossmann.com>
+
+http://greatscottgadgets.com/hackrf/

host/hackrf-tools/src/CMakeLists.txt

@@ -40,5 +40,5 @@ IF( EXAMPLES )
    target_link_libraries(hackrf_cpldjtag hackrf)
    target_link_libraries(hackrf_info hackrf)
    
-   include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)
+   include_directories(BEFORE ${CMAKE_SOURCE_DIR}/../libhackrf/src)
 endif(EXAMPLES)

host/libhackrf/CMakeLists.txt

@@ -38,5 +38,4 @@ find_package(USB1 REQUIRED)
 include_directories(${LIBUSB_INCLUDE_DIR})
 
 add_subdirectory(src)
-add_subdirectory(examples)
 

host/libhackrf/src/CMakeLists.txt

@@ -1,24 +1,25 @@
-# Copyright 2012 Jared Boone
-# Copyright 2013 Benjamin Vernoux
 #
-# This file is part of HackRF.
+# Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
+# Copyright (c) 2013, Benjamin Vernoux <titanmkd@gmail.com>
+# Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
 # 
-# This program is free software; you can redistribute it and/or modify
+# All rights reserved.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
 # 
-# This program is distributed in the hope that it will be useful,
+# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
+#     Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-# along with this program; see the file COPYING.  If not, write to
+#     Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
-# the Free Software Foundation, Inc., 51 Franklin Street,
+# 	documentation and/or other materials provided with the distribution.
-# Boston, MA 02110-1301, USA.
+#     Neither the name of Great Scott Gadgets nor the names of its contributors may be used to endorse or promote products derived from this software
+# 	without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-
 # Based heavily upon the libftdi cmake setup.
 
 # Targets

host/libhackrf/src/hackrf.c

@@ -1,24 +1,25 @@
 /*
- * Copyright 2012 Jared Boone <jared@sharebrained.com>
+Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
- * Copyright 2013 Benjamin Vernoux <titanmkd@gmail.com>
+Copyright (c) 2013, Benjamin Vernoux <titanmkd@gmail.com>
- *
+Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
- * This file is part of HackRF.
+
- *
+All rights reserved.
- * This program is free software; you can redistribute it and/or modify
+
- * it under the terms of the GNU General Public License as published by
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- * the Free Software Foundation; either version 2, or (at your option)
+
- * any later version.
+    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- *
+    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
- * This program is distributed in the hope that it will be useful,
+	documentation and/or other materials provided with the distribution.
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+    Neither the name of Great Scott Gadgets nor the names of its contributors may be used to endorse or promote products derived from this software
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	without specific prior written permission.
- * GNU General Public License for more details.
+
- *
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * You should have received a copy of the GNU General Public License
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * along with this program; see the file COPYING.  If not, write to
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * the Free Software Foundation, Inc., 51 Franklin Street,
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * Boston, MA 02110-1301, USA.
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- */
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 #include "hackrf.h"
 

host/libhackrf/src/hackrf.h

@@ -1,24 +1,25 @@
 /*
- * Copyright 2012 Jared Boone <jared@sharebrained.com>
+Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
- * Copyright 2013 Benjamin Vernoux <titanmkd@gmail.com>
+Copyright (c) 2013, Benjamin Vernoux <titanmkd@gmail.com>
- *
+Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
- * This file is part of HackRF.
+
- *
+All rights reserved.
- * This program is free software; you can redistribute it and/or modify
+
- * it under the terms of the GNU General Public License as published by
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- * the Free Software Foundation; either version 2, or (at your option)
+
- * any later version.
+    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- *
+    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
- * This program is distributed in the hope that it will be useful,
+	documentation and/or other materials provided with the distribution.
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+    Neither the name of Great Scott Gadgets nor the names of its contributors may be used to endorse or promote products derived from this software
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	without specific prior written permission.
- * GNU General Public License for more details.
+
- *
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * You should have received a copy of the GNU General Public License
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * along with this program; see the file COPYING.  If not, write to
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * the Free Software Foundation, Inc., 51 Franklin Street,
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * Boston, MA 02110-1301, USA.
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- */
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 #ifndef __HACKRF_H__
 #define __HACKRF_H__