X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=c01bc92f09d0fd8f772c6ff6ee52016632ff1218;hb=660e398fe9f5fc608787f8fd75a9df8aac61026f;hp=327ddc73df50b723ee7a314970046dfb764b4eda;hpb=576ff5b0ba72cf9d682cf62736b4b9dc2048647d;p=libsigrok.git diff --git a/device.c b/device.c index 327ddc73..c01bc92f 100644 --- 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 @@ -46,7 +39,15 @@ * @{ */ -/** @private */ +/** @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 + * + * @return NULL (failure) or new struct sr_probe*. + */ SR_PRIV struct sr_probe *sr_probe_new(int index, int type, gboolean enabled, const char *name) { @@ -73,14 +74,14 @@ SR_PRIV struct sr_probe *sr_probe_new(int index, int type, * removed, and the new name will be saved instead. * * @param sdi The device instance the probe is connected to. - * @param probenum The number of the probe whose name to set. + * @param[in] probenum The number of the probe whose name to set. * Note that the probe numbers start at 0. - * @param name The new name that the specified probe should get. A copy + * @param[in] name The new name that the specified probe should get. A copy * of the string is made. * * @return SR_OK on success, or SR_ERR_ARG on invalid arguments. * - * @since 0.1.0 (but the API changed in 0.2.0) + * @since 0.2.0 */ SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi, int probenum, const char *name) @@ -115,7 +116,9 @@ SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi, * @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 */ @@ -125,6 +128,7 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, GSList *l; struct sr_probe *probe; int ret; + gboolean was_enabled; if (!sdi) return SR_ERR_ARG; @@ -133,8 +137,17 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, 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; } } @@ -148,19 +161,22 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, * If the specified probe of this device already has a trigger, it will * be silently replaced. * - * @param sdi Must not be NULL. - * @param probenum The probe number, starting from 0. - * @param trigger Trigger string, in the format used by sigrok-cli + * @param[in,out] sdi Pointer to the device instance; must not be NULL. + * @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.1.0 (but the API changed in 0.2.0) + * @since 0.2.0 */ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, const char *trigger) { GSList *l; struct sr_probe *probe; + char *old_trigger; int ret; if (!sdi) @@ -170,10 +186,24 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, 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; } } @@ -189,14 +219,14 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, * 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). - * @param key The option that should be checked for support on the + * @param[in] key The option that should be checked for is supported by the * specified device. * - * @return TRUE if the device has the specified option, FALSE otherwise. - * FALSE is also returned on invalid input parameters or other - * error conditions. + * @retval TRUE Device has the specified option + * @retval FALSE Device does not have the specified option, invalid input + * parameters or other error conditions. * - * @since 0.1.0 (but the API changed in 0.2.0) + * @since 0.2.0 */ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key) { @@ -208,7 +238,8 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key) if (!sdi || !sdi->driver || !sdi->driver->config_list) return FALSE; - if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, &gvar, NULL) != SR_OK) + if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, + &gvar, sdi, NULL) != SR_OK) return FALSE; ret = FALSE; @@ -224,7 +255,18 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key) return ret; } -/** @private */ +/** @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 + * sr_dev_inst_free(). + */ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, const char *vendor, const char *model, const char *version) { @@ -243,13 +285,17 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, sdi->model = model ? g_strdup(model) : NULL; sdi->version = version ? g_strdup(version) : NULL; sdi->probes = NULL; + sdi->channel_groups = NULL; sdi->conn = NULL; sdi->priv = NULL; return sdi; } -/** @private */ +/** @private + * Free device instance struct created by sr_dev_inst(). + * @param sdi struct* to free. + */ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) { struct sr_probe *probe; @@ -263,6 +309,9 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) } g_slist_free(sdi->probes); + if (sdi->channel_groups) + g_slist_free(sdi->channel_groups); + g_free(sdi->vendor); g_free(sdi->model); g_free(sdi->version); @@ -271,7 +320,15 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) #ifdef HAVE_LIBUSB_1_0 -/** @private */ +/** @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 + * + * @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) { @@ -289,7 +346,10 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus, return udi; } -/** @private */ +/** @private + * Free struct * allocated by sr_usb_dev_inst(). + * @param usb struct* to free. Must not be NULL. + */ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb) { g_free(usb); @@ -297,18 +357,20 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb) #endif +#ifdef HAVE_LIBSERIALPORT + /** * @private * * Both parameters are copied to newly allocated strings, and freed * automatically by sr_serial_dev_inst_free(). * - * @param pathname OS-specific serial port specification. Examples: + * @param[in] port OS-specific serial port specification. Examples: * "/dev/ttyUSB0", "/dev/ttyACM1", "/dev/tty.Modem-0", "COM1". - * @param serialcomm A serial communication parameters string, in the form - * of /, for example - * "9600/8n1" or "600/7o2". This is an optional parameter; - * it may be filled in later. + * @param[in] serialcomm A serial communication parameters string, in the form + * of \/\\\, for example + * "9600/8n1" or "600/7o2". This is an optional parameter; + * it may be filled in later. * * @return A pointer to a newly initialized struct sr_serial_dev_inst, * or NULL on error. @@ -331,18 +393,49 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, serial->port = g_strdup(port); if (serialcomm) serial->serialcomm = g_strdup(serialcomm); - serial->fd = -1; return serial; } -/** @private */ +/** @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. + */ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial) { g_free(serial->port); g_free(serial->serialcomm); g_free(serial); } +#endif + +/** @private */ +SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device) +{ + struct sr_usbtmc_dev_inst *usbtmc; + + if (!device) { + sr_err("Device name required."); + return NULL; + } + + if (!(usbtmc = g_try_malloc0(sizeof(struct sr_usbtmc_dev_inst)))) { + sr_err("USBTMC device instance malloc failed."); + return NULL; + } + + usbtmc->device = g_strdup(device); + usbtmc->fd = -1; + + return usbtmc; +} + +/** @private */ +SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc) +{ + g_free(usbtmc->device); + g_free(usbtmc); +} /** * Get the list of devices/instances of the specified driver. @@ -352,7 +445,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial) * @return The list of devices/instances of this driver, or NULL upon errors * or if the list is empty. * - * @since 0.1.0 (but the API changed in 0.2.0) + * @since 0.2.0 */ SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver) { @@ -363,20 +456,31 @@ SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver) } /** - * Clear all devices/instances of the specified driver. + * Clear the list of device instances a driver knows about. * - * @param driver The driver to use. Must not be NULL. + * @param driver The driver to use. This must be a pointer to one of + * the entries returned by sr_driver_list(). Must not be NULL. * - * @return SR_OK upon success, a negative error code upon errors. + * @retval SR_OK Success + * @retval SR_ERR_ARG Invalid driver * * @since 0.2.0 */ SR_API int sr_dev_clear(const struct sr_dev_driver *driver) { - if (driver && driver->dev_clear) - return driver->dev_clear(); + int ret; + + if (!driver) { + sr_err("Invalid driver."); + return SR_ERR_ARG; + } + + if (driver->dev_clear) + ret = driver->dev_clear(); else - return SR_OK; + ret = std_dev_clear(driver, NULL); + + return ret; } /**