#include "libsigrok.h"
#include "libsigrok-internal.h"
+SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
+ gboolean enabled, const char *name)
+{
+ struct sr_probe *probe;
+
+ if (!(probe = g_try_malloc0(sizeof(struct sr_probe)))) {
+ sr_err("hwdriver: probe malloc failed");
+ return NULL;
+ }
+
+ probe->index = index;
+ probe->type = type;
+ probe->enabled = enabled;
+ if (name)
+ probe->name = g_strdup(name);
+
+ return probe;
+}
+
/**
* Set the name of the specified probe in the specified device.
*
* If the probe already has a different name assigned to it, it will be
* removed, and the new name will be saved instead.
*
- * @param dev TODO
+ * @param sdi The device instance the probe is connected to.
* @param probenum The number of the probe whose name to set.
- * Note that the probe numbers start at 1 (not 0!).
- * @param name The new name that the specified probe should get.
+ * Note that the probe numbers start at 0.
+ * @param name The new name that the specified probe should get. A copy
+ * of the string is made.
*
- * @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 on success, or SR_ERR_ARG on invalid arguments.
*/
-SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
- const char *name)
+SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi,
+ int probenum, const char *name)
{
- struct sr_probe *p;
+ GSList *l;
+ struct sr_probe *probe;
+ int ret;
- if (!dev) {
- sr_err("dev: %s: dev was NULL", __func__);
+ if (!sdi) {
+ sr_err("%s: sdi was NULL", __func__);
return SR_ERR_ARG;
}
- p = sr_dev_probe_find(dev, probenum);
- if (!p) {
- sr_err("dev: %s: probe %d not found", __func__, probenum);
- return SR_ERR; /* TODO: More specific error? */
+ ret = SR_ERR_ARG;
+ for (l = sdi->probes; l; l = l->next) {
+ probe = l->data;
+ if (probe->index == probenum) {
+ g_free(probe->name);
+ probe->name = g_strdup(name);
+ ret = SR_OK;
+ break;
+ }
}
- /* TODO: Sanity check on 'name'. */
-
- /* If the probe already has a name, kill it first. */
- g_free(p->name);
-
- p->name = g_strdup(name);
-
- return SR_OK;
+ return ret;
}
/**
* be silently replaced.
*
* @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 trigger string, in the format used by sigrok-cli
+ * @param probenum The probe number, starting from 0.
+ * @param trigger Trigger string, in the format used by sigrok-cli
*
- * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
+ * @return SR_OK on success, or SR_ERR_ARG on invalid arguments.
*/
SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
const char *trigger)
* @param hwcap The capability that should be checked (whether it's supported
* by the specified device).
*
- * @return TRUE, if the device has the specified capability, FALSE otherwise.
+ * @return TRUE if the device has the specified capability, FALSE otherwise.
* FALSE is also returned upon invalid input parameters or other
* error conditions.
*/
return FALSE;
}
+SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
+ const char *vendor, const char *model, const char *version)
+{
+ struct sr_dev_inst *sdi;
+
+ if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) {
+ sr_err("hwdriver: %s: sdi malloc failed", __func__);
+ return NULL;
+ }
+
+ sdi->driver = NULL;
+ sdi->index = index;
+ sdi->status = status;
+ sdi->inst_type = -1;
+ sdi->vendor = vendor ? g_strdup(vendor) : NULL;
+ sdi->model = model ? g_strdup(model) : NULL;
+ sdi->version = version ? g_strdup(version) : NULL;
+ sdi->probes = NULL;
+ sdi->priv = NULL;
+
+ return sdi;
+}
+
+SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
+{
+ struct sr_probe *probe;
+ GSList *l;
+
+ for (l = sdi->probes; l; l = l->next) {
+ probe = l->data;
+ g_free(probe->name);
+ g_free(probe);
+ }
+
+ g_free(sdi->priv);
+ g_free(sdi->vendor);
+ g_free(sdi->model);
+ g_free(sdi->version);
+ g_free(sdi);
+
+}
+
+#ifdef HAVE_LIBUSB_1_0
+
+SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
+ uint8_t address, struct libusb_device_handle *hdl)
+{
+ struct sr_usb_dev_inst *udi;
+
+ if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) {
+ sr_err("hwdriver: %s: udi malloc failed", __func__);
+ return NULL;
+ }
+
+ udi->bus = bus;
+ udi->address = address;
+ udi->devhdl = hdl;
+
+ return udi;
+}
+
+SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
+{
+ /* Avoid compiler warnings. */
+ (void)usb;
+
+ /* Nothing to do for this device instance type. */
+}
+
+#endif
+
+SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
+ int fd)
+{
+ struct sr_serial_dev_inst *serial;
+
+ if (!(serial = g_try_malloc(sizeof(struct sr_serial_dev_inst)))) {
+ sr_err("hwdriver: %s: serial malloc failed", __func__);
+ return NULL;
+ }
+
+ serial->port = g_strdup(port);
+ serial->fd = fd;
+
+ return serial;
+}
+
+SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
+{
+ g_free(serial->port);
+}
+