X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=db86c61bc0d3b8cc86cdfc49904c539c5dfa9242;hb=069d9f25d9f63e35885a7e4c83e8587f0356d8f9;hp=3eef7b9efe2a907ee8e29a461bcf34f57cbbcbfe;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git
diff --git a/src/device.c b/src/device.c
index 3eef7b9e..db86c61b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -17,10 +17,10 @@
* along with this program. If not, see .
*/
+#include
#include
#include
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -133,6 +133,25 @@ SR_API int sr_dev_channel_enable(struct sr_channel *channel,
return SR_OK;
}
+/* Returns the next enabled channel, wrapping around if necessary. */
+SR_PRIV struct sr_channel *sr_next_enabled_channel(const struct sr_dev_inst *sdi,
+ struct sr_channel *cur_channel)
+{
+ struct sr_channel *next_channel;
+ GSList *l;
+
+ next_channel = cur_channel;
+ do {
+ l = g_slist_find(sdi->channels, next_channel);
+ if (l && l->next)
+ next_channel = l->next->data;
+ else
+ next_channel = sdi->channels->data;
+ } while (!next_channel->enabled);
+
+ return next_channel;
+}
+
/**
* Determine whether the specified device instance has the specified
* capability.
@@ -520,11 +539,10 @@ SR_API const char *sr_dev_inst_sernum_get(const struct sr_dev_inst *sdi)
*/
SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
{
+#ifdef HAVE_LIBUSB_1_0
struct drv_context *drvc;
int r, cnt, i, a, b;
char connection_id[64];
-
-#ifdef HAVE_LIBUSB_1_0
struct sr_usb_dev_inst *usb;
struct libusb_device **devlist;
struct libusb_device_descriptor des;
@@ -548,7 +566,7 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
if ((!sdi->connection_id) && (sdi->inst_type == SR_INST_USB)) {
/* connection_id isn't populated, let's do that here. */
- drvc = sdi->driver->priv;
+ drvc = sdi->driver->context;
usb = sdi->conn;
if ((cnt = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist)) < 0) {