From 8fa9368eb41c7cb040a9eaef34aecc9f8a9e6d7e Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Sat, 8 Jun 2013 01:12:10 +0200 Subject: [PATCH] cem-dt-885x: Initial driver skeleton. --- configure.ac | 11 ++ hardware/Makefile.am | 5 + hardware/cem-dt-885x/Makefile.am | 33 ++++++ hardware/cem-dt-885x/api.c | 190 +++++++++++++++++++++++++++++++ hardware/cem-dt-885x/protocol.c | 40 +++++++ hardware/cem-dt-885x/protocol.h | 51 +++++++++ hwdriver.c | 6 + 7 files changed, 336 insertions(+) create mode 100644 hardware/cem-dt-885x/Makefile.am create mode 100644 hardware/cem-dt-885x/api.c create mode 100644 hardware/cem-dt-885x/protocol.c create mode 100644 hardware/cem-dt-885x/protocol.h diff --git a/configure.ac b/configure.ac index db20a35a..a49ae870 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,15 @@ AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], [HW_BRYMEN_DMM="$enableval"], [HW_BRYMEN_DMM=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x], + [enable CEM DT-885x support [default=yes]]), + [HW_CEM_DT_885X="$enableval"], + [HW_CEM_DT_885X=yes]) +AM_CONDITIONAL(HW_CEM_DT_885X, test x$HW_CEM_DT_885X = xyes) +if test "x$HW_CEM_DT_885X" = "xyes"; then + AC_DEFINE(HAVE_HW_CEM_DT_885X, 1, [CEM DT-885x support]) +fi + AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8], [enable ChronoVu LA8 support [default=yes]]), [HW_CHRONOVU_LA8="$enableval"], @@ -438,6 +447,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/alsa/Makefile hardware/asix-sigma/Makefile hardware/brymen-dmm/Makefile + hardware/cem-dt-885x/Makefile hardware/chronovu-la8/Makefile hardware/colead-slm/Makefile hardware/common/Makefile @@ -496,6 +506,7 @@ echo " - agilent-dmm..................... $HW_AGILENT_DMM" echo " - alsa............................ $HW_ALSA" echo " - asix-sigma...................... $HW_ASIX_SIGMA" echo " - brymen-dmm...................... $HW_BRYMEN_DMM" +echo " - cem-dt-885x..................... $HW_CEM_DT_885X" echo " - chronovu-la8.................... $HW_CHRONOVU_LA8" echo " - colead-slm...................... $HW_COLEAD_SLM" echo " - demo............................ $HW_DEMO" diff --git a/hardware/Makefile.am b/hardware/Makefile.am index f64dac4b..8f983412 100644 --- a/hardware/Makefile.am +++ b/hardware/Makefile.am @@ -23,6 +23,7 @@ SUBDIRS = \ alsa \ asix-sigma \ brymen-dmm \ + cem-dt-885x \ chronovu-la8 \ colead-slm \ common \ @@ -66,6 +67,10 @@ if HW_BRYMEN_DMM libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la endif +if HW_CEM_DT_885X +libsigrokhardware_la_LIBADD += cem-dt-885x/libsigrok_hw_cem_dt_885x.la +endif + if HW_CHRONOVU_LA8 libsigrokhardware_la_LIBADD += chronovu-la8/libsigrok_hw_chronovu_la8.la endif diff --git a/hardware/cem-dt-885x/Makefile.am b/hardware/cem-dt-885x/Makefile.am new file mode 100644 index 00000000..abc8a226 --- /dev/null +++ b/hardware/cem-dt-885x/Makefile.am @@ -0,0 +1,33 @@ +## +## This file is part of the libsigrok project. +## +## Copyright (C) 2013 Bert Vermeulen +## +## 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_CEM_DT_885X + +# Local lib, this is NOT meant to be installed! +noinst_LTLIBRARIES = libsigrok_hw_cem_dt_885x.la + +libsigrok_hw_cem_dt_885x_la_SOURCES = \ + api.c \ + protocol.c \ + protocol.h + +libsigrok_hw_cem_dt_885x_la_CFLAGS = \ + -I$(top_srcdir) + +endif diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c new file mode 100644 index 00000000..7e8c96a5 --- /dev/null +++ b/hardware/cem-dt-885x/api.c @@ -0,0 +1,190 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Bert Vermeulen + * + * 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 cem_dt_885x_driver_info; +static struct sr_dev_driver *di = &cem_dt_885x_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) +{ + struct drv_context *drvc; + + drvc = di->priv; + + return drvc->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 cem_dt_885x_driver_info = { + .name = "cem-dt-885x", + .longname = "CEM DT-885x", + .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/cem-dt-885x/protocol.c b/hardware/cem-dt-885x/protocol.c new file mode 100644 index 00000000..0e4f93b2 --- /dev/null +++ b/hardware/cem-dt-885x/protocol.c @@ -0,0 +1,40 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Bert Vermeulen + * + * 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 cem_dt_885x_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/cem-dt-885x/protocol.h b/hardware/cem-dt-885x/protocol.h new file mode 100644 index 00000000..ca995f1b --- /dev/null +++ b/hardware/cem-dt-885x/protocol.h @@ -0,0 +1,51 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Bert Vermeulen + * + * 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_CEM_DT_885X_PROTOCOL_H +#define LIBSIGROK_HARDWARE_CEM_DT_885X_PROTOCOL_H + +#include +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "cem-dt-885x: " +#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 cem_dt_885x_receive_data(int fd, int revents, void *cb_data); + +#endif diff --git a/hwdriver.c b/hwdriver.c index 6cb1431d..2c36f467 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -90,6 +90,9 @@ static struct sr_config_info sr_config_info_data[] = { #ifdef HAVE_HW_BRYMEN_DMM extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info; #endif +#ifdef HAVE_HW_CEM_DT_885X +extern SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info; +#endif #ifdef HAVE_HW_COLEAD_SLM extern SR_PRIV struct sr_dev_driver colead_slm_driver_info; #endif @@ -182,6 +185,9 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_BRYMEN_DMM &brymen_bm857_driver_info, #endif +#ifdef HAVE_HW_CEM_DT_885X + &cem_dt_885x_driver_info, +#endif #ifdef HAVE_HW_COLEAD_SLM &colead_slm_driver_info, #endif