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

hantek-dso: use new driver info_get() API call

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

37
hardware/hantek-dso/api.c
View File

@ -386,51 +386,46 @@ static int hw_cleanup(void)
return SR_OK; 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;
const void *info;
uint64_t tmp; uint64_t tmp;
if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index))) switch (info_id) {
return NULL;
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(NUM_PROBES);
break; break;
case SR_DI_PROBE_NAMES: case SR_DI_PROBE_NAMES:
info = probe_names; *data = probe_names;
break; break;
case SR_DI_BUFFERSIZES: case SR_DI_BUFFERSIZES:
info = buffersizes; *data = buffersizes;
break; break;
case SR_DI_TIMEBASES: case SR_DI_TIMEBASES:
info = timebases; *data = timebases;
break; break;
case SR_DI_TRIGGER_SOURCES: case SR_DI_TRIGGER_SOURCES:
info = trigger_sources; *data = trigger_sources;
break; break;
case SR_DI_FILTERS: case SR_DI_FILTERS:
info = filter_targets; *data = filter_targets;
break; break;
case SR_DI_VDIVS: case SR_DI_VDIVS:
info = vdivs; *data = vdivs;
break; break;
case SR_DI_COUPLING: case SR_DI_COUPLING:
info = coupling; *data = coupling;
break; break;
/* TODO remove this */ /* TODO remove this */
case SR_DI_CUR_SAMPLERATE: case SR_DI_CUR_SAMPLERATE:
info = &tmp; *data = &tmp;
break; break;
} }
return info; return SR_OK;
} }
static int hw_dev_status_get(int dev_index) static int hw_dev_status_get(int dev_index)
@ -882,9 +877,9 @@ SR_PRIV struct sr_dev_driver hantek_dso_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, // .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,