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

sr: convert sr_dev_has_hwcap() to use sdi

This commit is contained in:
Bert Vermeulen 2012-07-22 14:33:28 +02:00
parent 92ae798483
commit a5b35a167a
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
device.c
View File

@ -389,7 +389,7 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
/** /**
* Determine whether the specified device has the specified capability. * Determine whether the specified device has the specified capability.
* *
* @param dev Pointer to the device to be checked. Must not be NULL. * @param dev Pointer to the device instance to be checked. Must not be NULL.
* If the device's 'driver' field is NULL (virtual device), this * If the device's 'driver' field is NULL (virtual device), this
* function will always return FALSE (virtual devices don't have * function will always return FALSE (virtual devices don't have
* a hardware capabilities list). * a hardware capabilities list).
@ -400,45 +400,23 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
* FALSE is also returned upon invalid input parameters or other * FALSE is also returned upon invalid input parameters or other
* error conditions. * error conditions.
*/ */
SR_API gboolean sr_dev_has_hwcap(const struct sr_dev *dev, int hwcap) SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap)
{ {
const int *hwcaps; const int *hwcaps;
int i; int i;
sr_spew("dev: %s: requesting hwcap %d", __func__, hwcap); if (!sdi || !sdi->driver)
if (!dev) {
sr_err("dev: %s: dev was NULL", __func__);
return FALSE; return FALSE;
}
/* if (sdi->driver->info_get(SR_DI_HWCAPS,
* Virtual devices (which have dev->driver set to NULL) always say that (const void **)&hwcaps, NULL) != SR_OK)
* they don't have the capability (they can't call hwcap_get_all()).
*/
if (!dev->driver) {
sr_dbg("dev: %s: dev->driver was NULL, this seems to be "
"a virtual device without capabilities", __func__);
return FALSE; return FALSE;
}
/* TODO: Sanity check on 'hwcap'. */
if (dev->driver->info_get(SR_DI_HWCAPS,
(const void **)&hwcaps, NULL) != SR_OK) {
sr_err("dev: %s: dev has no capabilities", __func__);
return FALSE;
}
for (i = 0; hwcaps[i]; i++) { for (i = 0; hwcaps[i]; i++) {
if (hwcaps[i] != hwcap) if (hwcaps[i] == hwcap)
continue;
sr_spew("dev: %s: found hwcap %d", __func__, hwcap);
return TRUE; return TRUE;
} }
sr_spew("dev: %s: hwcap %d not found", __func__, hwcap);
return FALSE; return FALSE;
} }

2
proto.h
View File

@ -61,7 +61,7 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum,
SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev); SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev);
SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
const char *trigger); const char *trigger);
SR_API gboolean sr_dev_has_hwcap(const struct sr_dev *dev, int hwcap); SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap);
SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data); SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data);
/*--- filter.c --------------------------------------------------------------*/ /*--- filter.c --------------------------------------------------------------*/