---
Makefile.am | 6 +
configure.ac | 1 +
src/drivers.c | 6 +
src/hardware/hung-chang-dso-2100/api.c | 190 ++++++++++++++++++++++++++++
src/hardware/hung-chang-dso-2100/protocol.c | 40 ++++++
src/hardware/hung-chang-dso-2100/protocol.h | 44 +++++++
6 files changed, 287 insertions(+)
create mode 100644 src/hardware/hung-chang-dso-2100/api.c
create mode 100644 src/hardware/hung-chang-dso-2100/protocol.c
create mode 100644 src/hardware/hung-chang-dso-2100/protocol.h
diff --git a/Makefile.am b/Makefile.am
index c9ee604..bd5011e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -274,6 +274,12 @@ libsigrok_la_SOURCES += \
src/hardware/hantek-dso/dso.c \
src/hardware/hantek-dso/api.c
endif
+if HW_HUNG_CHANG_DSO_2100
+libsigrok_la_SOURCES += \
+ src/hardware/hung-chang-dso-2100/protocol.h \
+ src/hardware/hung-chang-dso-2100/protocol.c \
+ src/hardware/hung-chang-dso-2100/api.c
+endif
if HW_IKALOGIC_SCANALOGIC2
libsigrok_la_SOURCES += \
src/hardware/ikalogic-scanalogic2/protocol.h \
diff --git a/configure.ac b/configure.ac
index aa5cdad..02a6588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,6 +222,7 @@ SR_DRIVER([fx2lafw], [fx2lafw], [libusb])
SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x], [libserialport])
SR_DRIVER([Hameg HMO], [hameg-hmo], [libserialport])
SR_DRIVER([Hantek DSO], [hantek-dso], [libusb])
+SR_DRIVER([Hung-Chang DSO-2100], [hung-chang-dso-2100])
SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb])
SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi])
SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb])
diff --git a/src/drivers.c b/src/drivers.c
index 0dd6f26..4b727f8 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -83,6 +83,9 @@ extern SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
#ifdef HAVE_HW_HANTEK_DSO
extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
#endif
+#ifdef HAVE_HW_HUNG_CHANG_DSO_2100
+extern SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info;
+#endif
#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
#endif
@@ -235,6 +238,9 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
#ifdef HAVE_HW_HANTEK_DSO
(DRVS) {&hantek_dso_driver_info, NULL},
#endif
+#ifdef HAVE_HW_HUNG_CHANG_DSO_2100
+ (DRVS) {&hung_chang_dso_2100_driver_info, NULL},
+#endif
#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
(DRVS) {&ikalogic_scanalogic2_driver_info, NULL},
#endif
diff --git a/src/hardware/hung-chang-dso-2100/api.c
b/src/hardware/hung-chang-dso-2100/api.c
new file mode 100644
index 0000000..d3c3c28
--- /dev/null
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2015 Daniel Glöckner <daniel...@gmx.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "protocol.h"
+
+SR_PRIV struct sr_dev_driver hung_chang_dso_2100_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->context;
+ 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->context))->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 hung_chang_dso_2100_driver_info = {
+ .name = "hung-chang-dso-2100",
+ .longname = "Hung-Chang DSO-2100",
+ .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,
+ .context = NULL,
+};
diff --git a/src/hardware/hung-chang-dso-2100/protocol.c
b/src/hardware/hung-chang-dso-2100/protocol.c
new file mode 100644
index 0000000..1a5dd33
--- /dev/null
+++ b/src/hardware/hung-chang-dso-2100/protocol.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2015 Daniel Glöckner <daniel...@gmx.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "protocol.h"
+
+SR_PRIV int hung_chang_dso_2100_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/hung-chang-dso-2100/protocol.h
b/src/hardware/hung-chang-dso-2100/protocol.h
new file mode 100644
index 0000000..4a24aeb
--- /dev/null
+++ b/src/hardware/hung-chang-dso-2100/protocol.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the libsigrok project.
+ *
+ * Copyright (C) 2015 Daniel Glöckner <daniel...@gmx.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBSIGROK_HARDWARE_HUNG_CHANG_DSO_2100_PROTOCOL_H
+#define LIBSIGROK_HARDWARE_HUNG_CHANG_DSO_2100_PROTOCOL_H
+
+#include <stdint.h>
+#include <glib.h>
+#include <libsigrok/libsigrok.h>
+#include "libsigrok-internal.h"
+
+#define LOG_PREFIX "hung-chang-dso-2100"
+
+/** Private, per-device-instance driver context. */
+struct dev_context {
+ /* Model-specific information */
+
+ /* Acquisition settings */
+
+ /* Operational state */
+
+ /* Temporary state across callbacks */
+
+};
+
+SR_PRIV int hung_chang_dso_2100_receive_data(int fd, int revents, void
*cb_data);
+
+#endif
--
1.8.3.4
------------------------------------------------------------------------------
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
