added Nexus-Computing OsciPrime firmware

diff --git a/Makefile.am b/Makefile.am
index 3e9dec7d87ceb61b0ccfd382ddf547e70334226d..eda7ddb162f43d40f6f2c3c705351aa79716c7e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@
 ## This file is part of the sigrok project.
 ##
 ## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
 ##
 ## 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
@@ -20,7 +21,7 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = asix-sigma
+SUBDIRS = asix-sigma nexus-osciprime
 
 MAINTAINERCLEANFILES = ChangeLog
 

diff --git a/autogen.sh b/autogen.sh
index a910269c6b69eea2f2f74f81fa5bfc9bb52f8589..577ccb9a1ff735e54bf9f2bfffcbfa2bae427cda 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,7 @@
 ## This file is part of the sigrok project.
 ##
 ## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
 ##
 ## 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
@@ -49,7 +50,7 @@ elif [ "x$OS" = "xMINGW32_NT-6.1" ]; then
 fi
 
 echo "Generating build system..."
-mkdir autostuff
+mkdir -p autostuff
 aclocal ${ACLOCAL_DIR} || exit 1
 autoheader || exit 1
 automake --add-missing --copy --foreign || exit 1

diff --git a/configure.ac b/configure.ac
index ae466c9cbdebcbf0a770b101bcab8cd5127248b8..fcbae2a650477c1a07bda8c1ba662cab2c3394b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_SUBST(MAKEFLAGS, '--no-print-directory')
 
 AC_CONFIG_FILES([Makefile
                 asix-sigma/Makefile
+                nexus-osciprime/Makefile
                ])
 
 AC_OUTPUT

diff --git a/nexus-osciprime/COPYING b/nexus-osciprime/COPYING
new file mode 100644 (file)
index 0000000..f264bfd
--- /dev/null
+++ b/nexus-osciprime/COPYING
@@ -0,0 +1,6 @@
+The firmware in this directory is intended for use on a Cypress FX2LP on
+a Nexus Computing OsciPrime oscilloscope. The source code is available under
+the terms of the GPLv2. For further information, see:
+
+       http://www.osciprime.com/
+

diff --git a/nexus-osciprime/Makefile.am b/nexus-osciprime/Makefile.am
new file mode 100644 (file)
index 0000000..a4e91dc
--- /dev/null
+++ b/nexus-osciprime/Makefile.am
@@ -0,0 +1,24 @@
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+##
+## 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 of the License, 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; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+dist_pkgdata_DATA = nexus-osciprime.fw
+
+EXTRA_DIST = COPYING
+

diff --git a/nexus-osciprime/nexus-osciprime.fw b/nexus-osciprime/nexus-osciprime.fw
new file mode 100644 (file)
index 0000000..5bcbc6f
Binary files /dev/null and b/nexus-osciprime/nexus-osciprime.fw differ