Re-enable stuff we temporarily disabled for 0.1.

diff --git a/Makefile.am b/Makefile.am
index 372640ee646fd3b38a7f3fcbefddadf56995ad6a..94672f333618981728d3ecabb875824497b71356 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \
 
 SUBDIRS = hardware input output
 
-# lib_LTLIBRARIES = libsigrok.la
-noinst_LTLIBRARIES = libsigrok.la
+lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
        backend.c \
@@ -39,10 +38,9 @@ libsigrok_la_LIBADD = \
        input/libsigrokinput.la \
        output/libsigrokoutput.la
 
-# include_HEADERS = sigrok.h sigrok-proto.h
-# noinst_HEADERS = sigrok-internal.h
-noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libsigrok.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc
 

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 74b92f111df36c8839fd3bd5d9bfd31dca1b86be..eb7088f39d071359e25aab55494d274fdef67dbe 100644 (file)
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS = \
        asix-sigma \
        common \
        demo \
+       link-mso19 \
        openbench-logic-sniffer \
        saleae-logic \
        zeroplus-logic-cube
@@ -40,9 +41,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/hardware/common/serial.c b/hardware/common/serial.c
index 2c28510aa8330164028d7fce3752eee58c26132d..46d4ad0535d8c4d3b6cb65509216a800a51111cf 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -243,11 +243,9 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
        case 115200:
                baud = B115200;
                break;
-/* removed for 0.1 release
        case 460800:
                baud = B460800;
                break;
-*/
        default:
                return SIGROK_ERR;
        }

diff --git a/hwplugin.c b/hwplugin.c
index 1407f0ec6f422466dc3a40ddfed0473e20cd25ea..0a30aad0016263f5ecc0012ba6f0f7fb6c731ccd 100644 (file)
--- 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;
 }