Use common usb_source_add and usb_source_remove functions.

[libsigrok.git] / hardware / common / usb.c

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index 9a5323e2a2cfb1a3730e26b59daeb2a28009f54c..249bce5ad8d074ebed52c2ee62b9a11f708efd1f 100644 (file)
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
@@ -33,14 +33,14 @@
 #define SUBCLASS_USBTMC 0x03
 #define USBTMC_USB488   0x01
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "usb: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "usb: "
+#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)
 
 /**
  * Find USB devices according to a connection string.
@@ -243,3 +243,40 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb)
 
        return ret;
 }
+
+SR_PRIV int usb_source_add(struct sr_context *ctx, int timeout,
+               sr_receive_data_callback_t cb, void *cb_data)
+{
+#ifdef _WIN32
+       sr_err("Operation not supported on Windows yet.");
+       return SR_ERR;
+#else
+       const struct libusb_pollfd **lupfd;
+       unsigned int i;
+
+       lupfd = libusb_get_pollfds(ctx->libusb_ctx);
+       for (i = 0; lupfd[i]; i++)
+               sr_source_add(lupfd[i]->fd, lupfd[i]->events, timeout, cb, cb_data);
+       free(lupfd);
+
+       return SR_OK;
+#endif
+}
+
+SR_PRIV int usb_source_remove(struct sr_context *ctx)
+{
+#ifdef _WIN32
+       sr_err("Operation not supported on Windows yet.");
+       return SR_ERR;
+#else
+       const struct libusb_pollfd **lupfd;
+       unsigned int i;
+
+       lupfd = libusb_get_pollfds(ctx->libusb_ctx);
+       for (i = 0; lupfd[i]; i++)
+               sr_source_remove(lupfd[i]->fd);
+       free(lupfd);
+
+       return SR_OK;
+#endif
+}