From: Uwe Hermann <redacted>
Date: Sun, 2 Dec 2012 20:58:34 +0000 (+0100)
Subject: Remove some radioshack-dmm leftovers.
X-Git-Tag: dsupstream~488
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=162b735218b906d5a41e8da69ea15b76d267f1fd;p=libsigrok.git

Remove some radioshack-dmm leftovers.
---

diff --git a/configure.ac b/configure.ac
index a67e2940..18e81b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,15 +178,6 @@ if test "x$LA_OLS" = "xyes"; then
 	AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 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],
 	      [enable serial DMM support [default=yes]]),
 	      [HW_SERIAL_DMM="$enableval"],
@@ -313,7 +304,6 @@ AM_CONDITIONAL(NEED_SERIAL, \
 	-o "x$HW_FLUKE_DMM" != xno \
 	-o "x$LA_LINK_MSO19" != xno \
 	-o "x$LA_OLS" != xno \
-	-o "x$HW_RADIOSHACK_DMM" != xno \
 	-o "x$HW_SERIAL_DMM" != 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/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
-		 hardware/radioshack-dmm/Makefile
 		 hardware/serial-dmm/Makefile
 		 hardware/uni-t-dmm/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
@@ -414,7 +403,6 @@ echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
-echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
 echo "  - Serial DMM...................... $HW_SERIAL_DMM"
 echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
 echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index d63d7ecc..b15f917d 100644
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -88,10 +88,6 @@ if LA_OLS
 libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
 endif
 
-if HW_RADIOSHACK_DMM
-libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
-endif
-
 if HW_SERIAL_DMM
 libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
 endif
diff --git a/hwdriver.c b/hwdriver.c
index 26572861..da8794e7 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -110,9 +110,6 @@ extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
 #ifdef HAVE_HW_FLUKE_DMM
 extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 #endif
-#ifdef HAVE_HW_RADIOSHACK_DMM
-extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info;
-#endif
 #ifdef HAVE_HW_SERIAL_DMM
 extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_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
 	&flukedmm_driver_info,
 #endif
-#ifdef HAVE_HW_RADIOSHACK_DMM
-	&radioshackdmm_driver_info,
-#endif
 #ifdef HAVE_HW_SERIAL_DMM
 	&digitek_dt4000zc_driver_info,
 	&tekpower_tp4000zc_driver_info,