From: Bert Vermeulen Date: Tue, 27 Nov 2012 16:40:14 +0000 (+0100) Subject: lascar-el-usb: Initial driver skeleton. X-Git-Tag: dsupstream~487 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=46697e38b286541e0e5aa354d35a6f4564855fa6;p=libsigrok.git lascar-el-usb: Initial driver skeleton. --- diff --git a/configure.ac b/configure.ac index 18e81b41..65013108 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,15 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then fi # Disabled by default, unfinished. +AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb], + [enable Lascar EL-USB support [default=yes]]), + [HW_LASCAR_EL_USB="$enableval"], + [HW_LASCAR_EL_USB=yes]) +AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes) +if test "x$HW_LASCAR_EL_USB" = "xyes"; then + AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support]) +fi + AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19], [enable Link Instruments MSO-19 support [default=no]]), [LA_LINK_MSO19="$enableval"], @@ -350,6 +359,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/chronovu-la8/Makefile hardware/colead-slm/Makefile hardware/common/Makefile + hardware/lascar-el-usb/Makefile hardware/tondaj-sl-814/Makefile hardware/victor-dmm/Makefile hardware/common/dmm/Makefile @@ -401,6 +411,7 @@ echo " - Demo driver..................... $LA_DEMO" echo " - Fluke DMM....................... $HW_FLUKE_DMM" 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 " - Openbench Logic Sniffer......... $LA_OLS" echo " - Serial DMM...................... $HW_SERIAL_DMM" diff --git a/hardware/Makefile.am b/hardware/Makefile.am index b15f917d..31a59a1f 100644 --- a/hardware/Makefile.am +++ b/hardware/Makefile.am @@ -29,6 +29,7 @@ SUBDIRS = \ fluke-dmm \ fx2lafw \ hantek-dso \ + lascar-el-usb \ link-mso19 \ openbench-logic-sniffer \ serial-dmm \ @@ -80,6 +81,10 @@ if HW_HANTEK_DSO libsigrokhardware_la_LIBADD += hantek-dso/libsigrokhw_hantek_dso.la endif +if HW_LASCAR_EL_USB +libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la +endif + if LA_LINK_MSO19 libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la endif diff --git a/hardware/lascar-el-usb/Makefile.am b/hardware/lascar-el-usb/Makefile.am new file mode 100644 index 00000000..8690c893 --- /dev/null +++ b/hardware/lascar-el-usb/Makefile.am @@ -0,0 +1,33 @@ +## +## This file is part of the libsigrok project. +## +## Copyright (C) 2012 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_LASCAR_EL_USB + +# Local lib, this is NOT meant to be installed! +noinst_LTLIBRARIES = libsigrok_hw_lascar_el_usb.la + +libsigrok_hw_lascar_el_usb_la_SOURCES = \ + api.c \ + protocol.c \ + protocol.h + +libsigrok_hw_lascar_el_usb_la_CFLAGS = \ + -I$(top_srcdir) + +endif diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c new file mode 100644 index 00000000..62825249 --- /dev/null +++ b/hardware/lascar-el-usb/api.c @@ -0,0 +1,193 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2012 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 +#include "libsigrok.h" +#include "libsigrok-internal.h" +#include "protocol.h" + +SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; +static struct sr_dev_driver *di = &lascar_el_usb_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(void) +{ + struct drv_context *drvc; + + if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { + sr_err("Driver context malloc failed."); + return SR_ERR_MALLOC; + } + + /* TODO */ + + di->priv = drvc; + + return SR_OK; +} + +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) +{ + /* TODO */ + + return SR_OK; +} + +static int hw_dev_close(struct sr_dev_inst *sdi) +{ + /* TODO */ + + return SR_OK; +} + +static int hw_cleanup(void) +{ + clear_instances(); + + /* TODO */ + + return SR_OK; +} + +static int hw_info_get(int info_id, const void **data, + const struct sr_dev_inst *sdi) +{ + switch (info_id) { + /* TODO */ + default: + sr_err("Unknown info_id: %d.", info_id); + return SR_ERR_ARG; + } + + return SR_OK; +} + +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const 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 (hwcap) { + /* TODO */ + default: + sr_err("Unknown hardware capability: %d.", hwcap); + ret = SR_ERR_ARG; + } + + return ret; +} + +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) +{ + /* TODO */ + + return SR_OK; +} + +static int hw_dev_acquisition_stop(const 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 lascar_el_usb_driver_info = { + .name = "lascar-el-usb", + .longname = "Lascar EL-USB", + .api_version = 1, + .init = hw_init, + .cleanup = hw_cleanup, + .scan = hw_scan, + .dev_list = hw_dev_list, + .dev_clear = clear_instances, + .dev_open = hw_dev_open, + .dev_close = hw_dev_close, + .info_get = hw_info_get, + .dev_config_set = hw_dev_config_set, + .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_stop = hw_dev_acquisition_stop, + .priv = NULL, +}; diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c new file mode 100644 index 00000000..ccb4d2c9 --- /dev/null +++ b/hardware/lascar-el-usb/protocol.c @@ -0,0 +1,42 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2012 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 +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" +#include "protocol.h" + +SR_PRIV int lascar_el_usb_receive_data(int fd, int revents, void *cb_data) +{ + 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/lascar-el-usb/protocol.h b/hardware/lascar-el-usb/protocol.h new file mode 100644 index 00000000..ea3e4c81 --- /dev/null +++ b/hardware/lascar-el-usb/protocol.h @@ -0,0 +1,53 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2012 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_LASCAR_EL_USB_PROTOCOL_H +#define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H + +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/* Message logging helpers with driver-specific prefix string. */ +#define DRIVER_LOG_DOMAIN "lascar-el-usb: " +#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 lascar_el_usb_receive_data(int fd, int revents, void *cb_data); + +#endif diff --git a/hwdriver.c b/hwdriver.c index da8794e7..e685459f 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -74,6 +74,9 @@ extern SR_PRIV struct sr_dev_driver colead_slm_driver_info; #ifdef HAVE_LA_DEMO extern SR_PRIV struct sr_dev_driver demo_driver_info; #endif +#ifdef HAVE_HW_LASCAR_EL_USB +extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; +#endif #ifdef HAVE_LA_OLS extern SR_PRIV struct sr_dev_driver ols_driver_info; #endif @@ -136,6 +139,9 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_LA_DEMO &demo_driver_info, #endif +#ifdef HAVE_HW_LASCAR_EL_USB + &lascar_el_usb_driver_info, +#endif #ifdef HAVE_LA_OLS &ols_driver_info, #endif