]> sigrok.org Git - libsigrok.git/commitdiff
mic-985xx: Initial driver skeleton.
authorUwe Hermann <redacted>
Wed, 30 Jan 2013 15:58:01 +0000 (16:58 +0100)
committerUwe Hermann <redacted>
Fri, 1 Feb 2013 22:52:57 +0000 (23:52 +0100)
configure.ac
hardware/Makefile.am
hardware/mic-985xx/Makefile.am [new file with mode: 0644]
hardware/mic-985xx/api.c [new file with mode: 0644]
hardware/mic-985xx/protocol.c [new file with mode: 0644]
hardware/mic-985xx/protocol.h [new file with mode: 0644]
hwdriver.c

index 75d14e8b2f58444b26ebd9027996c2158052c158..32efdea55ec0f60c536f3e380f34e6270ef72494 100644 (file)
@@ -180,6 +180,15 @@ if test "x$LA_LINK_MSO19" = "xyes"; then
        AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
 fi
 
+AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
+       [enable MIC 985xx support [default=yes]]),
+       [HW_MIC_985XX="$enableval"],
+       [HW_MIC_985XX=yes])
+AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
+if test "x$HW_MIC_985XX" = "xyes"; then
+       AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
+fi
+
 AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
        [enable Nexus Osciprime support [default=yes]]),
        [HW_NEXUS_OSCIPRIME="$enableval"],
@@ -379,6 +388,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/colead-slm/Makefile
                 hardware/common/Makefile
                 hardware/lascar-el-usb/Makefile
+                hardware/mic-985xx/Makefile
                 hardware/nexus-osciprime/Makefile
                 hardware/rigol-ds1xx2/Makefile
                 hardware/tondaj-sl-814/Makefile
@@ -435,6 +445,7 @@ echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
+echo "  - MIC 985xx....................... $HW_MIC_985XX"
 echo "  - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Rigol DS1xx2.................... $HW_RIGOL_DS1XX2"
index f81e43319c690b929461741100780ecdfad46e7e..47e90d6dd53371af9e7f1d409f5764ebe19b0503 100644 (file)
@@ -31,6 +31,7 @@ SUBDIRS = \
        hantek-dso \
        lascar-el-usb \
        link-mso19 \
+       mic-985xx \
        nexus-osciprime \
        openbench-logic-sniffer \
        rigol-ds1xx2 \
@@ -91,6 +92,10 @@ if LA_LINK_MSO19
 libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
 endif
 
+if HW_MIC_985XX
+libsigrokhardware_la_LIBADD += mic-985xx/libsigrok_hw_mic_985xx.la
+endif
+
 if HW_NEXUS_OSCIPRIME
 libsigrokhardware_la_LIBADD += nexus-osciprime/libsigrok_hw_nexus_osciprime.la
 endif
diff --git a/hardware/mic-985xx/Makefile.am b/hardware/mic-985xx/Makefile.am
new file mode 100644 (file)
index 0000000..a89206d
--- /dev/null
@@ -0,0 +1,33 @@
+##
+## 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 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_MIC_985XX
+
+# Local lib, this is NOT meant to be installed!
+noinst_LTLIBRARIES = libsigrok_hw_mic_985xx.la
+
+libsigrok_hw_mic_985xx_la_SOURCES = \
+       api.c \
+       protocol.c \
+       protocol.h
+
+libsigrok_hw_mic_985xx_la_CFLAGS = \
+       -I$(top_srcdir)
+
+endif
diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c
new file mode 100644 (file)
index 0000000..f2fe5a9
--- /dev/null
@@ -0,0 +1,205 @@
+/*
+ * 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 mic_985xx_driver_info;
+static struct sr_dev_driver *di = &mic_985xx_driver_info;
+
+/* Properly close and free all devices. */
+static int clear_instances(void)
+{
+       struct sr_dev_inst *sdi;
+       struct drv_context *drvc;
+       struct dev_context *devc;
+       GSList *l;
+
+       if (!(drvc = di->priv))
+               return SR_OK;
+
+       for (l = drvc->instances; l; l = l->next) {
+               if (!(sdi = l->data))
+                       continue;
+               if (!(devc = sdi->priv))
+                       continue;
+
+               /* TODO */
+
+               sr_dev_inst_free(sdi);
+       }
+
+       g_slist_free(drvc->instances);
+       drvc->instances = NULL;
+
+       return SR_OK;
+}
+
+static int hw_init(struct sr_context *sr_ctx)
+{
+       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+}
+
+static GSList *hw_scan(GSList *options)
+{
+       struct drv_context *drvc;
+       GSList *devices;
+
+       (void)options;
+
+       devices = NULL;
+       drvc = di->priv;
+       drvc->instances = NULL;
+
+       /* TODO */
+
+       return devices;
+}
+
+static GSList *hw_dev_list(void)
+{
+       struct drv_context *drvc;
+
+       drvc = di->priv;
+
+       return drvc->instances;
+}
+
+static int hw_dev_open(struct sr_dev_inst *sdi)
+{
+       (void)sdi;
+
+       /* TODO */
+
+       return SR_OK;
+}
+
+static int hw_dev_close(struct sr_dev_inst *sdi)
+{
+       (void)sdi;
+
+       /* TODO */
+
+       return SR_OK;
+}
+
+static int hw_cleanup(void)
+{
+       clear_instances();
+
+       /* TODO */
+
+       return SR_OK;
+}
+
+static int hw_config_get(int id, const void **value,
+                        const struct sr_dev_inst *sdi)
+{
+       (void)sdi;
+       (void)value;
+
+       switch (id) {
+       /* TODO */
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
+static int hw_config_set(int id, const void *value,
+                        const struct sr_dev_inst *sdi)
+{
+       (void)value;
+
+       int ret;
+
+       if (sdi->status != SR_ST_ACTIVE) {
+               sr_err("Device inactive, can't set config options.");
+               return SR_ERR;
+       }
+
+       ret = SR_OK;
+       switch (id) {
+       /* TODO */
+       default:
+               sr_err("Unknown hardware capability: %d.", id);
+               ret = SR_ERR_ARG;
+       }
+
+       return ret;
+}
+
+static int hw_config_list(int key, const void **data,
+                         const struct sr_dev_inst *sdi)
+{
+       (void)sdi;
+       (void)data;
+
+       switch (key) {
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+                                   void *cb_data)
+{
+       (void)sdi;
+       (void)cb_data;
+
+       /* TODO */
+
+       return SR_OK;
+}
+
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+{
+       (void)cb_data;
+
+       if (sdi->status != SR_ST_ACTIVE) {
+               sr_err("Device inactive, can't stop acquisition.");
+               return SR_ERR;
+       }
+
+       /* TODO */
+
+       return SR_OK;
+}
+
+SR_PRIV struct sr_dev_driver mic_985xx_driver_info = {
+       .name = "mic-985xx",
+       .longname = "MIC 985xx",
+       .api_version = 1,
+       .init = hw_init,
+       .cleanup = hw_cleanup,
+       .scan = hw_scan,
+       .dev_list = hw_dev_list,
+       .dev_clear = clear_instances,
+       .config_get = hw_config_get,
+       .config_set = hw_config_set,
+       .config_list = hw_config_list,
+       .dev_open = hw_dev_open,
+       .dev_close = hw_dev_close,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .priv = NULL,
+};
diff --git a/hardware/mic-985xx/protocol.c b/hardware/mic-985xx/protocol.c
new file mode 100644 (file)
index 0000000..9326920
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * 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 mic_985xx_receive_data(int fd, int revents, void *cb_data)
+{
+       (void)fd;
+
+       const struct sr_dev_inst *sdi;
+       struct dev_context *devc;
+
+       if (!(sdi = cb_data))
+               return TRUE;
+
+       if (!(devc = sdi->priv))
+               return TRUE;
+
+       if (revents == G_IO_IN) {
+               /* TODO */
+       }
+
+       return TRUE;
+}
diff --git a/hardware/mic-985xx/protocol.h b/hardware/mic-985xx/protocol.h
new file mode 100644 (file)
index 0000000..0b1efdd
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * 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_MIC_985XX_PROTOCOL_H
+#define LIBSIGROK_HARDWARE_MIC_985XX_PROTOCOL_H
+
+#include <stdint.h>
+#include <glib.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "mic-985xx: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
+/** Private, per-device-instance driver context. */
+struct dev_context {
+       /** The current sampling limit (in number of samples). */
+       uint64_t limit_samples;
+
+       /** The current sampling limit (in ms). */
+       uint64_t limit_msec;
+
+       /** Opaque pointer passed in by the frontend. */
+       void *cb_data;
+
+       /** The current number of already received samples. */
+       uint64_t num_samples;
+};
+
+SR_PRIV int mic_985xx_receive_data(int fd, int revents, void *cb_data);
+
+#endif
index d8748e93b27bedda303c1ca9847750bd7141438b..aec83b521fa8dffaf11400a98ca040c4e413f3a8 100644 (file)
@@ -92,6 +92,9 @@ extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #ifdef HAVE_HW_LASCAR_EL_USB
 extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 #endif
+#ifdef HAVE_HW_MIC_985XX
+extern SR_PRIV struct sr_dev_driver mic_985xx_driver_info;
+#endif
 #ifdef HAVE_HW_NEXUS_OSCIPRIME
 extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
 #endif
@@ -166,6 +169,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_LASCAR_EL_USB
        &lascar_el_usb_driver_info,
 #endif
+#ifdef HAVE_HW_MIC_985XX
+       &mic_985xx_driver_info,
+#endif
 #ifdef HAVE_HW_NEXUS_OSCIPRIME
        &nexus_osciprime_driver_info,
 #endif