X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fmisc.c;h=43b158ae742c32356aff8b3d80b6ecb1adb9e46d;hb=f7d2982d42e876d8814cba203570a45284c79658;hp=6635083f5574156ae843c6371169ef276d0c32ec;hpb=9a5c6dcf498b8dfebb8beb848ee6db6b59b173e5;p=libsigrok.git

diff --git a/hardware/common/misc.c b/hardware/common/misc.c
index 6635083f..43b158ae 100644
--- a/hardware/common/misc.c
+++ b/hardware/common/misc.c
@@ -17,12 +17,17 @@
  * 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>
 
-int opendev2(int device_index, struct sigrok_device_instance **sdi,
+#ifdef HAVE_LIBUSB_1_0
+
+int opendev2(int device_index, struct sr_device_instance **sdi,
 	     libusb_device *dev, struct libusb_device_descriptor *des,
 	     int *skip, uint16_t vid, uint16_t pid, int interface)
 {
@@ -48,7 +53,7 @@ int opendev2(int device_index, struct sigrok_device_instance **sdi,
 	 */
 	if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
 		(*sdi)->usb->address = libusb_get_device_address(dev);
-		(*sdi)->status = ST_ACTIVE;
+		(*sdi)->status = SR_ST_ACTIVE;
 		g_message("opened device %d on %d.%d interface %d",
 			  (*sdi)->index, (*sdi)->usb->bus,
 			  (*sdi)->usb->address, interface);
@@ -60,7 +65,7 @@ int opendev2(int device_index, struct sigrok_device_instance **sdi,
 	return 0;
 }
 
-int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
+int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
 	     struct libusb_device_descriptor *des,
 	     uint16_t vid, uint16_t pid, int interface)
 {
@@ -78,7 +83,7 @@ int opendev3(struct sigrok_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;
+			(*sdi)->status = SR_ST_ACTIVE;
 			g_message("opened device %d on %d.%d interface %d",
 				  (*sdi)->index, (*sdi)->usb->bus,
 				  (*sdi)->usb->address, interface);
@@ -90,3 +95,5 @@ int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
 
 	return 0;
 }
+
+#endif