From 584269fd2f44daa61497fb2cc9baa10a472577b0 Mon Sep 17 00:00:00 2001 From: Frank Stettner Date: Sat, 24 Apr 2021 16:44:50 +0200 Subject: [PATCH] hp-59306a: Initial HP 59306A driver. [ gsi: drop libgpib dependency, minor style adjustment ] --- src/hardware/hp-59306a/api.c | 179 ++++++++++++++++-------------- src/hardware/hp-59306a/protocol.c | 27 +++-- src/hardware/hp-59306a/protocol.h | 9 +- 3 files changed, 115 insertions(+), 100 deletions(-) diff --git a/src/hardware/hp-59306a/api.c b/src/hardware/hp-59306a/api.c index 402c34fd..6038bccb 100644 --- a/src/hardware/hp-59306a/api.c +++ b/src/hardware/hp-59306a/api.c @@ -18,118 +18,127 @@ */ #include +#include "scpi.h" #include "protocol.h" -static struct sr_dev_driver hp_59306a_driver_info; - -static GSList *scan(struct sr_dev_driver *di, GSList *options) -{ - struct drv_context *drvc; - GSList *devices; +static const uint32_t scanopts[] = { + SR_CONF_CONN, +}; - (void)options; +static const uint32_t drvopts[] = { + SR_CONF_MULTIPLEXER, +}; - devices = NULL; - drvc = di->context; - drvc->instances = NULL; +static const uint32_t devopts[] = { + /* + * TODO Enable/disable multiple channel groups at once. + * SR_CONF_ENABLED | SR_CONF_SET, + */ +}; - /* TODO: scan for devices, either based on a SR_CONF_CONN option - * or on a USB scan. */ +static const uint32_t devopts_cg[] = { + SR_CONF_ENABLED | SR_CONF_SET, +}; - return devices; -} +static struct sr_dev_driver hp_59306a_driver_info; -static int dev_open(struct sr_dev_inst *sdi) +static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) { - (void)sdi; - - /* TODO: get handle from sdi->conn and open it. */ + struct sr_dev_inst *sdi; + struct dev_context *devc; + struct channel_group_context *cgc; + size_t idx, nr; + struct sr_channel_group *cg; + + sdi = g_malloc0(sizeof(*sdi)); + sdi->vendor = g_strdup("Hewlett-Packard"); + sdi->model = g_strdup("59306A"); + sdi->conn = scpi; + sdi->driver = &hp_59306a_driver_info; + sdi->inst_type = SR_INST_SCPI; + + devc = g_malloc0(sizeof(*devc)); + sdi->priv = devc; + + devc->channel_count = 6; + for (idx = 0; idx < devc->channel_count; idx++) { + nr = idx + 1; + + cg = g_malloc0(sizeof(*cg)); + cg->name = g_strdup_printf("CH%zu", nr); + + cgc = g_malloc0(sizeof(*cgc)); + cgc->number = nr; + cg->priv = cgc; + + sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); + } - return SR_OK; + return sdi; } -static int dev_close(struct sr_dev_inst *sdi) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { - (void)sdi; - - /* TODO: get handle from sdi->conn and close it. */ - - return SR_OK; + return sr_scpi_scan(di->context, options, probe_device); } -static int config_get(uint32_t key, GVariant **data, - const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +static int dev_open(struct sr_dev_inst *sdi) { - int ret; - - (void)sdi; - (void)data; - (void)cg; - - ret = SR_OK; - switch (key) { - /* TODO */ - default: - return SR_ERR_NA; - } + return sr_scpi_open(sdi->conn); +} - return ret; +static int dev_close(struct sr_dev_inst *sdi) +{ + return sr_scpi_close(sdi->conn); } static int config_set(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: - ret = SR_ERR_NA; + gboolean on; + + if (!cg) { + switch (key) { + /* TODO: Enable/disbale multiple channel groups at once. */ + case SR_CONF_ENABLED: + default: + return SR_ERR_NA; + } + } else { + switch (key) { + case SR_CONF_ENABLED: + on = g_variant_get_boolean(data); + return hp_59306a_switch_cg(sdi, cg, on); + default: + return SR_ERR_NA; + } } - return ret; + return SR_OK; } 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; + if (!cg) { + switch (key) { + case SR_CONF_SCAN_OPTIONS: + case SR_CONF_DEVICE_OPTIONS: + return STD_CONFIG_LIST(key, data, sdi, cg, + scanopts, drvopts, devopts); + default: + return SR_ERR_NA; + } + } else { + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg)); + break; + default: + return SR_ERR_NA; + } } - return ret; -} - -static int dev_acquisition_start(const struct sr_dev_inst *sdi) -{ - /* TODO: configure hardware, reset acquisition state, set up - * callbacks and send header packet. */ - - (void)sdi; - - return SR_OK; -} - -static int dev_acquisition_stop(struct sr_dev_inst *sdi) -{ - /* TODO: stop acquisition. */ - - (void)sdi; - return SR_OK; } @@ -142,13 +151,13 @@ static struct sr_dev_driver hp_59306a_driver_info = { .scan = scan, .dev_list = std_dev_list, .dev_clear = std_dev_clear, - .config_get = config_get, + .config_get = NULL, .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, + .dev_acquisition_start = std_dummy_dev_acquisition_start, + .dev_acquisition_stop = std_dummy_dev_acquisition_stop, .context = NULL, }; SR_REGISTER_DEV_DRIVER(hp_59306a_driver_info); diff --git a/src/hardware/hp-59306a/protocol.c b/src/hardware/hp-59306a/protocol.c index 737ffde4..3628f98d 100644 --- a/src/hardware/hp-59306a/protocol.c +++ b/src/hardware/hp-59306a/protocol.c @@ -18,24 +18,23 @@ */ #include +#include "scpi.h" #include "protocol.h" -SR_PRIV int hp_59306a_receive_data(int fd, int revents, void *cb_data) +SR_PRIV int hp_59306a_switch_cg(const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg, gboolean enabled) { - const struct sr_dev_inst *sdi; - struct dev_context *devc; + int ret; + struct sr_scpi_dev_inst *scpi; + struct channel_group_context *cgc; - (void)fd; + scpi = sdi->conn; + cgc = cg->priv; - if (!(sdi = cb_data)) - return TRUE; + if (enabled) + ret = sr_scpi_send(scpi, "A%zu", cgc->number); + else + ret = sr_scpi_send(scpi, "B%zu", cgc->number); - if (!(devc = sdi->priv)) - return TRUE; - - if (revents == G_IO_IN) { - /* TODO */ - } - - return TRUE; + return ret; } diff --git a/src/hardware/hp-59306a/protocol.h b/src/hardware/hp-59306a/protocol.h index 4f6d969b..6f1d5a19 100644 --- a/src/hardware/hp-59306a/protocol.h +++ b/src/hardware/hp-59306a/protocol.h @@ -28,8 +28,15 @@ #define LOG_PREFIX "hp-59306a" struct dev_context { + size_t channel_count; }; -SR_PRIV int hp_59306a_receive_data(int fd, int revents, void *cb_data); +struct channel_group_context { + /** The number of the channel group, as labled on the device. */ + size_t number; +}; + +SR_PRIV int hp_59306a_switch_cg(const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg, gboolean enabled); #endif -- 2.30.2