sr: change session API/code to use sdi

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index be647fb248e7be173810a439fe543d41fb10d59a..3f0b60d0d20b5574477a29475297b9c917c6c614 100644 (file)
--- a/device.c
+++ b/device.c
@@ -348,18 +348,12 @@ SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev)
  * If the specified probe of this device already has a trigger, it will
  * be silently replaced.
  *
- * TODO: Better description.
- * TODO: Describe valid format of the 'trigger' string.
- *
- * @param dev TODO. Must not be NULL.
- * @param probenum The number of the probe. TODO.
+ * @param sdi Must not be NULL.
+ * @param probenum The number of the probe.
  *                 Note that the probe numbers start at 1 (not 0!).
- * @param trigger TODO.
- *                TODO: Is NULL allowed?
+ * @param trigger trigger string, in the format used by sigrok-cli
  *
- * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
- *         upon other errors.
- *         If something other than SR_OK is returned, 'dev' is unchanged.
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
  */
 SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
                const char *trigger)
@@ -389,7 +383,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.
  *
- * @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
  *            function will always return FALSE (virtual devices don't have
  *            a hardware capabilities list).
@@ -400,45 +394,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
  *         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;
        int i;
 
-       sr_spew("dev: %s: requesting hwcap %d", __func__, hwcap);
-
-       if (!dev) {
-               sr_err("dev: %s: dev was NULL", __func__);
-               return FALSE;
-       }
-
-       /*
-        * Virtual devices (which have dev->driver set to NULL) always say that
-        * 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__);
+       if (!sdi || !sdi->driver)
                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__);
+       if (sdi->driver->info_get(SR_DI_HWCAPS,
+                       (const void **)&hwcaps, NULL) != SR_OK)
                return FALSE;
-       }
 
        for (i = 0; hwcaps[i]; i++) {
-               if (hwcaps[i] != hwcap)
-                       continue;
-               sr_spew("dev: %s: found hwcap %d", __func__, hwcap);
-               return TRUE;
+               if (hwcaps[i] == hwcap)
+                       return TRUE;
        }
 
-       sr_spew("dev: %s: hwcap %d not found", __func__, hwcap);
-
        return FALSE;
 }