#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
/** @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*.
*/
* @param probenum The probe number, starting from 0.
* @param state TRUE to enable the probe, FALSE to disable.
*
- * @return SR_OK on success, or SR_ERR_ARG on invalid arguments.
+ * @return SR_OK on success or SR_ERR on failure. In case of invalid
+ * arguments, SR_ERR_ARG is returned and the probe enabled state
+ * remains unchanged.
*
* @since 0.2.0
*/
GSList *l;
struct sr_probe *probe;
int ret;
+ gboolean was_enabled;
if (!sdi)
return SR_ERR_ARG;
for (l = sdi->probes; l; l = l->next) {
probe = l->data;
if (probe->index == probenum) {
+ was_enabled = probe->enabled;
probe->enabled = state;
ret = SR_OK;
+ if (!state != !was_enabled && sdi->driver
+ && sdi->driver->config_probe_set) {
+ ret = sdi->driver->config_probe_set(
+ sdi, probe, SR_PROBE_SET_ENABLED);
+ /* Roll back change if it wasn't applicable. */
+ if (ret == SR_ERR_ARG)
+ probe->enabled = was_enabled;
+ }
break;
}
}
* @param[in] probenum Number of probe, starting at 0.
* @param[in] trigger Trigger string, in the format used by sigrok-cli
*
- * @return SR_OK on success, or SR_ERR_ARG on invalid arguments.
+ * @return SR_OK on success or SR_ERR on failure. In case of invalid
+ * arguments, SR_ERR_ARG is returned and the trigger settings
+ * remain unchanged.
*
* @since 0.2.0
*/
{
GSList *l;
struct sr_probe *probe;
+ char *old_trigger;
int ret;
if (!sdi)
for (l = sdi->probes; l; l = l->next) {
probe = l->data;
if (probe->index == probenum) {
- /* If the probe already has a trigger, kill it first. */
- g_free(probe->trigger);
- probe->trigger = g_strdup(trigger);
+ old_trigger = probe->trigger;
ret = SR_OK;
+ if (g_strcmp0(trigger, old_trigger) == 0)
+ break;
+ /* Set new trigger if it has changed. */
+ probe->trigger = g_strdup(trigger);
+
+ if (sdi->driver && sdi->driver->config_probe_set) {
+ ret = sdi->driver->config_probe_set(
+ sdi, probe, SR_PROBE_SET_TRIGGER);
+ /* Roll back change if it wasn't applicable. */
+ if (ret == SR_ERR_ARG) {
+ g_free(probe->trigger);
+ probe->trigger = old_trigger;
+ break;
+ }
+ }
+ g_free(old_trigger);
break;
}
}
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;
/** @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,
/** @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)
{
/** @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)
/** @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)
{
/** @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)
{
}
#endif
+/** @private */
SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
{
struct sr_usbtmc_dev_inst *usbtmc;
return usbtmc;
}
+/** @private */
SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
{
g_free(usbtmc->device);