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

Remove some radioshack-dmm leftovers.

This commit is contained in:
Uwe Hermann 2012-12-02 21:58:34 +01:00
parent ea088bb693
commit 162b735218
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -178,15 +178,6 @@ if test "x$LA_OLS" = "xyes"; then
AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support]) AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
fi fi
AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
[enable RadioShack DMM support [default=yes]]),
[HW_RADIOSHACK_DMM="$enableval"],
[HW_RADIOSHACK_DMM=yes])
AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [RadioShack DMM support])
fi
AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm], AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
[enable serial DMM support [default=yes]]), [enable serial DMM support [default=yes]]),
[HW_SERIAL_DMM="$enableval"], [HW_SERIAL_DMM="$enableval"],
@ -313,7 +304,6 @@ AM_CONDITIONAL(NEED_SERIAL, \
-o "x$HW_FLUKE_DMM" != xno \ -o "x$HW_FLUKE_DMM" != xno \
-o "x$LA_LINK_MSO19" != xno \ -o "x$LA_LINK_MSO19" != xno \
-o "x$LA_OLS" != xno \ -o "x$LA_OLS" != xno \
-o "x$HW_RADIOSHACK_DMM" != xno \
-o "x$HW_SERIAL_DMM" != xno \ -o "x$HW_SERIAL_DMM" != xno \
-o "x$HW_TONDAJ_SL_814" != xno \ -o "x$HW_TONDAJ_SL_814" != xno \
) )
@ -369,7 +359,6 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
hardware/hantek-dso/Makefile hardware/hantek-dso/Makefile
hardware/link-mso19/Makefile hardware/link-mso19/Makefile
hardware/openbench-logic-sniffer/Makefile hardware/openbench-logic-sniffer/Makefile
hardware/radioshack-dmm/Makefile
hardware/serial-dmm/Makefile hardware/serial-dmm/Makefile
hardware/uni-t-dmm/Makefile hardware/uni-t-dmm/Makefile
hardware/zeroplus-logic-cube/Makefile hardware/zeroplus-logic-cube/Makefile
@ -414,7 +403,6 @@ echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
echo " - Hantek DSO...................... $HW_HANTEK_DSO" echo " - Hantek DSO...................... $HW_HANTEK_DSO"
echo " - Link MSO-19..................... $LA_LINK_MSO19" echo " - Link MSO-19..................... $LA_LINK_MSO19"
echo " - Openbench Logic Sniffer......... $LA_OLS" echo " - Openbench Logic Sniffer......... $LA_OLS"
echo " - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
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"

4
hardware/Makefile.am
View File

@ -88,10 +88,6 @@ if LA_OLS
libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
endif endif
if HW_RADIOSHACK_DMM
libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
endif
if HW_SERIAL_DMM if HW_SERIAL_DMM
libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
endif endif

6
hwdriver.c
View File

@ -110,9 +110,6 @@ extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
#ifdef HAVE_HW_FLUKE_DMM #ifdef HAVE_HW_FLUKE_DMM
extern SR_PRIV struct sr_dev_driver flukedmm_driver_info; extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
#endif #endif
#ifdef HAVE_HW_RADIOSHACK_DMM
extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info;
#endif
#ifdef HAVE_HW_SERIAL_DMM #ifdef HAVE_HW_SERIAL_DMM
extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info; extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info; extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
@ -175,9 +172,6 @@ static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_HW_FLUKE_DMM #ifdef HAVE_HW_FLUKE_DMM
&flukedmm_driver_info, &flukedmm_driver_info,
#endif #endif
#ifdef HAVE_HW_RADIOSHACK_DMM
&radioshackdmm_driver_info,
#endif
#ifdef HAVE_HW_SERIAL_DMM #ifdef HAVE_HW_SERIAL_DMM
&digitek_dt4000zc_driver_info, &digitek_dt4000zc_driver_info,
&tekpower_tp4000zc_driver_info, &tekpower_tp4000zc_driver_info,