From: Aurelien Jacobs Date: Sun, 1 Feb 2015 22:49:03 +0000 (+0100) Subject: maynuo-m97: Initial driver skeleton. X-Git-Tag: libsigrok-0.4.0~496 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e1ccfb191062d13b98bb7536d162a044e0758678;p=libsigrok.git maynuo-m97: Initial driver skeleton. --- diff --git a/Makefile.am b/Makefile.am index 4efe1543..ef408422 100644 --- a/Makefile.am +++ b/Makefile.am @@ -285,6 +285,12 @@ libsigrok_la_SOURCES += \ src/hardware/manson-hcs-3xxx/protocol.c \ src/hardware/manson-hcs-3xxx/api.c endif +if HW_MAYNUO_M97 +libsigrok_la_SOURCES += \ + src/hardware/maynuo-m97/protocol.h \ + src/hardware/maynuo-m97/protocol.c \ + src/hardware/maynuo-m97/api.c +endif if HW_MIC_985XX libsigrok_la_SOURCES += \ src/hardware/mic-985xx/protocol.h \ diff --git a/configure.ac b/configure.ac index 85087b5d..e6e648e6 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,7 @@ DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus]) DRIVER([Kecheng KC-330B], [kecheng-kc-330b]) DRIVER([Lascar EL-USB], [lascar-el-usb]) DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx]) +DRIVER([maynuo-m97], [maynuo-m97]) DRIVER([MIC 985xx], [mic-985xx]) DRIVER([Motech LPS 30x], [motech-lps-30x]) DRIVER([Norma DMM], [norma-dmm]) @@ -498,6 +499,7 @@ DRIVER2([HW_IKALOGIC_SCANAPLUS], [$HW_IKALOGIC_SCANAPLUS], [HAVE_HW_IKALOGIC_SCA DRIVER2([HW_KECHENG_KC_330B], [$HW_KECHENG_KC_330B], [HAVE_HW_KECHENG_KC_330B]) DRIVER2([HW_LASCAR_EL_USB], [$HW_LASCAR_EL_USB], [HAVE_HW_LASCAR_EL_USB]) DRIVER2([HW_MANSON_HCS_3XXX], [$HW_MANSON_HCS_3XXX], [HAVE_HW_MANSON_HCS_3XXX]) +DRIVER2([HW_MAYNUO_M97], [$HW_MAYNUO_M97], [HAVE_HW_MAYNUO_M97]) DRIVER2([HW_MIC_985XX], [$HW_MIC_985XX], [HAVE_HW_MIC_985XX]) DRIVER2([HW_MOTECH_LPS_30X], [$HW_MOTECH_LPS_30X], [HAVE_HW_MOTECH_LPS_30X]) DRIVER2([HW_NORMA_DMM], [$HW_NORMA_DMM], [HAVE_HW_NORMA_DMM]) diff --git a/src/drivers.c b/src/drivers.c index ffe467d6..d37d5529 100644 --- a/src/drivers.c +++ b/src/drivers.c @@ -101,6 +101,9 @@ extern SR_PRIV struct sr_dev_driver link_mso19_driver_info; #ifdef HAVE_HW_MANSON_HCS_3XXX extern SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info; #endif +#ifdef HAVE_HW_MAYNUO_M97 +extern SR_PRIV struct sr_dev_driver maynuo_m97_driver_info; +#endif #ifdef HAVE_HW_MIC_985XX extern SR_PRIV struct sr_dev_driver mic_98581_driver_info; extern SR_PRIV struct sr_dev_driver mic_98583_driver_info; @@ -247,6 +250,9 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = { #ifdef HAVE_HW_MANSON_HCS_3XXX (DRVS) {&manson_hcs_3xxx_driver_info, NULL}, #endif +#ifdef HAVE_HW_MAYNUO_M97 + (DRVS) {&maynuo_m97_driver_info, NULL}, +#endif #ifdef HAVE_HW_MIC_985XX (DRVS) { &mic_98581_driver_info, diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c new file mode 100644 index 00000000..eb92c263 --- /dev/null +++ b/src/hardware/maynuo-m97/api.c @@ -0,0 +1,190 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2015 Aurelien Jacobs + * + * 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 maynuo_m97_driver_info; + +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) +{ + return std_init(sr_ctx, di, LOG_PREFIX); +} + +static GSList *scan(struct sr_dev_driver *di, 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(const struct sr_dev_driver *di) +{ + return ((struct drv_context *)(di->priv))->instances; +} + +static int dev_clear(const struct sr_dev_driver *di) +{ + 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(const struct sr_dev_driver *di) +{ + dev_clear(di); + + /* TODO: free other driver resources, if any. */ + + return SR_OK; +} + +static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) +{ + int ret; + + (void)sdi; + (void)data; + (void)cg; + + ret = SR_OK; + switch (key) { + /* TODO */ + default: + return SR_ERR_NA; + } + + return ret; +} + +static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) +{ + int ret; + + (void)data; + (void)cg; + + 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(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) +{ + int ret; + + (void)sdi; + (void)data; + (void)cg; + + 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 maynuo_m97_driver_info = { + .name = "maynuo-m97", + .longname = "maynuo-m97", + .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/src/hardware/maynuo-m97/protocol.c b/src/hardware/maynuo-m97/protocol.c new file mode 100644 index 00000000..e6bc0294 --- /dev/null +++ b/src/hardware/maynuo-m97/protocol.c @@ -0,0 +1,40 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2015 Aurelien Jacobs + * + * 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 maynuo_m97_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/src/hardware/maynuo-m97/protocol.h b/src/hardware/maynuo-m97/protocol.h new file mode 100644 index 00000000..57a6e954 --- /dev/null +++ b/src/hardware/maynuo-m97/protocol.h @@ -0,0 +1,44 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2015 Aurelien Jacobs + * + * 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_MAYNUO_M97_PROTOCOL_H +#define LIBSIGROK_HARDWARE_MAYNUO_M97_PROTOCOL_H + +#include +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +#define LOG_PREFIX "maynuo-m97" + +/** Private, per-device-instance driver context. */ +struct dev_context { + /* Model-specific information */ + + /* Acquisition settings */ + + /* Operational state */ + + /* Temporary state across callbacks */ + +}; + +SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data); + +#endif