]> sigrok.org Git - libsigrok.git/commitdiff
appa-55ii: Initial driver skeleton.
authorAurelien Jacobs <redacted>
Sun, 1 Dec 2013 00:13:44 +0000 (01:13 +0100)
committerBert Vermeulen <redacted>
Mon, 23 Dec 2013 00:21:51 +0000 (01:21 +0100)
configure.ac
hardware/Makefile.am
hardware/appa-55ii/Makefile.am [new file with mode: 0644]
hardware/appa-55ii/api.c [new file with mode: 0644]
hardware/appa-55ii/protocol.c [new file with mode: 0644]
hardware/appa-55ii/protocol.h [new file with mode: 0644]
hwdriver.c

index a5215ed0bf70a1db6dc9b62be0949f22f9b5478a..3ee34a89c3f52b074d6fa29eea11f49cedc2673b 100644 (file)
@@ -94,6 +94,11 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
        [HW_ALSA="$enableval"],
        [HW_ALSA=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(appa-55ii, AC_HELP_STRING([--enable-appa-55ii],
+       [enable APPA 55II support [default=yes]]),
+       [HW_APPA_55II="$enableval"],
+       [HW_APPA_55II=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
        [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
        [HW_ASIX_SIGMA="$enableval"],
@@ -368,6 +373,11 @@ if test "x$HW_ALSA" = "xyes"; then
        AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
 fi
 
+AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes)
+if test "x$HW_APPA_55II" = "xyes"; then
+       AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support])
+fi
+
 AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes)
 if test "x$HW_ASIX_SIGMA" = "xyes"; then
        AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
@@ -550,6 +560,7 @@ AC_SUBST(SR_PACKAGE_VERSION)
 AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/agilent-dmm/Makefile
                 hardware/alsa/Makefile
+                hardware/appa-55ii/Makefile
                 hardware/asix-sigma/Makefile
                 hardware/brymen-dmm/Makefile
                 hardware/cem-dt-885x/Makefile
@@ -617,6 +628,7 @@ done
 echo -e "\nEnabled hardware drivers:\n"
 echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
 echo "  - alsa............................ $HW_ALSA"
+echo "  - appa-55ii....................... $HW_APPA_55II"
 echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
 echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
 echo "  - cem-dt-885x..................... $HW_CEM_DT_885X"
index 19a63475e5dfbe78999cc5b8ce512b962defe0f5..3b8a711862ba9cf073dc80b74213d560e10330e7 100644 (file)
@@ -21,6 +21,7 @@
 SUBDIRS = \
        agilent-dmm \
        alsa \
+       appa-55ii \
        asix-sigma \
        brymen-dmm \
        cem-dt-885x \
@@ -67,6 +68,10 @@ if HW_ALSA
 libsigrokhardware_la_LIBADD += alsa/libsigrok_hw_alsa.la
 endif
 
+if HW_APPA_55II
+libsigrokhardware_la_LIBADD += appa-55ii/libsigrok_hw_appa_55ii.la
+endif
+
 if HW_ASIX_SIGMA
 libsigrokhardware_la_LIBADD += asix-sigma/libsigrok_hw_asix_sigma.la
 endif
diff --git a/hardware/appa-55ii/Makefile.am b/hardware/appa-55ii/Makefile.am
new file mode 100644 (file)
index 0000000..8dfa269
--- /dev/null
@@ -0,0 +1,33 @@
+##
+## This file is part of the libsigrok project.
+##
+## Copyright (C) 2013 Aurelien Jacobs <aurel@gnuage.org>
+##
+## 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 3 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, see <http://www.gnu.org/licenses/>.
+##
+
+if HW_APPA_55II
+
+# Local lib, this is NOT meant to be installed!
+noinst_LTLIBRARIES = libsigrok_hw_appa_55ii.la
+
+libsigrok_hw_appa_55ii_la_SOURCES = \
+       api.c \
+       protocol.c \
+       protocol.h
+
+libsigrok_hw_appa_55ii_la_CFLAGS = \
+       -I$(top_srcdir)
+
+endif
diff --git a/hardware/appa-55ii/api.c b/hardware/appa-55ii/api.c
new file mode 100644 (file)
index 0000000..be9b389
--- /dev/null
@@ -0,0 +1,191 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2013 Aurelien Jacobs <aurel@gnuage.org>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "protocol.h"
+
+SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
+static struct sr_dev_driver *di = &appa_55ii_driver_info;
+
+static int init(struct sr_context *sr_ctx)
+{
+       return std_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;
+
+       /* TODO: scan for devices, either based on a SR_CONF_CONN option
+        * or on a USB scan. */
+
+       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;
+
+       /* TODO: get handle from sdi->conn and open it. */
+
+       sdi->status = SR_ST_ACTIVE;
+
+       return SR_OK;
+}
+
+static int dev_close(struct sr_dev_inst *sdi)
+{
+       (void)sdi;
+
+       /* TODO: get handle from sdi->conn and close it. */
+
+       sdi->status = SR_ST_INACTIVE;
+
+       return SR_OK;
+}
+
+static int cleanup(void)
+{
+       dev_clear();
+
+       /* TODO: free other driver resources, if any. */
+
+       return SR_OK;
+}
+
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
+{
+       int ret;
+
+       (void)sdi;
+       (void)data;
+       (void)probe_group;
+
+       ret = SR_OK;
+       switch (key) {
+       /* TODO */
+       default:
+               return SR_ERR_NA;
+       }
+
+       return ret;
+}
+
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
+{
+       int ret;
+
+       (void)data;
+       (void)probe_group;
+
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
+
+       ret = SR_OK;
+       switch (key) {
+       /* TODO */
+       default:
+               ret = SR_ERR_NA;
+       }
+
+       return ret;
+}
+
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
+{
+       int ret;
+
+       (void)sdi;
+       (void)data;
+       (void)probe_group;
+
+       ret = SR_OK;
+       switch (key) {
+       /* TODO */
+       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;
+
+       /* TODO: configure hardware, reset acquisition state, set up
+        * callbacks and send header packet. */
+
+       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;
+
+       /* TODO: stop acquisition. */
+
+       return SR_OK;
+}
+
+SR_PRIV struct sr_dev_driver appa_55ii_driver_info = {
+       .name = "appa-55ii",
+       .longname = "APPA 55II",
+       .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,
+};
diff --git a/hardware/appa-55ii/protocol.c b/hardware/appa-55ii/protocol.c
new file mode 100644 (file)
index 0000000..0b1f250
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2013 Aurelien Jacobs <aurel@gnuage.org>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "protocol.h"
+
+SR_PRIV int appa_55ii_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;
+}
diff --git a/hardware/appa-55ii/protocol.h b/hardware/appa-55ii/protocol.h
new file mode 100644 (file)
index 0000000..7288d1d
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2013 Aurelien Jacobs <aurel@gnuage.org>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBSIGROK_HARDWARE_APPA_55II_PROTOCOL_H
+#define LIBSIGROK_HARDWARE_APPA_55II_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 "appa-55ii: "
+#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 {
+       /* Model-specific information */
+
+       /* Acquisition settings */
+
+       /* Operational state */
+
+       /* Temporary state across callbacks */
+
+};
+
+SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data);
+
+#endif
index 275f30d9a02df6a72440a9acc2d84ccfeadd2454..a94acc9ec9f89ae79caf73859e6f6a5e9dd6ed6b 100644 (file)
@@ -107,6 +107,9 @@ static struct sr_config_info sr_config_info_data[] = {
 };
 
 /** @cond PRIVATE */
+#ifdef HAVE_HW_APPA_55II
+extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
+#endif
 #ifdef HAVE_HW_BRYMEN_DMM
 extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #endif
@@ -237,6 +240,9 @@ extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
 /** @endcond */
 
 static struct sr_dev_driver *drivers_list[] = {
+#ifdef HAVE_HW_APPA_55II
+       &appa_55ii_driver_info,
+#endif
 #ifdef HAVE_HW_BRYMEN_DMM
        &brymen_bm857_driver_info,
 #endif