X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fmisc.c;h=c01e0b6f1258721613946eea78930f66164d52ea;hb=4362438f1e2da14d04678327c403f9d75c4c0a48;hp=8bcd7b0907342c16c76254e951ae5de580c4fc5f;hpb=a00ba012288726678e1a270961c8d4f46f3dbd33;p=libsigrok.git

diff --git a/hardware/common/misc.c b/hardware/common/misc.c
index 8bcd7b09..c01e0b6f 100644
--- a/hardware/common/misc.c
+++ b/hardware/common/misc.c
@@ -17,10 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include <stdint.h>
 #include <glib.h>
+#ifdef HAVE_LIBUSB_1_0
 #include <libusb.h>
+#endif
 #include <sigrok.h>
+#include <sigrok-internal.h>
+
+#ifdef HAVE_LIBUSB_1_0
 
 int opendev2(int device_index, struct sr_device_instance **sdi,
 	     libusb_device *dev, struct libusb_device_descriptor *des,
@@ -29,7 +35,7 @@ int opendev2(int device_index, struct sr_device_instance **sdi,
 	int err;
 
 	if ((err = libusb_get_device_descriptor(dev, des))) {
-		g_warning("failed to get device descriptor: %d", err);
+		sr_warn("failed to get device descriptor: %d", err);
 		return -1;
 	}
 
@@ -48,12 +54,12 @@ int opendev2(int device_index, struct sr_device_instance **sdi,
 	 */
 	if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
 		(*sdi)->usb->address = libusb_get_device_address(dev);
-		(*sdi)->status = ST_ACTIVE;
-		g_message("opened device %d on %d.%d interface %d",
-			  (*sdi)->index, (*sdi)->usb->bus,
-			  (*sdi)->usb->address, interface);
+		(*sdi)->status = SR_ST_ACTIVE;
+		sr_info("opened device %d on %d.%d interface %d",
+			(*sdi)->index, (*sdi)->usb->bus,
+			(*sdi)->usb->address, interface);
 	} else {
-		g_warning("failed to open device: %d", err);
+		sr_warn("failed to open device: %d", err);
 		*sdi = NULL;
 	}
 
@@ -67,7 +73,7 @@ int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
 	int err;
 
 	if ((err = libusb_get_device_descriptor(dev, des))) {
-		g_warning("failed to get device descriptor: %d", err);
+		sr_warn("failed to get device descriptor: %d", err);
 		return -1;
 	}
 
@@ -78,15 +84,17 @@ int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
 	    && libusb_get_device_address(dev) == (*sdi)->usb->address) {
 		/* Found it. */
 		if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
-			(*sdi)->status = ST_ACTIVE;
-			g_message("opened device %d on %d.%d interface %d",
-				  (*sdi)->index, (*sdi)->usb->bus,
-				  (*sdi)->usb->address, interface);
+			(*sdi)->status = SR_ST_ACTIVE;
+			sr_info("opened device %d on %d.%d interface %d",
+				(*sdi)->index, (*sdi)->usb->bus,
+				(*sdi)->usb->address, interface);
 		} else {
-			g_warning("failed to open device: %d", err);
+			sr_warn("failed to open device: %d", err);
 			*sdi = NULL;
 		}
 	}
 
 	return 0;
 }
+
+#endif