BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use consistent HW_ name prefixes everywhere. 

Older drivers used LA_* previously, we now use HW_* everywhere though.
This commit is contained in:
Uwe Hermann 2013-05-08 19:33:30 +02:00
parent 576ff5b0ba
commit 9e165e742f
10 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
configure.ac
View File

@ -96,8 +96,8 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma], AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
[enable ASIX SIGMA/SIGMA2 support [default=yes]]), [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
[LA_ASIX_SIGMA="$enableval"], [HW_ASIX_SIGMA="$enableval"],
[LA_ASIX_SIGMA=$HW_ENABLED_DEFAULT]) [HW_ASIX_SIGMA=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
[enable Brymen DMM support [default=yes]]), [enable Brymen DMM support [default=yes]]),
@ -106,8 +106,8 @@ AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8], AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
[enable ChronoVu LA8 support [default=yes]]), [enable ChronoVu LA8 support [default=yes]]),
[LA_CHRONOVU_LA8="$enableval"], [HW_CHRONOVU_LA8="$enableval"],
[LA_CHRONOVU_LA8=$HW_ENABLED_DEFAULT]) [HW_CHRONOVU_LA8=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm],
[enable Colead SLM support [default=yes]]), [enable Colead SLM support [default=yes]]),
@ -116,8 +116,8 @@ AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm],
AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo], AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
[enable demo driver support [default=yes]]), [enable demo driver support [default=yes]]),
[LA_DEMO="$enableval"], [HW_DEMO="$enableval"],
[LA_DEMO=$HW_ENABLED_DEFAULT]) [HW_DEMO=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm], AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
[enable Fluke DMM support [default=yes]]), [enable Fluke DMM support [default=yes]]),
@ -126,8 +126,8 @@ AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw], AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
[enable fx2lafw support (for FX2 LAs). [default=yes]]), [enable fx2lafw support (for FX2 LAs). [default=yes]]),
[LA_FX2LAFW="$enableval"], [HW_FX2LAFW="$enableval"],
[LA_FX2LAFW=$HW_ENABLED_DEFAULT]) [HW_FX2LAFW=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
[enable Hantek DSO support [default=yes]]), [enable Hantek DSO support [default=yes]]),
@ -141,8 +141,8 @@ AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19], AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
[enable Link Instruments MSO-19 support [default=yes]]), [enable Link Instruments MSO-19 support [default=yes]]),
[LA_LINK_MSO19="$enableval"], [HW_LINK_MSO19="$enableval"],
[LA_LINK_MSO19=$HW_ENABLED_DEFAULT]) [HW_LINK_MSO19=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx], AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
[enable MIC 985xx support [default=yes]]), [enable MIC 985xx support [default=yes]]),
@ -156,8 +156,8 @@ AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols], AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
[enable OpenBench Logic Sniffer (OLS) support [default=yes]]), [enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
[LA_OLS="$enableval"], [HW_OLS="$enableval"],
[LA_OLS=$HW_ENABLED_DEFAULT]) [HW_OLS=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2], AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
[enable Rigol DS1xx2 support [default=yes]]), [enable Rigol DS1xx2 support [default=yes]]),
@ -187,8 +187,8 @@ AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
AC_ARG_ENABLE(zeroplus-logic-cube, AC_ARG_ENABLE(zeroplus-logic-cube,
AC_HELP_STRING([--enable-zeroplus-logic-cube], AC_HELP_STRING([--enable-zeroplus-logic-cube],
[enable ZEROPLUS Logic Cube support [default=yes]]), [enable ZEROPLUS Logic Cube support [default=yes]]),
[LA_ZEROPLUS_LOGIC_CUBE="$enableval"], [HW_ZEROPLUS_LOGIC_CUBE="$enableval"],
[LA_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT]) [HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
# Checks for libraries. # Checks for libraries.
@ -223,10 +223,10 @@ case "$host" in
[have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS"; [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
LIBS="$LIBS $libusb_LIBS"; LIBS="$LIBS $libusb_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
[have_libusb1_0="no"; LA_FX2LAFW="no"; HW_HANTEK_DSO="no"; [have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
HW_LASCAR_EL_USB="no"; HW_NEXUS_OSCIPRIME="no"; HW_LASCAR_EL_USB="no"; HW_NEXUS_OSCIPRIME="no";
HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no"; HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
LA_ZEROPLUS_LOGIC_CUBE="no"]) HW_ZEROPLUS_LOGIC_CUBE="no"])
# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
if test "x$have_libusb1_0" != "xno"; then if test "x$have_libusb1_0" != "xno"; then
@ -244,13 +244,13 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
[CFLAGS="$CFLAGS $libftdi_CFLAGS"; [CFLAGS="$CFLAGS $libftdi_CFLAGS";
LIBS="$LIBS $libftdi_LIBS"; LIBS="$LIBS $libftdi_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libftdi"], SR_PKGLIBS="$SR_PKGLIBS libftdi"],
[LA_ASIX_SIGMA="no"; LA_CHRONOVU_LA8="no"]) [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"])
# libudev is only needed for some hardware drivers. Disable them if not found. # libudev is only needed for some hardware drivers. Disable them if not found.
PKG_CHECK_MODULES([libudev], [libudev >= 151], PKG_CHECK_MODULES([libudev], [libudev >= 151],
[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS"; [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libudev"], SR_PKGLIBS="$SR_PKGLIBS libudev"],
[LA_LINK_MSO19="no"]) [HW_LINK_MSO19="no"])
# ALSA is only needed for some hardware drivers. Disable them if not found. # ALSA is only needed for some hardware drivers. Disable them if not found.
PKG_CHECK_MODULES([alsa], [alsa >= 1.0], PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
@ -293,9 +293,9 @@ if test "x$HW_ALSA" = "xyes"; then
AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support]) AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
fi fi
AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes) AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes)
if test "x$LA_ASIX_SIGMA" = "xyes"; then if test "x$HW_ASIX_SIGMA" = "xyes"; then
AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support]) AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
fi fi
AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes) AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes)
@ -303,9 +303,9 @@ if test "x$HW_BRYMEN_DMM" = "xyes"; then
AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support]) AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])
fi fi
AM_CONDITIONAL(LA_CHRONOVU_LA8, test x$LA_CHRONOVU_LA8 = xyes) AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes)
if test "x$LA_CHRONOVU_LA8" = "xyes"; then if test "x$HW_CHRONOVU_LA8" = "xyes"; then
AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support]) AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
fi fi
AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes) AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes)
@ -313,9 +313,9 @@ if test "x$HW_COLEAD_SLM" = "xyes"; then
AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support]) AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support])
fi fi
AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes) AM_CONDITIONAL(HW_DEMO, test x$HW_DEMO = xyes)
if test "x$LA_DEMO" = "xyes"; then if test "x$HW_DEMO" = "xyes"; then
AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support]) AC_DEFINE(HAVE_HW_DEMO, 1, [Demo driver support])
fi fi
AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes) AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
@ -323,9 +323,9 @@ if test "x$HW_FLUKE_DMM" = "xyes"; then
AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support]) AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
fi fi
AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes) AM_CONDITIONAL(HW_FX2LAFW, test x$HW_FX2LAFW = xyes)
if test "x$LA_FX2LAFW" = "xyes"; then if test "x$HW_FX2LAFW" = "xyes"; then
AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support]) AC_DEFINE(HAVE_HW_FX2LAFW, 1, [fx2lafw support])
fi fi
AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes) AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
@ -338,9 +338,9 @@ if test "x$HW_LASCAR_EL_USB" = "xyes"; then
AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support]) AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
fi fi
AM_CONDITIONAL(LA_LINK_MSO19, test x$LA_LINK_MSO19 = xyes) AM_CONDITIONAL(HW_LINK_MSO19, test x$HW_LINK_MSO19 = xyes)
if test "x$LA_LINK_MSO19" = "xyes"; then if test "x$HW_LINK_MSO19" = "xyes"; then
AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support]) AC_DEFINE(HAVE_HW_LINK_MSO19, 1, [Link Instruments MSO-19 support])
fi fi
AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes) AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
@ -353,9 +353,9 @@ if test "x$HW_NEXUS_OSCIPRIME" = "xyes"; then
AC_DEFINE(HAVE_HW_NEXUS_OSCIPRIME, 1, [Nexus Osciprime support]) AC_DEFINE(HAVE_HW_NEXUS_OSCIPRIME, 1, [Nexus Osciprime support])
fi fi
AM_CONDITIONAL(LA_OLS, test x$LA_OLS = xyes) AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes)
if test "x$LA_OLS" = "xyes"; then if test "x$HW_OLS" = "xyes"; then
AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support]) AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
fi fi
AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes) AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
@ -383,9 +383,9 @@ if test "x$HW_VICTOR_DMM" = "xyes"; then
AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support]) AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support])
fi fi
AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes) AM_CONDITIONAL(HW_ZEROPLUS_LOGIC_CUBE, test x$HW_ZEROPLUS_LOGIC_CUBE = xyes)
if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support]) AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
fi fi
# Checks for header files. # Checks for header files.
@ -481,24 +481,24 @@ done
echo -e "\nEnabled hardware drivers:\n" echo -e "\nEnabled hardware drivers:\n"
echo " - agilent-dmm..................... $HW_AGILENT_DMM" echo " - agilent-dmm..................... $HW_AGILENT_DMM"
echo " - alsa............................ $HW_ALSA" echo " - alsa............................ $HW_ALSA"
echo " - asix-sigma...................... $LA_ASIX_SIGMA" echo " - asix-sigma...................... $HW_ASIX_SIGMA"
echo " - brymen-dmm...................... $HW_BRYMEN_DMM" echo " - brymen-dmm...................... $HW_BRYMEN_DMM"
echo " - chronovu-la8.................... $LA_CHRONOVU_LA8" echo " - chronovu-la8.................... $HW_CHRONOVU_LA8"
echo " - colead-slm...................... $HW_COLEAD_SLM" echo " - colead-slm...................... $HW_COLEAD_SLM"
echo " - demo............................ $LA_DEMO" echo " - demo............................ $HW_DEMO"
echo " - fluke-dmm....................... $HW_FLUKE_DMM" echo " - fluke-dmm....................... $HW_FLUKE_DMM"
echo " - fx2lafw......................... $LA_FX2LAFW" echo " - fx2lafw......................... $HW_FX2LAFW"
echo " - hantek-dso...................... $HW_HANTEK_DSO" echo " - hantek-dso...................... $HW_HANTEK_DSO"
echo " - lascar-el-usb................... $HW_LASCAR_EL_USB" echo " - lascar-el-usb................... $HW_LASCAR_EL_USB"
echo " - link-mso19...................... $LA_LINK_MSO19" echo " - link-mso19...................... $HW_LINK_MSO19"
echo " - mic-985xx....................... $HW_MIC_985XX" echo " - mic-985xx....................... $HW_MIC_985XX"
echo " - nexus-osciprime................. $HW_NEXUS_OSCIPRIME" echo " - nexus-osciprime................. $HW_NEXUS_OSCIPRIME"
echo " - openbench-logic-sniffer......... $LA_OLS" echo " - openbench-logic-sniffer......... $HW_OLS"
echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2" echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
echo " - serial-dmm...................... $HW_SERIAL_DMM" echo " - serial-dmm...................... $HW_SERIAL_DMM"
echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814" echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814"
echo " - uni-t-dmm....................... $HW_UNI_T_DMM" echo " - uni-t-dmm....................... $HW_UNI_T_DMM"
echo " - victor-dmm...................... $HW_VICTOR_DMM" echo " - victor-dmm...................... $HW_VICTOR_DMM"
echo " - zeroplus-logic-cube............. $LA_ZEROPLUS_LOGIC_CUBE" echo " - zeroplus-logic-cube............. $HW_ZEROPLUS_LOGIC_CUBE"
echo echo

14
hardware/Makefile.am
View File

@ -57,7 +57,7 @@ if HW_ALSA
libsigrokhardware_la_LIBADD += alsa/libsigrokhwalsa.la libsigrokhardware_la_LIBADD += alsa/libsigrokhwalsa.la
endif endif
if LA_ASIX_SIGMA if HW_ASIX_SIGMA
libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la
endif endif
@ -65,7 +65,7 @@ if HW_BRYMEN_DMM
libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la
endif endif
if LA_CHRONOVU_LA8 if HW_CHRONOVU_LA8
libsigrokhardware_la_LIBADD += chronovu-la8/libsigrokhwchronovula8.la libsigrokhardware_la_LIBADD += chronovu-la8/libsigrokhwchronovula8.la
endif endif
@ -73,7 +73,7 @@ if HW_COLEAD_SLM
libsigrokhardware_la_LIBADD += colead-slm/libsigrok_hw_colead_slm.la libsigrokhardware_la_LIBADD += colead-slm/libsigrok_hw_colead_slm.la
endif endif
if LA_DEMO if HW_DEMO
libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la
endif endif
@ -81,7 +81,7 @@ if HW_FLUKE_DMM
libsigrokhardware_la_LIBADD += fluke-dmm/libsigrokhwflukedmm.la libsigrokhardware_la_LIBADD += fluke-dmm/libsigrokhwflukedmm.la
endif endif
if LA_FX2LAFW if HW_FX2LAFW
libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la
endif endif
@ -93,7 +93,7 @@ if HW_LASCAR_EL_USB
libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la
endif endif
if LA_LINK_MSO19 if HW_LINK_MSO19
libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
endif endif
@ -105,7 +105,7 @@ if HW_NEXUS_OSCIPRIME
libsigrokhardware_la_LIBADD += nexus-osciprime/libsigrok_hw_nexus_osciprime.la libsigrokhardware_la_LIBADD += nexus-osciprime/libsigrok_hw_nexus_osciprime.la
endif endif
if LA_OLS if HW_OLS
libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
endif endif
@ -129,7 +129,7 @@ if HW_VICTOR_DMM
libsigrokhardware_la_LIBADD += victor-dmm/libsigrok_hw_victor_dmm.la libsigrokhardware_la_LIBADD += victor-dmm/libsigrok_hw_victor_dmm.la
endif endif
if LA_ZEROPLUS_LOGIC_CUBE if HW_ZEROPLUS_LOGIC_CUBE
libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrokhwzeroplus.la libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrokhwzeroplus.la
endif endif

2
hardware/asix-sigma/Makefile.am
View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_ASIX_SIGMA if HW_ASIX_SIGMA
AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'

2
hardware/chronovu-la8/Makefile.am
View File

@ -18,7 +18,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
if LA_CHRONOVU_LA8 if HW_CHRONOVU_LA8
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwchronovula8.la noinst_LTLIBRARIES = libsigrokhwchronovula8.la

2
hardware/demo/Makefile.am
View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_DEMO if HW_DEMO
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwdemo.la noinst_LTLIBRARIES = libsigrokhwdemo.la

2
hardware/fx2lafw/Makefile.am
View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_FX2LAFW if HW_FX2LAFW
AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'

2
hardware/link-mso19/Makefile.am
View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_LINK_MSO19 if HW_LINK_MSO19
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwlinkmso19.la noinst_LTLIBRARIES = libsigrokhwlinkmso19.la

2
hardware/openbench-logic-sniffer/Makefile.am
View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_OLS if HW_OLS
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwols.la noinst_LTLIBRARIES = libsigrokhwols.la

2
hardware/zeroplus-logic-cube/Makefile.am
View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_ZEROPLUS_LOGIC_CUBE if HW_ZEROPLUS_LOGIC_CUBE
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwzeroplus.la noinst_LTLIBRARIES = libsigrokhwzeroplus.la

28
hwdriver.c
View File

@ -93,7 +93,7 @@ extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
#ifdef HAVE_HW_COLEAD_SLM #ifdef HAVE_HW_COLEAD_SLM
extern SR_PRIV struct sr_dev_driver colead_slm_driver_info; extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
#endif #endif
#ifdef HAVE_LA_DEMO #ifdef HAVE_HW_DEMO
extern SR_PRIV struct sr_dev_driver demo_driver_info; extern SR_PRIV struct sr_dev_driver demo_driver_info;
#endif #endif
#ifdef HAVE_HW_LASCAR_EL_USB #ifdef HAVE_HW_LASCAR_EL_USB
@ -106,7 +106,7 @@ extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
#ifdef HAVE_HW_NEXUS_OSCIPRIME #ifdef HAVE_HW_NEXUS_OSCIPRIME
extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info; extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
#endif #endif
#ifdef HAVE_LA_OLS #ifdef HAVE_HW_OLS
extern SR_PRIV struct sr_dev_driver ols_driver_info; extern SR_PRIV struct sr_dev_driver ols_driver_info;
#endif #endif
#ifdef HAVE_HW_RIGOL_DS1XX2 #ifdef HAVE_HW_RIGOL_DS1XX2
@ -118,22 +118,22 @@ extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
#ifdef HAVE_HW_VICTOR_DMM #ifdef HAVE_HW_VICTOR_DMM
extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info; extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
#endif #endif
#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE #ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info; extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
#endif #endif
#ifdef HAVE_LA_ASIX_SIGMA #ifdef HAVE_HW_ASIX_SIGMA
extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info; extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
#endif #endif
#ifdef HAVE_LA_CHRONOVU_LA8 #ifdef HAVE_HW_CHRONOVU_LA8
extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
#endif #endif
#ifdef HAVE_LA_LINK_MSO19 #ifdef HAVE_HW_LINK_MSO19
extern SR_PRIV struct sr_dev_driver link_mso19_driver_info; extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
#endif #endif
#ifdef HAVE_HW_ALSA #ifdef HAVE_HW_ALSA
extern SR_PRIV struct sr_dev_driver alsa_driver_info; extern SR_PRIV struct sr_dev_driver alsa_driver_info;
#endif #endif
#ifdef HAVE_LA_FX2LAFW #ifdef HAVE_HW_FX2LAFW
extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info; extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
#endif #endif
#ifdef HAVE_HW_HANTEK_DSO #ifdef HAVE_HW_HANTEK_DSO
@ -182,7 +182,7 @@ static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_HW_COLEAD_SLM #ifdef HAVE_HW_COLEAD_SLM
&colead_slm_driver_info, &colead_slm_driver_info,
#endif #endif
#ifdef HAVE_LA_DEMO #ifdef HAVE_HW_DEMO
&demo_driver_info, &demo_driver_info,
#endif #endif
#ifdef HAVE_HW_LASCAR_EL_USB #ifdef HAVE_HW_LASCAR_EL_USB
@ -195,7 +195,7 @@ static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_HW_NEXUS_OSCIPRIME #ifdef HAVE_HW_NEXUS_OSCIPRIME
&nexus_osciprime_driver_info, &nexus_osciprime_driver_info,
#endif #endif
#ifdef HAVE_LA_OLS #ifdef HAVE_HW_OLS
&ols_driver_info, &ols_driver_info,
#endif #endif
#ifdef HAVE_HW_RIGOL_DS1XX2 #ifdef HAVE_HW_RIGOL_DS1XX2
@ -207,22 +207,22 @@ static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_HW_VICTOR_DMM #ifdef HAVE_HW_VICTOR_DMM
&victor_dmm_driver_info, &victor_dmm_driver_info,
#endif #endif
#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE #ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
&zeroplus_logic_cube_driver_info, &zeroplus_logic_cube_driver_info,
#endif #endif
#ifdef HAVE_LA_ASIX_SIGMA #ifdef HAVE_HW_ASIX_SIGMA
&asix_sigma_driver_info, &asix_sigma_driver_info,
#endif #endif
#ifdef HAVE_LA_CHRONOVU_LA8 #ifdef HAVE_HW_CHRONOVU_LA8
&chronovu_la8_driver_info, &chronovu_la8_driver_info,
#endif #endif
#ifdef HAVE_LA_LINK_MSO19 #ifdef HAVE_HW_LINK_MSO19
&link_mso19_driver_info, &link_mso19_driver_info,
#endif #endif
#ifdef HAVE_HW_ALSA #ifdef HAVE_HW_ALSA
&alsa_driver_info, &alsa_driver_info,
#endif #endif
#ifdef HAVE_LA_FX2LAFW #ifdef HAVE_HW_FX2LAFW
&fx2lafw_driver_info, &fx2lafw_driver_info,
#endif #endif
#ifdef HAVE_HW_HANTEK_DSO #ifdef HAVE_HW_HANTEK_DSO