From 07c81bfad119a4ea66c76cc830506ce3b381b4c5 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 19 Jan 2011 23:55:03 +0100 Subject: [PATCH] Disable Link Instruments MSO-19 for 0.1. --- hardware/Makefile.am | 7 +++---- hwplugin.c | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hardware/Makefile.am b/hardware/Makefile.am index eb7088f3..74b92f11 100644 --- a/hardware/Makefile.am +++ b/hardware/Makefile.am @@ -21,7 +21,6 @@ SUBDIRS = \ asix-sigma \ common \ demo \ - link-mso19 \ openbench-logic-sniffer \ saleae-logic \ zeroplus-logic-cube @@ -41,9 +40,9 @@ if LA_ASIX_SIGMA libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la endif -if LA_LINK_MSO19 -libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la -endif +# if LA_LINK_MSO19 +# libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la +# endif if LA_OLS libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la diff --git a/hwplugin.c b/hwplugin.c index 0a30aad0..1407f0ec 100644 --- a/hwplugin.c +++ b/hwplugin.c @@ -58,9 +58,9 @@ extern struct device_plugin zeroplus_logic_cube_plugin_info; #ifdef HAVE_LA_ASIX_SIGMA extern struct device_plugin asix_sigma_plugin_info; #endif -#ifdef HAVE_LA_LINK_MSO19 -extern struct device_plugin link_mso19_plugin_info; -#endif +// #ifdef HAVE_LA_LINK_MSO19 +// extern struct device_plugin link_mso19_plugin_info; +// #endif /* TODO: No linked list needed, this can be a simple array. */ int load_hwplugins(void) @@ -82,9 +82,9 @@ int load_hwplugins(void) #ifdef HAVE_LA_ASIX_SIGMA plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info); #endif -#ifdef HAVE_LA_LINK_MSO19 - plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info); -#endif +// #ifdef HAVE_LA_LINK_MSO19 +// plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info); +// #endif return SIGROK_OK; }