[HW_IKALOGIC_SCANALOGIC2="$enableval"],
[HW_IKALOGIC_SCANALOGIC2=yes])
+AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
+ [enable Ikalogic ScanaPLUS support [default=yes]]),
+ [HW_IKALOGIC_SCANAPLUS="$enableval"],
+ [HW_IKALOGIC_SCANAPLUS=yes])
+
AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
[enable Lascar EL-USB support [default=yes]]),
[HW_LASCAR_EL_USB="$enableval"],
AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic2 support])
fi
+AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes)
+if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then
+ AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [Ikalogic ScanaPLUS support])
+fi
+
AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes)
if test "x$HW_LASCAR_EL_USB" = "xyes"; then
AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
hardware/colead-slm/Makefile
hardware/common/Makefile
hardware/ikalogic-scanalogic2/Makefile
+ hardware/ikalogic-scanaplus/Makefile
hardware/lascar-el-usb/Makefile
hardware/mic-985xx/Makefile
hardware/nexus-osciprime/Makefile
echo " - fx2lafw......................... $HW_FX2LAFW"
echo " - hantek-dso...................... $HW_HANTEK_DSO"
echo " - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2"
+echo " - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS"
echo " - lascar-el-usb................... $HW_LASCAR_EL_USB"
echo " - link-mso19...................... $HW_LINK_MSO19"
echo " - mic-985xx....................... $HW_MIC_985XX"
fx2lafw \
hantek-dso \
ikalogic-scanalogic2 \
+ ikalogic-scanaplus \
lascar-el-usb \
link-mso19 \
mic-985xx \
libsigrokhardware_la_LIBADD += ikalogic-scanalogic2/libsigrok_hw_ikalogic_scanalogic2.la
endif
+if HW_IKALOGIC_SCANAPLUS
+libsigrokhardware_la_LIBADD += ikalogic-scanaplus/libsigrok_hw_ikalogic_scanaplus.la
+endif
+
if HW_LASCAR_EL_USB
libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la
endif
--- /dev/null
+##
+## This file is part of the libsigrok project.
+##
+## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+if HW_IKALOGIC_SCANAPLUS
+
+# Local lib, this is NOT meant to be installed!
+noinst_LTLIBRARIES = libsigrok_hw_ikalogic_scanaplus.la
+
+libsigrok_hw_ikalogic_scanaplus_la_SOURCES = \
+ api.c \
+ protocol.c \
+ protocol.h
+
+libsigrok_hw_ikalogic_scanaplus_la_CFLAGS = \
+ -I$(top_srcdir)
+
+endif
--- /dev/null
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "protocol.h"
+
+SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
+static struct sr_dev_driver *di = &ikalogic_scanaplus_driver_info;
+
+static int init(struct sr_context *sr_ctx)
+{
+ return std_hw_init(sr_ctx, di, LOG_PREFIX);
+}
+
+static GSList *scan(GSList *options)
+{
+ struct drv_context *drvc;
+ GSList *devices;
+
+ (void)options;
+
+ devices = NULL;
+ drvc = di->priv;
+ drvc->instances = NULL;
+
+ return devices;
+}
+
+static GSList *dev_list(void)
+{
+ return ((struct drv_context *)(di->priv))->instances;
+}
+
+static int dev_clear(void)
+{
+ return std_dev_clear(di, NULL);
+}
+
+static int dev_open(struct sr_dev_inst *sdi)
+{
+ (void)sdi;
+
+ sdi->status = SR_ST_ACTIVE;
+
+ return SR_OK;
+}
+
+static int dev_close(struct sr_dev_inst *sdi)
+{
+ (void)sdi;
+
+ sdi->status = SR_ST_INACTIVE;
+
+ return SR_OK;
+}
+
+static int cleanup(void)
+{
+ return dev_clear();
+}
+
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+{
+ int ret;
+
+ (void)sdi;
+ (void)data;
+
+ ret = SR_OK;
+ switch (key) {
+ default:
+ return SR_ERR_NA;
+ }
+
+ return ret;
+}
+
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+{
+ int ret;
+
+ (void)data;
+
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
+ ret = SR_OK;
+ switch (key) {
+ default:
+ ret = SR_ERR_NA;
+ }
+
+ return ret;
+}
+
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+{
+ int ret;
+
+ (void)sdi;
+ (void)data;
+
+ ret = SR_OK;
+ switch (key) {
+ default:
+ return SR_ERR_NA;
+ }
+
+ return ret;
+}
+
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+{
+ (void)sdi;
+ (void)cb_data;
+
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
+ return SR_OK;
+}
+
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+{
+ (void)cb_data;
+
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
+ return SR_OK;
+}
+
+SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info = {
+ .name = "ikalogic-scanaplus",
+ .longname = "Ikalogic ScanaPLUS",
+ .api_version = 1,
+ .init = init,
+ .cleanup = cleanup,
+ .scan = scan,
+ .dev_list = dev_list,
+ .dev_clear = dev_clear,
+ .config_get = config_get,
+ .config_set = config_set,
+ .config_list = config_list,
+ .dev_open = dev_open,
+ .dev_close = dev_close,
+ .dev_acquisition_start = dev_acquisition_start,
+ .dev_acquisition_stop = dev_acquisition_stop,
+ .priv = NULL,
+};
--- /dev/null
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "protocol.h"
+
+SR_PRIV int ikalogic_scanaplus_receive_data(int fd, int revents, void *cb_data)
+{
+ const struct sr_dev_inst *sdi;
+ struct dev_context *devc;
+
+ (void)fd;
+
+ if (!(sdi = cb_data))
+ return TRUE;
+
+ if (!(devc = sdi->priv))
+ return TRUE;
+
+ if (revents == G_IO_IN) {
+ /* TODO */
+ }
+
+ return TRUE;
+}
--- /dev/null
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBSIGROK_HARDWARE_IKALOGIC_SCANAPLUS_PROTOCOL_H
+#define LIBSIGROK_HARDWARE_IKALOGIC_SCANAPLUS_PROTOCOL_H
+
+#include <stdint.h>
+#include <glib.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "ikalogic-scanaplus: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+
+/** Private, per-device-instance driver context. */
+struct dev_context {
+};
+
+SR_PRIV int ikalogic_scanaplus_receive_data(int fd, int revents, void *cb_data);
+
+#endif
#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
#endif
+#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
+extern SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
+#endif
#ifdef HAVE_HW_LASCAR_EL_USB
extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
#endif
#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
&ikalogic_scanalogic2_driver_info,
#endif
+#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
+ &ikalogic_scanaplus_driver_info,
+#endif
#ifdef HAVE_HW_LASCAR_EL_USB
&lascar_el_usb_driver_info,
#endif
projects / libsigrok.git / commitdiff