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

genericdmm: use new driver info_get() API call

This commit is contained in:
Bert Vermeulen 2012-07-13 02:34:10 +02:00
parent a27999e657
commit 6910bf6bf6
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hardware/genericdmm/api.c
View File

@ -424,51 +424,32 @@ 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 dev_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(gdi->instances, dev_index))) {
sr_err("genericdmm: sdi was NULL.");
return NULL;
}
if (!(ctx = sdi->priv)) {
sr_err("genericdmm: sdi->priv was NULL.");
return NULL;
}
sr_spew("genericdmm: dev_index %d, dev_info_id %d.",
dev_index, dev_info_id);
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INST: case SR_DI_INST:
info = sdi; *data = sdi;
sr_spew("genericdmm: Returning sdi."); sr_spew("genericdmm: Returning sdi.");
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(1); *data = GINT_TO_POINTER(1);
sr_spew("genericdmm: Returning number of probes: 1.");
break; break;
case SR_DI_PROBE_NAMES: case SR_DI_PROBE_NAMES:
info = probe_names; *data = probe_names;
sr_spew("genericdmm: Returning probenames.");
break; break;
case SR_DI_CUR_SAMPLERATE: case SR_DI_CUR_SAMPLERATE:
/* TODO get rid of this */ /* TODO get rid of this */
info = NULL; *data = NULL;
sr_spew("genericdmm: Returning samplerate: 0.");
break; break;
default: default:
/* Unknown device info ID. */ /* Unknown device info ID. */
sr_err("genericdmm: Unknown device info ID: %d.", dev_info_id); return SR_ERR_ARG;
info = NULL;
break;
} }
return info; return SR_OK;
} }
static int hw_dev_status_get(int dev_index) static int hw_dev_status_get(int dev_index)
@ -638,7 +619,7 @@ SR_PRIV struct sr_dev_driver genericdmm_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,