From: Matthias Heidbrink Date: Thu, 17 Oct 2013 08:57:17 +0000 (+0200) Subject: norma dmm: Initial driver skeleton. X-Git-Tag: libsigrok-0.2.2~25 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=bfd48770fc18dae79d140120e6af3b7ac4bdb2ee norma dmm: Initial driver skeleton. --- diff --git a/configure.ac b/configure.ac index bf6603da..50d81239 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,11 @@ AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx], [HW_MIC_985XX="$enableval"], [HW_MIC_985XX=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(norma-dmm, AC_HELP_STRING([--enable-norma-dmm], + [enable Norma DMM support [default=yes]]), + [HW_NORMA_DMM="$enableval"], + [HW_NORMA_DMM=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols], [enable OpenBench Logic Sniffer (OLS) support [default=yes]]), [HW_OLS="$enableval"], @@ -416,6 +421,11 @@ if test "x$HW_MIC_985XX" = "xyes"; then AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support]) fi +AM_CONDITIONAL(HW_NORMA_DMM, test x$HW_NORMA_DMM = xyes) +if test "x$HW_NORMA_DMM" = "xyes"; then + AC_DEFINE(HAVE_HW_NORMA_DMM, 1, [norma-dmm support]) +fi + AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes) if test "x$HW_OLS" = "xyes"; then AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support]) @@ -521,6 +531,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/fx2lafw/Makefile hardware/hantek-dso/Makefile hardware/link-mso19/Makefile + hardware/norma-dmm/Makefile hardware/openbench-logic-sniffer/Makefile hardware/serial-dmm/Makefile hardware/uni-t-dmm/Makefile @@ -578,6 +589,7 @@ echo " - kecheng-kc-330b................. $HW_KECHENG_KC_330B" echo " - lascar-el-usb................... $HW_LASCAR_EL_USB" echo " - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19" echo " - mic-985xx....................... $HW_MIC_985XX" +echo " - norma-dmm....................... $HW_NORMA_DMM" echo " - openbench-logic-sniffer......... $HW_OLS" echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2" echo " - saleae-logic16.................. $HW_SALEAE_LOGIC16" diff --git a/hardware/Makefile.am b/hardware/Makefile.am index 0260c015..1f762da9 100644 --- a/hardware/Makefile.am +++ b/hardware/Makefile.am @@ -38,6 +38,7 @@ SUBDIRS = \ lascar-el-usb \ link-mso19 \ mic-985xx \ + norma-dmm \ openbench-logic-sniffer \ rigol-ds1xx2 \ saleae-logic16 \ @@ -128,6 +129,10 @@ if HW_MIC_985XX libsigrokhardware_la_LIBADD += mic-985xx/libsigrok_hw_mic_985xx.la endif +if HW_NORMA_DMM +libsigrokhardware_la_LIBADD += norma-dmm/libsigrok_hw_norma_dmm.la +endif + if HW_OLS libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrok_hw_ols.la endif diff --git a/hardware/norma-dmm/Makefile.am b/hardware/norma-dmm/Makefile.am new file mode 100644 index 00000000..943ff855 --- /dev/null +++ b/hardware/norma-dmm/Makefile.am @@ -0,0 +1,33 @@ +## +## This file is part of the libsigrok project. +## +## Copyright (C) 2013 Matthias Heidbrink +## +## 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 . +## + +if HW_NORMA_DMM + +# Local lib, this is NOT meant to be installed! +noinst_LTLIBRARIES = libsigrok_hw_norma_dmm.la + +libsigrok_hw_norma_dmm_la_SOURCES = \ + api.c \ + protocol.c \ + protocol.h + +libsigrok_hw_norma_dmm_la_CFLAGS = \ + -I$(top_srcdir) + +endif diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c new file mode 100644 index 00000000..fb24c7e3 --- /dev/null +++ b/hardware/norma-dmm/api.c @@ -0,0 +1,185 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Matthias Heidbrink + * + * 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 . + */ + +#include "protocol.h" + +SR_PRIV struct sr_dev_driver norma_dmm_driver_info; +static struct sr_dev_driver *di = &norma_dmm_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) +{ + int ret; + + (void)sdi; + (void)data; + + 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) +{ + int ret; + + (void)data; + + 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) +{ + int ret; + + (void)sdi; + (void)data; + + 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 norma_dmm_driver_info = { + .name = "norma-dmm", + .longname = "norma-dmm", + .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/norma-dmm/protocol.c b/hardware/norma-dmm/protocol.c new file mode 100644 index 00000000..2dd0b1b7 --- /dev/null +++ b/hardware/norma-dmm/protocol.c @@ -0,0 +1,40 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Matthias Heidbrink + * + * 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 . + */ + +#include "protocol.h" + +SR_PRIV int norma_dmm_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/norma-dmm/protocol.h b/hardware/norma-dmm/protocol.h new file mode 100644 index 00000000..a8af2613 --- /dev/null +++ b/hardware/norma-dmm/protocol.h @@ -0,0 +1,51 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Matthias Heidbrink + * + * 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 . + */ + +#ifndef LIBSIGROK_HARDWARE_NORMA_DMM_PROTOCOL_H +#define LIBSIGROK_HARDWARE_NORMA_DMM_PROTOCOL_H + +#include +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "norma-dmm: " +#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 norma_dmm_receive_data(int fd, int revents, void *cb_data); + +#endif diff --git a/hwdriver.c b/hwdriver.c index 1e476df8..48b91ac9 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -139,6 +139,9 @@ extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; extern SR_PRIV struct sr_dev_driver mic_98581_driver_info; extern SR_PRIV struct sr_dev_driver mic_98583_driver_info; #endif +#ifdef HAVE_HW_NORMA_DMM +extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info; +#endif #ifdef HAVE_HW_OLS extern SR_PRIV struct sr_dev_driver ols_driver_info; #endif @@ -256,6 +259,9 @@ static struct sr_dev_driver *drivers_list[] = { &mic_98581_driver_info, &mic_98583_driver_info, #endif +#ifdef HAVE_HW_NORMA_DMM + &norma_dmm_driver_info, +#endif #ifdef HAVE_HW_OLS &ols_driver_info, #endif