X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fapi.c;h=30180d3b15bae25d8ec14eba65e70a0fdd58f50c;hb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855;hp=d3fb81936f83ec71489e1f9a5f52f5580783a81a;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git
diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index d3fb8193..30180d3b 100644
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -20,10 +20,11 @@
*/
/** @file
- * Manson HCS-3xxx Series power supply driver
+ * Manson HCS-3xxx series power supply driver
* @internal
*/
+#include
#include "protocol.h"
static const uint32_t drvopts[] = {
@@ -39,16 +40,16 @@ static const uint32_t scanopts[] = {
static const uint32_t devopts[] = {
/* Device class */
SR_CONF_POWER_SUPPLY,
- /* Aquisition modes. */
+ /* Acquisition modes. */
SR_CONF_CONTINUOUS,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
/* Device configuration */
- SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
- SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
- SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
- SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
- SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_VOLTAGE | SR_CONF_GET,
+ SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_CURRENT | SR_CONF_GET,
+ SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
};
/* Note: All models have one power supply output only. */
@@ -69,19 +70,14 @@ static const struct hcs_model models[] = {
{ MANSON_HCS_3600, "HCS-3600-USB", "3600", { 1, 16, 0.1 }, { 0, 60, 0.10 } },
{ MANSON_HCS_3602, "HCS-3602-USB", "3602", { 1, 32, 0.1 }, { 0, 30, 0.10 } },
{ MANSON_HCS_3604, "HCS-3604-USB", "3604", { 1, 60, 0.1 }, { 0, 15, 0.10 } },
- { 0, NULL, NULL, { 0, 0, 0 }, { 0, 0, 0 }, },
+ ALL_ZERO
};
SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
- return std_init(sr_ctx, di, LOG_PREFIX);
+ return std_init(di, sr_ctx);
}
static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -96,7 +92,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
struct sr_serial_dev_inst *serial;
char reply[50], **tokens, *dummy;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
devices = NULL;
conn = NULL;
@@ -144,12 +140,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
if (!strcmp(models[i].id, tokens[0]))
model_id = i;
}
- g_strfreev(tokens);
-
if (model_id < 0) {
- sr_err("Unknown model id '%s' detected, aborting.", tokens[0]);
+ sr_err("Unknown model ID '%s' detected, aborting.", tokens[0]);
+ g_strfreev(tokens);
return NULL;
}
+ g_strfreev(tokens);
/* Init device instance, etc. */
sdi = g_malloc0(sizeof(struct sr_dev_inst));
@@ -163,6 +159,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
devc = g_malloc0(sizeof(struct dev_context));
+ sr_sw_limits_init(&devc->limits);
devc->model = &models[model_id];
sdi->priv = devc;
@@ -172,8 +169,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
(hcs_read_reply(serial, 2, reply, sizeof(reply)) < 0))
goto exit_err;
tokens = g_strsplit((const gchar *)&reply, "\r", 2);
- if (hcs_parse_volt_curr_mode(sdi, tokens) < 0)
+ if (hcs_parse_volt_curr_mode(sdi, tokens) < 0) {
+ g_strfreev(tokens);
goto exit_err;
+ }
g_strfreev(tokens);
/* Get max. voltage and current. */
@@ -197,19 +196,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
exit_err:
sr_dev_inst_free(sdi);
- if (devc)
- g_free(devc);
- return NULL;
-}
+ g_free(devc);
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
+ return NULL;
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -226,24 +215,21 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
- *data = g_variant_new_uint64(devc->limit_samples);
- break;
case SR_CONF_LIMIT_MSEC:
- *data = g_variant_new_uint64(devc->limit_msec);
- break;
- case SR_CONF_OUTPUT_VOLTAGE:
+ return sr_sw_limits_config_get(&devc->limits, key, data);
+ case SR_CONF_VOLTAGE:
*data = g_variant_new_double(devc->voltage);
break;
- case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+ case SR_CONF_VOLTAGE_TARGET:
*data = g_variant_new_double(devc->voltage_max);
break;
- case SR_CONF_OUTPUT_CURRENT:
+ case SR_CONF_CURRENT:
*data = g_variant_new_double(devc->current);
break;
- case SR_CONF_OUTPUT_CURRENT_LIMIT:
+ case SR_CONF_CURRENT_LIMIT:
*data = g_variant_new_double(devc->current_max);
break;
- case SR_CONF_OUTPUT_ENABLED:
+ case SR_CONF_ENABLED:
*data = g_variant_new_boolean(devc->output_enabled);
break;
default:
@@ -269,16 +255,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
switch (key) {
case SR_CONF_LIMIT_MSEC:
- if (g_variant_get_uint64(data) == 0)
- return SR_ERR_ARG;
- devc->limit_msec = g_variant_get_uint64(data);
- break;
- case SR_CONF_LIMIT_SAMPLES:
- if (g_variant_get_uint64(data) == 0)
- return SR_ERR_ARG;
- devc->limit_samples = g_variant_get_uint64(data);
- break;
- case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+ return sr_sw_limits_config_set(&devc->limits, key, data);
+ case SR_CONF_VOLTAGE_TARGET:
dval = g_variant_get_double(data);
if (dval < devc->model->voltage[0] || dval > devc->voltage_max_device)
return SR_ERR_ARG;
@@ -289,7 +267,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return SR_ERR;
devc->voltage_max = dval;
break;
- case SR_CONF_OUTPUT_CURRENT_LIMIT:
+ case SR_CONF_CURRENT_LIMIT:
dval = g_variant_get_double(data);
if (dval < devc->model->current[0] || dval > devc->current_max_device)
return SR_ERR_ARG;
@@ -300,7 +278,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return SR_ERR;
devc->current_max = dval;
break;
- case SR_CONF_OUTPUT_ENABLED:
+ case SR_CONF_ENABLED:
bval = g_variant_get_boolean(data);
if (bval == devc->output_enabled) /* Nothing to do. */
break;
@@ -351,7 +329,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
- case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+ case SR_CONF_VOLTAGE_TARGET:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
/* Min, max, step. */
for (idx = 0; idx < 3; idx++) {
@@ -364,7 +342,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
}
*data = g_variant_builder_end(&gvb);
break;
- case SR_CONF_OUTPUT_CURRENT_LIMIT:
+ case SR_CONF_CURRENT_LIMIT:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
/* Min, max, step. */
for (idx = 0; idx < 3; idx++) {
@@ -384,7 +362,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
@@ -393,13 +371,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
- devc->cb_data = cb_data;
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ sr_sw_limits_acquisition_start(&devc->limits);
+ std_session_send_df_header(sdi, LOG_PREFIX);
- devc->starttime = g_get_monotonic_time();
- devc->num_samples = 0;
devc->reply_pending = FALSE;
devc->req_sent_at = 0;
@@ -411,9 +386,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- return std_serial_dev_acquisition_stop(sdi, cb_data,
+ return std_serial_dev_acquisition_stop(sdi,
std_serial_dev_close, sdi->conn, LOG_PREFIX);
}
@@ -422,10 +397,9 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
.longname = "Manson HCS-3xxx",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
- .dev_clear = dev_clear,
+ .dev_list = std_dev_list,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
@@ -433,5 +407,5 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};