Rename 'chronovu-la8' driver to 'chronovu-la'.
The driver now also supports the LA16 device (and possibly others in the future).
This commit is contained in:
Uwe Hermann
parent
00910580bb
commit
7b3567126c
|
|
@ -156,11 +156,11 @@ libsigrok_la_SOURCES += \
|
|||
hardware/center-3xx/protocol.c \
|
||||
hardware/center-3xx/api.c
|
||||
endif
|
||||
if HW_CHRONOVU_LA8
|
||||
if HW_CHRONOVU_LA
|
||||
libsigrok_la_SOURCES += \
|
||||
hardware/chronovu-la8/protocol.h \
|
||||
hardware/chronovu-la8/protocol.c \
|
||||
hardware/chronovu-la8/api.c
|
||||
hardware/chronovu-la/protocol.h \
|
||||
hardware/chronovu-la/protocol.c \
|
||||
hardware/chronovu-la/api.c
|
||||
endif
|
||||
if HW_COLEAD_SLM
|
||||
libsigrok_la_SOURCES += \
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ The following drivers/devices do not need any firmware upload:
|
|||
- brymen-dmm
|
||||
- cem-dt-885x
|
||||
- center-3xx (including all subdrivers)
|
||||
- chronovu-la8
|
||||
- chronovu-la
|
||||
- colead-slm
|
||||
- demo
|
||||
- fluke-dmm
|
||||
|
|
@ -119,7 +119,7 @@ The following drivers/devices do not require a serial port specification:
|
|||
- alsa
|
||||
- asix-sigma
|
||||
- brymen-bm86x
|
||||
- chronovu-la8
|
||||
- chronovu-la
|
||||
- demo
|
||||
- fx2lafw
|
||||
- hantek-dso
|
||||
|
|
@ -340,20 +340,19 @@ system). Thus, this driver can currently only compile and work on Linux.
|
|||
We plan to fix this though, so that it'll work on all other OSes, too.
|
||||
|
||||
|
||||
ChronoVu LA8 USB VID/PIDs
|
||||
-------------------------
|
||||
ChronoVu LA8/LA16 USB VID/PIDs
|
||||
------------------------------
|
||||
|
||||
The ChronoVu LA8 logic analyzer is available in two revisions. Previously,
|
||||
the LA8 shipped with a USB VID/PID of 0403:6001, which is the standard ID
|
||||
The ChronoVu LA8/LA16 logic analyzer is available in two revisions. Previously,
|
||||
the device shipped with a USB VID/PID of 0403:6001, which is the standard ID
|
||||
for FTDI FT232 USB chips.
|
||||
|
||||
Since this made it hard to distinguish the LA8 from any other device
|
||||
Since this made it hard to distinguish the LA8/LA16 from any other device
|
||||
with this FTDI chip connected to the PC, the vendor later shipped the
|
||||
LA8 with a USB VID/PID of 0403:8867.
|
||||
device with a USB VID/PID of 0403:8867.
|
||||
|
||||
The 'chronovu-la8' driver in libsigrok supports both VID/PID pairs and
|
||||
automatically finds devices with either VID/PID pair. However, currently
|
||||
the driver will assume any device with VID/PID 0403:6001 is a ChronoVu LA8.
|
||||
The 'chronovu-la' driver in libsigrok supports both VID/PID pairs and
|
||||
automatically finds devices with either VID/PID pair.
|
||||
|
||||
|
||||
OLS
|
||||
|
|
|
|||
18
configure.ac
18
configure.ac
|
|
@ -129,10 +129,10 @@ AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx],
|
|||
[HW_CENTER_3XX="$enableval"],
|
||||
[HW_CENTER_3XX=$HW_ENABLED_DEFAULT])
|
||||
|
||||
AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
|
||||
[enable ChronoVu LA8 support [default=yes]]),
|
||||
[HW_CHRONOVU_LA8="$enableval"],
|
||||
[HW_CHRONOVU_LA8=$HW_ENABLED_DEFAULT])
|
||||
AC_ARG_ENABLE(chronovu-la, AC_HELP_STRING([--enable-chronovu-la],
|
||||
[enable ChronoVu LA support [default=yes]]),
|
||||
[HW_CHRONOVU_LA="$enableval"],
|
||||
[HW_CHRONOVU_LA=$HW_ENABLED_DEFAULT])
|
||||
|
||||
AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm],
|
||||
[enable Colead SLM support [default=yes]]),
|
||||
|
|
@ -379,7 +379,7 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
|
|||
[CFLAGS="$CFLAGS $libftdi_CFLAGS";
|
||||
LIBS="$LIBS $libftdi_LIBS";
|
||||
SR_PKGLIBS="$SR_PKGLIBS libftdi"],
|
||||
[HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"])
|
||||
[HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
|
||||
|
||||
# libudev is only needed for some hardware drivers. Disable them if not found.
|
||||
PKG_CHECK_MODULES([libudev], [libudev >= 151],
|
||||
|
|
@ -456,9 +456,9 @@ if test "x$HW_CENTER_3XX" = "xyes"; then
|
|||
AC_DEFINE(HAVE_HW_CENTER_3XX, 1, [Center 3xx support])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes)
|
||||
if test "x$HW_CHRONOVU_LA8" = "xyes"; then
|
||||
AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
|
||||
AM_CONDITIONAL(HW_CHRONOVU_LA, test x$HW_CHRONOVU_LA = xyes)
|
||||
if test "x$HW_CHRONOVU_LA" = "xyes"; then
|
||||
AC_DEFINE(HAVE_HW_CHRONOVU_LA, 1, [ChronoVu LA support])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes)
|
||||
|
|
@ -648,7 +648,7 @@ echo " - brymen-bm86x.................... $HW_BRYMEN_BM86X"
|
|||
echo " - brymen-dmm...................... $HW_BRYMEN_DMM"
|
||||
echo " - cem-dt-885x..................... $HW_CEM_DT_885X"
|
||||
echo " - center-3xx...................... $HW_CENTER_3XX"
|
||||
echo " - chronovu-la8.................... $HW_CHRONOVU_LA8"
|
||||
echo " - chronovu-la..................... $HW_CHRONOVU_LA"
|
||||
echo " - colead-slm...................... $HW_COLEAD_SLM"
|
||||
echo " - conrad-digi-35-cpu.............. $HW_CONRAD_DIGI_35_CPU"
|
||||
echo " - demo............................ $HW_DEMO"
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
#include "protocol.h"
|
||||
|
||||
SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
|
||||
static struct sr_dev_driver *di = &chronovu_la8_driver_info;
|
||||
SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
|
||||
static struct sr_dev_driver *di = &chronovu_la_driver_info;
|
||||
|
||||
static const int32_t hwcaps[] = {
|
||||
SR_CONF_LOGIC_ANALYZER,
|
||||
|
|
@ -512,9 +512,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
|
|||
return SR_OK;
|
||||
}
|
||||
|
||||
SR_PRIV struct sr_dev_driver chronovu_la8_driver_info = {
|
||||
.name = "chronovu-la8",
|
||||
.longname = "ChronoVu LA8",
|
||||
SR_PRIV struct sr_dev_driver chronovu_la_driver_info = {
|
||||
.name = "chronovu-la",
|
||||
.longname = "ChronoVu LA8/LA16",
|
||||
.api_version = 1,
|
||||
.init = init,
|
||||
.cleanup = cleanup,
|
||||
|
|
@ -18,8 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef LIBSIGROK_HARDWARE_CHRONOVU_LA8_PROTOCOL_H
|
||||
#define LIBSIGROK_HARDWARE_CHRONOVU_LA8_PROTOCOL_H
|
||||
#ifndef LIBSIGROK_HARDWARE_CHRONOVU_LA_PROTOCOL_H
|
||||
#define LIBSIGROK_HARDWARE_CHRONOVU_LA_PROTOCOL_H
|
||||
|
||||
#include <glib.h>
|
||||
#include <ftdi.h>
|
||||
|
|
@ -208,8 +208,8 @@ extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
|
|||
#ifdef HAVE_HW_ASIX_SIGMA
|
||||
extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
|
||||
#endif
|
||||
#ifdef HAVE_HW_CHRONOVU_LA8
|
||||
extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
|
||||
#ifdef HAVE_HW_CHRONOVU_LA
|
||||
extern SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
|
||||
#endif
|
||||
#ifdef HAVE_HW_LINK_MSO19
|
||||
extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
|
||||
|
|
@ -366,8 +366,8 @@ static struct sr_dev_driver *drivers_list[] = {
|
|||
#ifdef HAVE_HW_ASIX_SIGMA
|
||||
&asix_sigma_driver_info,
|
||||
#endif
|
||||
#ifdef HAVE_HW_CHRONOVU_LA8
|
||||
&chronovu_la8_driver_info,
|
||||
#ifdef HAVE_HW_CHRONOVU_LA
|
||||
&chronovu_la_driver_info,
|
||||
#endif
|
||||
#ifdef HAVE_HW_LINK_MSO19
|
||||
&link_mso19_driver_info,
|
||||
|
|
|
|||
Loading…
Reference in New Issue