Unhook the Link Instruments MSO-19 from the build for now.

This driver is neither working nor has it been in a compiling state for
a long time, so unhook it from the build until it is fixed and works.

The files (api.c and protocol.[ch]) are still in git, but won't end up in
released tarballs and they don't get built (neither git nor tarballs).

This also allows us to drop the otherwise unneeded dependency on libudev.
When the MSO-19 driver comes back, it should be in a form that doesn't
require the inherently Linux-only libudev anyway. See also:
http://sigrok.org/bugzilla/show_bug.cgi?id=65

diff --git a/Makefile.am b/Makefile.am
index 173e3adfad0bf59f33f4ab998963c52f83fedd52..0bda21322898bc43dad4799f1327fe565e035eba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,12 +222,6 @@ libsigrok_la_SOURCES += \
        hardware/lascar-el-usb/protocol.c \
        hardware/lascar-el-usb/api.c
 endif
-if HW_LINK_MSO19
-libsigrok_la_SOURCES += \
-       hardware/link-mso19/protocol.h \
-       hardware/link-mso19/protocol.c \
-       hardware/link-mso19/api.c
-endif
 if HW_MIC_985XX
 libsigrok_la_SOURCES += \
        hardware/mic-985xx/protocol.h \

diff --git a/README b/README
index 9bc2a80eb9f9df8938db7636456011b1c1184ed1..f8520ac778b92557803af000994cb5cb056ceb46 100644 (file)
--- a/README
+++ b/README
@@ -39,7 +39,6 @@ Requirements
  - libserialport >= 0.1.0 (optional, used by some drivers)
  - libusb-1.0 >= 1.0.16 (optional, used by some drivers)
  - libftdi >= 0.16 (optional, used by some drivers)
- - libudev >= 151 (optional, used by some drivers)
  - check >= 0.9.4 (optional, only needed to run unit tests)
 
 

diff --git a/README.devices b/README.devices
index b696664129a48af13860bbd9ebc2f0200d4e52a4..db651faa72ec6d9a46fb20154602423021bfb97f 100644 (file)
--- a/README.devices
+++ b/README.devices
@@ -323,16 +323,6 @@ a short list for convenience:
  - Voltcraft VC-830: Press the "REL/PC" button for roughly 2 seconds.
 
 
-Link Instruments MSO-19
------------------------
-
-The driver for the Link Instruments MSO-19 mixed-signal oscilloscope (MSO)
-is currently using libudev (which is a library for the Linux-specific udev
-system). Thus, this driver can currently only compile and work on Linux.
-
-We plan to fix this though, so that it'll work on all other OSes, too.
-
-
 ChronoVu LA8/LA16 USB VID/PIDs
 ------------------------------
 

diff --git a/configure.ac b/configure.ac
index 8e97f9e75fa4ce2c1b57d59803867e7ec9cb52d2..545b8b1fc0bb8eef680bc3e50fa33c2d4cb0a85e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -190,11 +190,6 @@ AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
        [HW_LASCAR_EL_USB="$enableval"],
        [HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT])
 
-AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
-       [enable Link Instruments MSO-19 support [default=no]]),
-       [HW_LINK_MSO19="$enableval"],
-       [HW_LINK_MSO19="no"])
-
 AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
        [enable MIC 985xx support [default=yes]]),
        [HW_MIC_985XX="$enableval"],
@@ -309,7 +304,7 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
        [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no";
        HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
        HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no";
-       HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; HW_LINK_MSO19="no";
+       HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
        HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no";
        HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
 
@@ -377,12 +372,6 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
        SR_PKGLIBS="$SR_PKGLIBS libftdi"],
        [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
 
-# libudev is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([libudev], [libudev >= 151],
-       [LIB_CFLAGS="$LIB_CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-       SR_PKGLIBS="$SR_PKGLIBS libudev"],
-       [HW_LINK_MSO19="no"])
-
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
        [have_check="yes"; LIB_CFLAGS="$LIB_CFLAGS $check_CFLAGS";
@@ -508,11 +497,6 @@ if test "x$HW_LASCAR_EL_USB" = "xyes"; then
        AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
 fi
 
-AM_CONDITIONAL(HW_LINK_MSO19, test x$HW_LINK_MSO19 = xyes)
-if test "x$HW_LINK_MSO19" = "xyes"; then
-       AC_DEFINE(HAVE_HW_LINK_MSO19, 1, [Link Instruments MSO-19 support])
-fi
-
 AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
 if test "x$HW_MIC_985XX" = "xyes"; then
        AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
@@ -615,7 +599,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "check >= 0.9.4"; do
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "check >= 0.9.4"; do
        optional="OPTIONAL"
        if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi
        if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
@@ -650,7 +634,6 @@ echo "  - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2"
 echo "  - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS"
 echo "  - kecheng-kc-330b................. $HW_KECHENG_KC_330B"
 echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
-echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
 echo "  - norma-dmm....................... $HW_NORMA_DMM"
 echo "  - openbench-logic-sniffer......... $HW_OLS"