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

Re-enable stuff we temporarily disabled for 0.1.

This commit is contained in:
Uwe Hermann 2011-01-20 00:39:59 +01:00
parent 07c81bfad1
commit bffed4fc10
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -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

7
hardware/Makefile.am
View File

@ -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

2
hardware/common/serial.c
View File

@ -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;
}

12
hwplugin.c
View File

@ -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;
}