device: Pass sdi as an function argument to config_list in dev_has_option()

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index 4484c8dcb8deb531169bb2aa98c168bdddfa4124..ce2ca6554a70776b81a5d45d88fa4c864014896e 100644 (file)
--- a/device.c
+++ b/device.c
@@ -23,14 +23,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "device: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "device"
 
 /**
  * @file
@@ -48,10 +41,10 @@
 
 /** @private
  *  Allocate and initialize new struct sr_probe
- *  @param[in]  index \copydoc sr_probe::index
- *  @param[in]  type \copydoc sr_probe::type
- *  @param[in]  enabled \copydoc sr_probe::enabled
- *  @param[in]  name \copydoc sr_probe::name
+ *  @param[in]  index @copydoc sr_probe::index
+ *  @param[in]  type @copydoc sr_probe::type
+ *  @param[in]  enabled @copydoc sr_probe::enabled
+ *  @param[in]  name @copydoc sr_probe::name
  *
  *  @return NULL (failure) or new struct sr_probe*.
  */
@@ -217,7 +210,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
                return FALSE;
 
        if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS,
-                               &gvar, NULL, NULL) != SR_OK)
+                               &gvar, sdi, NULL) != SR_OK)
                return FALSE;
 
        ret = FALSE;
@@ -235,14 +228,14 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 
 /** @private
  *  Allocate and init new device instance struct.
- *  \param[in]  index   \copydoc sr_dev_inst::index
- *  \param[in]  status  \copydoc sr_dev_inst::status
- *  \param[in]  vendor  \copydoc sr_dev_inst::vendor
- *  \param[in]  model   \copydoc sr_dev_inst::model
- *  \param[in]  version \copydoc sr_dev_inst::version
- *
- *  \retval NULL Error
- *  \retval struct sr_dev_inst *. Dynamically allocated, free using
+ *  @param[in]  index   @copydoc sr_dev_inst::index
+ *  @param[in]  status  @copydoc sr_dev_inst::status
+ *  @param[in]  vendor  @copydoc sr_dev_inst::vendor
+ *  @param[in]  model   @copydoc sr_dev_inst::model
+ *  @param[in]  version @copydoc sr_dev_inst::version
+ *
+ *  @retval NULL Error
+ *  @retval struct sr_dev_inst *. Dynamically allocated, free using
  *              sr_dev_inst_free().
  */
 SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
@@ -272,7 +265,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
 
 /** @private
  *  Free device instance struct created by sr_dev_inst().
- *  \param sdi  struct* to free.
+ *  @param sdi  struct* to free.
  */
 SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
 {
@@ -300,12 +293,12 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
 
 /** @private
  *  Allocate and init struct for USB device instance.
- *  \param[in]  bus \copydoc sr_usb_dev_inst::bus
- *  \param[in]  address \copydoc sr_usb_dev_inst::address
- *  \param[in]  hdl \copydoc sr_usb_dev_inst::devhdl
+ *  @param[in]  bus @copydoc sr_usb_dev_inst::bus
+ *  @param[in]  address @copydoc sr_usb_dev_inst::address
+ *  @param[in]  hdl @copydoc sr_usb_dev_inst::devhdl
  *
- *  \retval NULL Error
- *  \retval other struct sr_usb_dev_inst * for USB device instance.
+ *  @retval NULL Error
+ *  @retval other struct sr_usb_dev_inst * for USB device instance.
  */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
                        uint8_t address, struct libusb_device_handle *hdl)
@@ -326,7 +319,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 
 /** @private
  *  Free struct * allocated by sr_usb_dev_inst().
- *  \param usb  struct* to free. Must not be NULL.
+ *  @param usb  struct* to free. Must not be NULL.
  */
 SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 {
@@ -377,7 +370,7 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 
 /** @private
  *  Free struct sr_serial_dev_inst * allocated by sr_serial_dev_inst().
- *  \param serial   struct sr_serial_dev_inst * to free. Must not be NULL.
+ *  @param serial   struct sr_serial_dev_inst * to free. Must not be NULL.
  */
 SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 {
@@ -387,6 +380,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 }
 #endif
 
+/** @private */
 SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
 {
        struct sr_usbtmc_dev_inst *usbtmc;
@@ -407,6 +401,7 @@ SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
        return usbtmc;
 }
 
+/** @private */
 SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
 {
        g_free(usbtmc->device);