From 4147960558ae0d8964e8344faa3515a8ec4d9efb Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Sun, 15 Jul 2012 03:52:04 +0200 Subject: [PATCH] asix-sigma: use new driver info_get() API call --- hardware/asix-sigma/asix-sigma.c | 34 ++++++++++++++------------------ 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 84066c44..5eeb6c1c 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -779,41 +779,37 @@ static int hw_cleanup(void) return SR_OK; } -static const void *hw_dev_info_get(int dev_index, int dev_info_id) +static int hw_info_get(int info_id, const void **data, + const struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; struct context *ctx; - const void *info = NULL; - if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) { - sr_err("sigma: %s: sdi was NULL", __func__); - return NULL; - } - - ctx = sdi->priv; - - switch (dev_info_id) { + switch (info_id) { case SR_DI_INST: - info = sdi; + *data = sdi; break; case SR_DI_NUM_PROBES: - info = GINT_TO_POINTER(NUM_PROBES); + *data = GINT_TO_POINTER(NUM_PROBES); break; case SR_DI_PROBE_NAMES: - info = probe_names; + *data = probe_names; break; case SR_DI_SAMPLERATES: - info = &samplerates; + *data = &samplerates; break; case SR_DI_TRIGGER_TYPES: - info = (char *)TRIGGER_TYPES; + *data = (char *)TRIGGER_TYPES; break; case SR_DI_CUR_SAMPLERATE: - info = &ctx->cur_samplerate; + if (sdi) { + ctx = sdi->priv; + *data = &ctx->cur_samplerate; + } else + return SR_ERR; break; } - return info; + return SR_OK; } static int hw_dev_status_get(int dev_index) @@ -1469,7 +1465,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { .scan = hw_scan, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .dev_info_get = hw_dev_info_get, + .info_get = hw_info_get, .dev_status_get = hw_dev_status_get, // .hwcap_get_all = hw_hwcap_get_all, .dev_config_set = hw_dev_config_set,