sr: Eliminate usb/serial instances from API.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index fb8e0d53b732dffb501abe29244e0599e9c1a75c..401e94fbeec2c7e0a4f2b428732f2fce069ac316 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -25,9 +25,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <glib.h>
-#ifdef HAVE_LIBUSB_1_0
-#include <libusb.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -275,10 +272,6 @@ struct sr_device_instance {
        char *model;
        char *version;
        void *priv;
-       union {
-               struct sr_usb_device_instance *usb;
-               struct sr_serial_device_instance *serial;
-       };
 };
 
 /* sr_device_instance types */
@@ -287,19 +280,6 @@ enum {
        SR_SERIAL_INSTANCE,
 };
 
-#ifdef HAVE_LIBUSB_1_0
-struct sr_usb_device_instance {
-       uint8_t bus;
-       uint8_t address;
-       struct libusb_device_handle *devhdl;
-};
-#endif
-
-struct sr_serial_device_instance {
-       char *port;
-       int fd;
-};
-
 /* Device instance status */
 enum {
        SR_ST_NOT_FOUND,