BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ols: use new driver info_get() API call

This commit is contained in:
Bert Vermeulen 2012-07-15 03:52:57 +02:00
parent 0b79bcbb9d
commit dddfb3dbf0
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hardware/openbench-logic-sniffer/ols.c
View File

@ -582,39 +582,39 @@ static int hw_cleanup(void)
return ret; return ret;
} }
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; struct context *ctx;
const void *info;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) switch (info_id) {
return NULL;
ctx = sdi->priv;
info = NULL;
switch (dev_info_id) {
case SR_DI_INST: case SR_DI_INST:
info = sdi; *data = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(NUM_PROBES); *data = GINT_TO_POINTER(1);
break; break;
case SR_DI_PROBE_NAMES: case SR_DI_PROBE_NAMES:
info = probe_names; *data = probe_names;
break; break;
case SR_DI_SAMPLERATES: case SR_DI_SAMPLERATES:
info = &samplerates; *data = &samplerates;
break; break;
case SR_DI_TRIGGER_TYPES: case SR_DI_TRIGGER_TYPES:
info = (char *)TRIGGER_TYPES; *data = (char *)TRIGGER_TYPES;
break; break;
case SR_DI_CUR_SAMPLERATE: case SR_DI_CUR_SAMPLERATE:
info = &ctx->cur_samplerate; if (sdi) {
ctx = sdi->priv;
*data = &ctx->cur_samplerate;
} else
return SR_ERR;
break; break;
default:
return SR_ERR_ARG;
} }
return info; return SR_OK;
} }
static int hw_dev_status_get(int dev_index) static int hw_dev_status_get(int dev_index)
@ -627,11 +627,6 @@ static int hw_dev_status_get(int dev_index)
return sdi->status; return sdi->status;
} }
static const int *hw_hwcap_get_all(void)
{
return hwcaps;
}
static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate) static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{ {
struct context *ctx; struct context *ctx;
@ -1079,9 +1074,8 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
.scan = hw_scan, .scan = hw_scan,
.dev_open = hw_dev_open, .dev_open = hw_dev_open,
.dev_close = hw_dev_close, .dev_close = hw_dev_close,
.dev_info_get = hw_dev_info_get, .info_get = hw_info_get,
.dev_status_get = hw_dev_status_get, .dev_status_get = hw_dev_status_get,
.hwcap_get_all = hw_hwcap_get_all,
.dev_config_set = hw_dev_config_set, .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop, .dev_acquisition_stop = hw_dev_acquisition_stop,