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

sr: We support both SIGMA and SIGMA2. 

Also, a few minor coding-style fixes etc.
This commit is contained in:
Uwe Hermann 2012-05-02 19:02:03 +02:00
parent b5f6fcb1ac
commit 6352d030df
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -86,12 +86,12 @@ if test "x$LA_ALSA" = "xyes"; then
fi
AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
[enable ASIX Sigma support [default=yes]]),
[enable ASIX SIGMA/SIGMA2 support [default=yes]]),
[LA_ASIX_SIGMA="$enableval"],
[LA_ASIX_SIGMA=yes])
AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes)
if test "x$LA_ASIX_SIGMA" = "xyes"; then
AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX Sigma support])
AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
fi
AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
@ -298,7 +298,7 @@ done
echo
echo "Enabled hardware drivers:"
echo
echo " - ASIX SIGMA...................... $LA_ASIX_SIGMA"
echo " - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
echo " - Demo driver..................... $LA_DEMO"
echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"

14
hardware/asix-sigma/asix-sigma.c
View File

@ -20,7 +20,7 @@
*/
/*
* ASIX SIGMA Logic Analyzer Driver
* ASIX SIGMA/SIGMA2 logic analyzer driver
*/
#include <glib.h>
@ -426,17 +426,17 @@ static int hw_init(const char *devinfo)
/* Look for SIGMAs. */
if (ftdi_usb_find_all(&ctx->ftdic, &devlist,
USB_VENDOR, USB_PRODUCT) <= 0)
USB_VENDOR, USB_PRODUCT) <= 0)
goto free;
/* Make sure it's a version 1 or 2 SIGMA. */
ftdi_usb_get_strings(&ctx->ftdic, devlist->dev, NULL, 0, NULL, 0,
serial_txt, sizeof(serial_txt));
serial_txt, sizeof(serial_txt));
sscanf(serial_txt, "%x", &serial);
if (serial < 0xa6010000 || serial > 0xa602ffff ) {
if (serial < 0xa6010000 || serial > 0xa602ffff) {
sr_err("sigma: Only SIGMA and SIGMA2 are supported "
"in this version of Sigrok.");
"in this version of sigrok.");
goto free;
}
@ -1348,7 +1348,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
/* Setup maximum post trigger time. */
sigma_set_register(WRITE_POST_TRIGGER,
(ctx->capture_ratio * 255) / 100, ctx);
(ctx->capture_ratio * 255) / 100, ctx);
/* Start acqusition. */
gettimeofday(&ctx->start_tv, 0);
@ -1429,7 +1429,7 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
.name = "asix-sigma",
.longname = "ASIX SIGMA",
.longname = "ASIX SIGMA/SIGMA2",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,