X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3fc1cdc44ad402a26babbe45ea0f8a4a3a2a5794;hb=1c183900d2ee1416a0281871928e4064797ee528;hp=94f4655844d92b3f85210ab9dcffb053494d5a48;hpb=6383365795b8f9a3408315f8726fa75fa25e19d1;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 94f46558..3fc1cdc4 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ([2.63]) # libsigrok package version number (NOT the same as shared lib version!). m4_define([sr_package_version_major], [0]) m4_define([sr_package_version_minor], [2]) -m4_define([sr_package_version_micro], [1]) +m4_define([sr_package_version_micro], [2]) m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro]) AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net], @@ -67,7 +67,7 @@ PKG_PROG_PKG_CONFIG([0.22]) # The algorithm for determining which number to change (and how) is nontrivial! # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info SR_LIB_VERSION_CURRENT=1 -SR_LIB_VERSION_REVISION=1 +SR_LIB_VERSION_REVISION=2 SR_LIB_VERSION_AGE=0 SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE" SR_LIB_LDFLAGS="-version-info $SR_LIB_VERSION" @@ -94,11 +94,21 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [HW_ALSA="$enableval"], [HW_ALSA=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(appa-55ii, AC_HELP_STRING([--enable-appa-55ii], + [enable APPA 55II support [default=yes]]), + [HW_APPA_55II="$enableval"], + [HW_APPA_55II=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma], [enable ASIX SIGMA/SIGMA2 support [default=yes]]), [HW_ASIX_SIGMA="$enableval"], [HW_ASIX_SIGMA=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(atten-pps3xxx, AC_HELP_STRING([--enable-atten-pps3xxx], + [enable Atten PPS3xxx support [default=yes]]), + [HW_ATTEN_PPS3XXX="$enableval"], + [HW_ATTEN_PPS3XXX=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], [enable Brymen DMM support [default=yes]]), [HW_BRYMEN_DMM="$enableval"], @@ -107,12 +117,12 @@ AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x], [enable CEM DT-885x support [default=yes]]), [HW_CEM_DT_885X="$enableval"], - [HW_CEM_DT_885X=yes]) + [HW_CEM_DT_885X=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx], [enable Center 3xx support [default=yes]]), [HW_CENTER_3XX="$enableval"], - [HW_CENTER_3XX=yes]) + [HW_CENTER_3XX=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8], [enable ChronoVu LA8 support [default=yes]]), @@ -139,6 +149,16 @@ AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw], [HW_FX2LAFW="$enableval"], [HW_FX2LAFW=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(gmc-mh-1x-2x, AC_HELP_STRING([--enable-gmc-mh-1x-2x], + [enable gmc-mh-1x-2x support [default=yes]]), + [HW_GMC_MH_1X_2X="$enableval"], + [HW_GMC_MH_1X_2X=$HW_ENABLED_DEFAULT]) + +AC_ARG_ENABLE(hameg-hmo, AC_HELP_STRING([--enable-hameg-hmo], + [enable Hameg HMO support [default=yes]]), + [HW_HAMEG_HMO="$enableval"], + [HW_HAMEG_HMO=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], [enable Hantek DSO support [default=yes]]), [HW_HANTEK_DSO="$enableval"], @@ -147,17 +167,17 @@ AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2], [enable IKALOGIC Scanalogic-2 support [default=yes]]), [HW_IKALOGIC_SCANALOGIC2="$enableval"], - [HW_IKALOGIC_SCANALOGIC2=yes]) + [HW_IKALOGIC_SCANALOGIC2=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus], [enable IKALOGIC ScanaPLUS support [default=yes]]), [HW_IKALOGIC_SCANAPLUS="$enableval"], - [HW_IKALOGIC_SCANAPLUS=yes]) + [HW_IKALOGIC_SCANAPLUS=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(kecheng-kc-330b, AC_HELP_STRING([--enable-kecheng-kc-330b], [enable Kecheng KC-330B support [default=yes]]), [HW_KECHENG_KC_330B="$enableval"], - [HW_KECHENG_KC_330B=yes]) + [HW_KECHENG_KC_330B=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb], [enable Lascar EL-USB support [default=yes]]), @@ -174,26 +194,36 @@ AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx], [HW_MIC_985XX="$enableval"], [HW_MIC_985XX=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(norma-dmm, AC_HELP_STRING([--enable-norma-dmm], + [enable Norma DMM support [default=yes]]), + [HW_NORMA_DMM="$enableval"], + [HW_NORMA_DMM=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols], [enable OpenBench Logic Sniffer (OLS) support [default=yes]]), [HW_OLS="$enableval"], [HW_OLS=$HW_ENABLED_DEFAULT]) -AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2], - [enable Rigol DS1xx2 support [default=yes]]), - [HW_RIGOL_DS1XX2="$enableval"], - [HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(rigol-ds, AC_HELP_STRING([--enable-rigol-ds], + [enable Rigol DS support [default=yes]]), + [HW_RIGOL_DS="$enableval"], + [HW_RIGOL_DS=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16], [enable Saleae Logic16 support [default=yes]]), [HW_SALEAE_LOGIC16="$enableval"], - [HW_SALEAE_LOGIC16=yes]) + [HW_SALEAE_LOGIC16=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm], [enable serial DMM support [default=yes]]), [HW_SERIAL_DMM="$enableval"], [HW_SERIAL_DMM=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(teleinfo, AC_HELP_STRING([--enable-teleinfo], + [enable Teleinfo support [default=yes]]), + [HW_TELEINFO="$enableval"], + [HW_TELEINFO=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814], [enable Tondaj SL-814 support [default=yes]]), [HW_TONDAJ_SL_814="$enableval"], @@ -207,7 +237,7 @@ AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm], AC_ARG_ENABLE(uni-t-ut32x, AC_HELP_STRING([--enable-uni-t-ut32x], [enable UNI-T UT32x support [default=yes]]), [HW_UNI_T_UT32X="$enableval"], - [HW_UNI_T_UT32X=yes]) + [HW_UNI_T_UT32X=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm], [enable victor-dmm support [default=yes]]), @@ -222,6 +252,12 @@ AC_ARG_ENABLE(zeroplus-logic-cube, # Checks for libraries. +case "$host" in +*mingw*) + # We need to link against the Winsock2 library for SCPI over TCP. + LIBS="$LIBS -lws2_32";; +esac + # This variable collects the pkg-config names of all detected libs. # It is then used to construct the "Requires.private:" field in the # libsigrok.pc file. @@ -237,10 +273,32 @@ AM_PATH_GLIB_2_0([2.32.0], [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libzip is always needed. Abort if it's not found. -PKG_CHECK_MODULES([libzip], [libzip >= 0.8], +PKG_CHECK_MODULES([libzip], [libzip >= 0.10], [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libzip"]) +# libserialport is only needed for some hardware drivers. Disable the +# respective drivers if it is not found. +PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], + [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS"; + LIBS="$LIBS $libserialport_LIBS"; + SR_PKGLIBS="$SR_PKGLIBS libserialport"], + [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_FLUKE_DMM="no"; + HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; HW_LINK_MSO19="no"; + HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no"; + HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"]) + +# Define HAVE_LIBSERIALPORT in config.h if we found libserialport. +if test "x$have_libserialport" != "xno"; then + AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1], + [Specifies whether we have libserialport.]) +fi + +# Serial port helper code is only compiled in if libserialport was found. +AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) + # libusb-1.0 is only needed for some hardware drivers. Disable the respective # drivers if it is not found. case "$host" in @@ -252,14 +310,14 @@ case "$host" in [Specifies whether we have a libusb.h header.]) ;; *) - PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], + PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16], [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS"; LIBS="$LIBS $libusb_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], [have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no"; - HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no"; + HW_UNI_T_DMM="no"; HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"]) # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. @@ -298,19 +356,12 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4], LIBS="$LIBS $check_LIBS"], [have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") -# The Rigol DS1xx2 driver currently uses the Linux kernel usbtmc module -# (though it is planned to rewrite the driver to be portable later). -# Thus, it will be disabled for non-Linux builds for now. +# The OLS driver uses serial port file descriptors directly, and therefore +# will not currently work on Windows. case "$host" in -*linux*) - # Do nothing. Whether the driver is enabled is determined by the - # previous --enable-all-drivers/--disable-all-drivers and/or any - # --enable-rigol-ds1xx2/--disable-rigol-ds1xx2 options. - ;; -*) - # Disable the driver for builds that don't target Linux. - HW_RIGOL_DS1XX2="no" - ;; +*mingw*) + HW_OLS="no" + ;; esac AC_SUBST(SR_PKGLIBS) @@ -327,11 +378,21 @@ if test "x$HW_ALSA" = "xyes"; then AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support]) fi +AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes) +if test "x$HW_APPA_55II" = "xyes"; then + AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support]) +fi + AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes) if test "x$HW_ASIX_SIGMA" = "xyes"; then AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support]) fi +AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes) +if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then + AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support]) +fi + AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes) if test "x$HW_BRYMEN_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support]) @@ -372,11 +433,21 @@ if test "x$HW_FX2LAFW" = "xyes"; then AC_DEFINE(HAVE_HW_FX2LAFW, 1, [fx2lafw support]) fi +AM_CONDITIONAL(HW_GMC_MH_1X_2X, test x$HW_GMC_MH_1X_2X = xyes) +if test "x$HW_GMC_MH_1X_2X" = "xyes"; then + AC_DEFINE(HAVE_HW_GMC_MH_1X_2X, 1, [gmc-mh-1x-2x support]) +fi + AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes) if test "x$HW_HANTEK_DSO" = "xyes"; then AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support]) fi +AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes) +if test "x$HW_HAMEG_HMO" = "xyes"; then + AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [Hameg HMO support]) +fi + AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes) if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support]) @@ -407,14 +478,24 @@ if test "x$HW_MIC_985XX" = "xyes"; then AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support]) fi +AM_CONDITIONAL(HW_NORMA_DMM, test x$HW_NORMA_DMM = xyes) +if test "x$HW_NORMA_DMM" = "xyes"; then + AC_DEFINE(HAVE_HW_NORMA_DMM, 1, [Norma DMM support]) +fi + AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes) if test "x$HW_OLS" = "xyes"; then AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support]) fi -AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes) -if test "x$HW_RIGOL_DS1XX2" = "xyes"; then - AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support]) +AM_CONDITIONAL(HW_RIGOL_DS, test x$HW_RIGOL_DS = xyes) +if test "x$HW_RIGOL_DS" = "xyes"; then + AC_DEFINE(HAVE_HW_RIGOL_DS, 1, [Rigol DS support]) +fi + +AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes) +if test "x$HW_SALEAE_LOGIC16" = "xyes"; then + AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support]) fi AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes) @@ -422,6 +503,11 @@ if test "x$HW_SERIAL_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support]) fi +AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes) +if test "x$HW_TELEINFO" = "xyes"; then + AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo support]) +fi + AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes) if test "x$HW_TONDAJ_SL_814" = "xyes"; then AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 support]) @@ -447,16 +533,12 @@ if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support]) fi -AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes) -if test "x$HW_SALEAE_LOGIC16" = "xyes"; then - AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support]) -fi - # Checks for header files. # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h]) # Checks for typedefs, structures, and compiler characteristics. +AC_C_BIGENDIAN AC_C_INLINE AC_TYPE_INT8_T AC_TYPE_INT16_T @@ -488,20 +570,25 @@ AC_SUBST(SR_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/agilent-dmm/Makefile hardware/alsa/Makefile + hardware/appa-55ii/Makefile hardware/asix-sigma/Makefile + hardware/atten-pps3xxx/Makefile hardware/brymen-dmm/Makefile hardware/cem-dt-885x/Makefile hardware/center-3xx/Makefile hardware/chronovu-la8/Makefile hardware/colead-slm/Makefile hardware/common/Makefile + hardware/gmc-mh-1x-2x/Makefile + hardware/hameg-hmo/Makefile hardware/ikalogic-scanalogic2/Makefile hardware/ikalogic-scanaplus/Makefile hardware/kecheng-kc-330b/Makefile hardware/lascar-el-usb/Makefile hardware/mic-985xx/Makefile - hardware/rigol-ds1xx2/Makefile + hardware/rigol-ds/Makefile hardware/saleae-logic16/Makefile + hardware/teleinfo/Makefile hardware/tondaj-sl-814/Makefile hardware/victor-dmm/Makefile hardware/common/dmm/Makefile @@ -510,6 +597,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/fx2lafw/Makefile hardware/hantek-dso/Makefile hardware/link-mso19/Makefile + hardware/norma-dmm/Makefile hardware/openbench-logic-sniffer/Makefile hardware/serial-dmm/Makefile hardware/uni-t-dmm/Makefile @@ -538,7 +626,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.8" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)" @@ -551,7 +639,9 @@ done echo -e "\nEnabled hardware drivers:\n" echo " - agilent-dmm..................... $HW_AGILENT_DMM" echo " - alsa............................ $HW_ALSA" +echo " - appa-55ii....................... $HW_APPA_55II" echo " - asix-sigma...................... $HW_ASIX_SIGMA" +echo " - atten-pps3xxx................... $HW_ATTEN_PPS3XXX" echo " - brymen-dmm...................... $HW_BRYMEN_DMM" echo " - cem-dt-885x..................... $HW_CEM_DT_885X" echo " - center-3xx...................... $HW_CENTER_3XX" @@ -560,6 +650,8 @@ echo " - colead-slm...................... $HW_COLEAD_SLM" echo " - demo............................ $HW_DEMO" echo " - fluke-dmm....................... $HW_FLUKE_DMM" echo " - fx2lafw......................... $HW_FX2LAFW" +echo " - gmc-mh-1x-2x.................... $HW_GMC_MH_1X_2X" +echo " - hameg-hmo....................... $HW_HAMEG_HMO" echo " - hantek-dso...................... $HW_HANTEK_DSO" echo " - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2" echo " - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS" @@ -567,10 +659,12 @@ 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" -echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2" +echo " - rigol-ds........................ $HW_RIGOL_DS" echo " - saleae-logic16.................. $HW_SALEAE_LOGIC16" echo " - serial-dmm...................... $HW_SERIAL_DMM" +echo " - teleinfo........................ $HW_TELEINFO" echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814" echo " - uni-t-dmm....................... $HW_UNI_T_DMM" echo " - uni-t-ut32x..................... $HW_UNI_T_UT32X"