X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=103bb03054cca6ceeb46bc18061c7f2d26d743e1;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=9a1c6a001c345e64837af4abd109ce2f05e9a109;hpb=c65a021c050b3ef05ccc844cf24ee8e620eb669e;p=libsigrok.git
diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 9a1c6a00..103bb030 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -18,10 +18,12 @@
* along with this program. If not, see .
*/
+#include
#include
+#include "scpi.h"
#include "protocol.h"
-SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info;
+static struct sr_dev_driver yokogawa_dlm_driver_info;
static const char *MANUFACTURER_ID = "YOKOGAWA";
static const char *MANUFACTURER_NAME = "Yokogawa";
@@ -61,11 +63,6 @@ enum {
CG_DIGITAL,
};
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
{
struct sr_dev_inst *sdi;
@@ -90,7 +87,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
goto fail;
sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sdi->status = SR_ST_ACTIVE;
sdi->vendor = g_strdup(MANUFACTURER_NAME);
sdi->model = g_strdup(model_name);
sdi->version = g_strdup(hw_info->firmware_version);
@@ -110,9 +106,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
if (dlm_device_init(sdi, model_index) != SR_OK)
goto fail;
- sr_scpi_close(sdi->conn);
-
- sdi->status = SR_ST_INACTIVE;
return sdi;
fail:
@@ -127,12 +120,7 @@ fail:
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return sr_scpi_scan(di->priv, options, probe_usbtmc_device);
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->priv))->instances;
+ return sr_scpi_scan(di->context, options, probe_usbtmc_device);
}
static void clear_helper(void *priv)
@@ -178,21 +166,14 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
-
- return SR_OK;
-}
-
/**
* Check which category a given channel group belongs to.
*
* @param devc Our internal device context.
- * @param cg The channel group to check.
+ * @param cg The channel group to check.
*
- * @retval CG_NONE cg is NULL
- * @retval CG_ANALOG cg is an analog group
+ * @retval CG_NONE cg is NULL
+ * @retval CG_ANALOG cg is an analog group
* @retval CG_DIGITAL cg is a digital group
* @retval CG_INVALID cg is something else
*/
@@ -207,11 +188,11 @@ static int check_channel_group(struct dev_context *devc,
if (!cg)
return CG_NONE;
- for (i = 0; i < model->analog_channels; ++i)
+ for (i = 0; i < model->analog_channels; i++)
if (cg == devc->analog_groups[i])
return CG_ANALOG;
- for (i = 0; i < model->pods; ++i)
+ for (i = 0; i < model->pods; i++)
if (cg == devc->digital_groups[i])
return CG_DIGITAL;
@@ -228,13 +209,14 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
const struct scope_config *model;
struct scope_state *state;
- if (!sdi || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_ARG;
+ devc = sdi->priv;
+
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
- ret = SR_ERR_NA;
model = devc->model_config;
state = devc->model_state;
@@ -269,7 +251,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
} else if (cg_type != CG_ANALOG)
break;
- for (i = 0; i < model->analog_channels; ++i) {
+ for (i = 0; i < model->analog_channels; i++) {
if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new("(tt)",
@@ -299,7 +281,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
} else if (cg_type != CG_ANALOG)
break;
- for (i = 0; i < model->analog_channels; ++i) {
+ for (i = 0; i < model->analog_channels; i++) {
if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new_string((*model->coupling_options)[state->analog_states[i].coupling]);
@@ -391,7 +373,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (p != dlm_vdivs[i][0] ||
q != dlm_vdivs[i][1])
continue;
- for (j = 1; j <= model->analog_channels; ++j) {
+ for (j = 1; j <= model->analog_channels; j++) {
if (cg != devc->analog_groups[j - 1])
continue;
state->analog_states[j - 1].vdiv = i;
@@ -462,7 +444,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
for (i = 0; (*model->coupling_options)[i]; i++) {
if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
continue;
- for (j = 1; j <= model->analog_channels; ++j) {
+ for (j = 1; j <= model->analog_channels; j++) {
if (cg != devc->analog_groups[j - 1])
continue;
state->analog_states[j-1].coupling = i;
@@ -494,7 +476,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
static int config_channel_set(const struct sr_dev_inst *sdi,
struct sr_channel *ch, unsigned int changes)
{
- /* Curretly we only handle SR_CHANNEL_SET_ENABLED. */
+ /* Currently we only handle SR_CHANNEL_SET_ENABLED. */
if (changes != SR_CHANNEL_SET_ENABLED)
return SR_ERR_NA;
@@ -528,8 +510,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
devc = sdi->priv;
model = devc->model_config;
- /* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
- * specific to a probe group must be returned. */
+ /*
+ * If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
+ * specific to a probe group must be returned.
+ */
if (!cg) {
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
@@ -550,7 +534,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
g_strv_length((char **)dlm_trigger_slopes));
return SR_OK;
case SR_CONF_NUM_HDIV:
- *data = g_variant_new_uint32(ARRAY_SIZE(dlm_timebases));
+ *data = g_variant_new_uint32(model->num_xdivs);
return SR_OK;
default:
return SR_ERR_NA;
@@ -622,80 +606,7 @@ static int dlm_check_channels(GSList *channels)
return SR_OK;
}
-static int dlm_setup_channels(const struct sr_dev_inst *sdi)
-{
- GSList *l;
- unsigned int i;
- gboolean *pod_enabled, setup_changed;
- struct scope_state *state;
- const struct scope_config *model;
- struct sr_channel *ch;
- struct dev_context *devc;
- struct sr_scpi_dev_inst *scpi;
-
- devc = sdi->priv;
- scpi = sdi->conn;
- state = devc->model_state;
- model = devc->model_config;
- setup_changed = FALSE;
-
- pod_enabled = g_malloc0(sizeof(gboolean) * model->pods);
-
- for (l = sdi->channels; l; l = l->next) {
- ch = l->data;
- switch (ch->type) {
- case SR_CHANNEL_ANALOG:
- if (ch->enabled == state->analog_states[ch->index].state)
- break;
-
- if (dlm_analog_chan_state_set(scpi, ch->index + 1,
- ch->enabled) != SR_OK)
- return SR_ERR;
-
- state->analog_states[ch->index].state = ch->enabled;
- setup_changed = TRUE;
- break;
- case SR_CHANNEL_LOGIC:
- i = ch->index - DLM_DIG_CHAN_INDEX_OFFS;
- if (ch->enabled)
- pod_enabled[i / 8] = TRUE;
-
- if (ch->enabled == state->digital_states[i])
- break;
-
- if (dlm_digital_chan_state_set(scpi, i + 1,
- ch->enabled) != SR_OK)
- return SR_ERR;
-
- state->digital_states[i] = ch->enabled;
- setup_changed = TRUE;
- break;
- default:
- return SR_ERR;
- }
- }
-
- for (i = 1; i <= model->pods; ++i) {
- if (state->pod_states[i - 1] == pod_enabled[i - 1])
- continue;
-
- if (dlm_digital_pod_state_set(scpi, i,
- pod_enabled[i - 1]) != SR_OK)
- return SR_ERR;
-
- state->pod_states[i - 1] = pod_enabled[i - 1];
- setup_changed = TRUE;
- }
-
- g_free(pod_enabled);
-
- if (setup_changed && dlm_sample_rate_query(sdi) != SR_OK)
- return SR_ERR;
-
- 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)
{
GSList *l;
gboolean digital_added;
@@ -703,8 +614,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
- (void)cb_data;
-
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -736,11 +645,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_ERR_NA;
}
- if (dlm_setup_channels(sdi) != SR_OK) {
- sr_err("Failed to setup channel configuration!");
- return SR_ERR;
- }
-
/* Request data for the first enabled channel. */
devc->current_channel = devc->enabled_channels;
dlm_channel_data_request(sdi);
@@ -752,16 +656,11 @@ 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)
{
struct dev_context *devc;
- struct sr_datafeed_packet packet;
-
- (void)cb_data;
- packet.type = SR_DF_END;
- packet.payload = NULL;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi, LOG_PREFIX);
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -777,14 +676,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
-SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
+static struct sr_dev_driver yokogawa_dlm_driver_info = {
.name = "yokogawa-dlm",
.longname = "Yokogawa DL/DLM",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
@@ -794,5 +693,6 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
+SR_REGISTER_DEV_DRIVER(yokogawa_dlm_driver_info);