From: Matthias Heidbrink Date: Tue, 19 Nov 2013 16:49:23 +0000 (+0100) Subject: gmc_mh_1x_2x: Inital driver skeleton. X-Git-Tag: libsigrok-0.3.0~544 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=7b4edcb654d6b36da4369bac3688ad77f6132766;p=libsigrok.git gmc_mh_1x_2x: Inital driver skeleton. --- diff --git a/configure.ac b/configure.ac index 36a82d51..bb3e0476 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,11 @@ AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw], [HW_FX2LAFW="$enableval"], [HW_FX2LAFW=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(gmc-mh-1x-2x, AC_HELP_STRING([--enable-gmc-mh-1x-2x], + [enable gmc-mh-1x-2x support [default=yes]]), + [HW_GMC_MH_1X_2X="$enableval"], + [HW_GMC_MH_1X_2X=$HW_ENABLED_DEFAULT]) + AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], [enable Hantek DSO support [default=yes]]), [HW_HANTEK_DSO="$enableval"], @@ -403,6 +408,11 @@ if test "x$HW_FX2LAFW" = "xyes"; then AC_DEFINE(HAVE_HW_FX2LAFW, 1, [fx2lafw support]) fi +AM_CONDITIONAL(HW_GMC_MH_1X_2X, test x$HW_GMC_MH_1X_2X = xyes) +if test "x$HW_GMC_MH_1X_2X" = "xyes"; then + AC_DEFINE(HAVE_HW_GMC_MH_1X_2X, 1, [gmc-mh-1x-2x support]) +fi + AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes) if test "x$HW_HANTEK_DSO" = "xyes"; then AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support]) @@ -537,6 +547,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/chronovu-la8/Makefile hardware/colead-slm/Makefile hardware/common/Makefile + hardware/gmc-mh-1x-2x/Makefile hardware/ikalogic-scanalogic2/Makefile hardware/ikalogic-scanaplus/Makefile hardware/kecheng-kc-330b/Makefile @@ -604,6 +615,7 @@ echo " - colead-slm...................... $HW_COLEAD_SLM" echo " - demo............................ $HW_DEMO" echo " - fluke-dmm....................... $HW_FLUKE_DMM" echo " - fx2lafw......................... $HW_FX2LAFW" +echo " - gmc-mh-1x-2x.................... $HW_GMC_MH_1X_2X" echo " - hantek-dso...................... $HW_HANTEK_DSO" echo " - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2" echo " - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS" diff --git a/hardware/Makefile.am b/hardware/Makefile.am index 1f762da9..27735af6 100644 --- a/hardware/Makefile.am +++ b/hardware/Makefile.am @@ -31,6 +31,7 @@ SUBDIRS = \ demo \ fluke-dmm \ fx2lafw \ + gmc-mh-1x-2x \ hantek-dso \ ikalogic-scanalogic2 \ ikalogic-scanaplus \ @@ -101,6 +102,10 @@ if HW_FX2LAFW libsigrokhardware_la_LIBADD += fx2lafw/libsigrok_hw_fx2lafw.la endif +if HW_GMC_MH_1X_2X +libsigrokhardware_la_LIBADD += gmc-mh-1x-2x/libsigrok_hw_gmc_mh_1x_2x.la +endif + if HW_HANTEK_DSO libsigrokhardware_la_LIBADD += hantek-dso/libsigrok_hw_hantek_dso.la endif diff --git a/hardware/gmc-mh-1x-2x/Makefile.am b/hardware/gmc-mh-1x-2x/Makefile.am new file mode 100644 index 00000000..9559d1c7 --- /dev/null +++ b/hardware/gmc-mh-1x-2x/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_GMC_MH_1X_2X + +# Local lib, this is NOT meant to be installed! +noinst_LTLIBRARIES = libsigrok_hw_gmc_mh_1x_2x.la + +libsigrok_hw_gmc_mh_1x_2x_la_SOURCES = \ + api.c \ + protocol.c \ + protocol.h + +libsigrok_hw_gmc_mh_1x_2x_la_CFLAGS = \ + -I$(top_srcdir) + +endif diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c new file mode 100644 index 00000000..8647d7fa --- /dev/null +++ b/hardware/gmc-mh-1x-2x/api.c @@ -0,0 +1,192 @@ +/* + * 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 gmc_mh_1x_2x_rs232_driver_info; +static struct sr_dev_driver *di = &gmc_mh_1x_2x_rs232_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 gmc_mh_1x_2x_rs232_driver_info = { + .name = "gmc-mh-1x-2x-rs232", + .longname = + "Gossen Metrawatt Metrahit 1x/2x DMMs, 'RS232' Interface", + .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/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c new file mode 100644 index 00000000..ef7427fe --- /dev/null +++ b/hardware/gmc-mh-1x-2x/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 gmc_mh_1x_2x_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/gmc-mh-1x-2x/protocol.h b/hardware/gmc-mh-1x-2x/protocol.h new file mode 100644 index 00000000..799421d0 --- /dev/null +++ b/hardware/gmc-mh-1x-2x/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_GMC_MH_1X_2X_PROTOCOL_H +#define LIBSIGROK_HARDWARE_GMC_MH_1X_2X_PROTOCOL_H + +#include +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "gmc-mh-1x-2x: " +#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 gmc_mh_1x_2x_receive_data(int fd, int revents, void *cb_data); + +#endif diff --git a/hwdriver.c b/hwdriver.c index ade8b3dc..3f2360dc 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -123,6 +123,9 @@ extern SR_PRIV struct sr_dev_driver colead_slm_driver_info; #ifdef HAVE_HW_DEMO extern SR_PRIV struct sr_dev_driver demo_driver_info; #endif +#ifdef HAVE_HW_GMC_MH_1X_2X +extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info; +#endif #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2 extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info; #endif @@ -245,6 +248,9 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_DEMO &demo_driver_info, #endif +#ifdef HAVE_HW_GMC_MH_1X_2X + &gmc_mh_1x_2x_rs232_driver_info, +#endif #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2 &ikalogic_scanalogic2_driver_info, #endif