Fix warnings: g_fopen() needs <glib/gstdio.h>.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 36f22016a7327d6a06b5bb9e16d3740520a5bcff..b10164693f52adec61d8a8f457587c255055d0d1 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -24,7 +25,6 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
-#include "config.h"
 
 /* The list of loaded plugins lives here. */
 GSList *plugins;
@@ -34,9 +34,9 @@ GSList *plugins;
  * options.
  */
 struct hwcap_option hwcap_options[] = {
-       {HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
-       {HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"},
-       {HWCAP_PATTERN_MODE, T_CHAR, "Pattern generator mode", "patternmode"},
+       {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
+       {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
+       {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
        {0, 0, NULL, NULL},
 };
 
@@ -138,10 +138,12 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
 void sr_device_instance_free(struct sr_device_instance *sdi)
 {
        switch (sdi->instance_type) {
-       case USB_INSTANCE:
+#ifdef HAVE_LIBUSB_1_0
+       case SR_USB_INSTANCE:
                sr_usb_device_instance_free(sdi->usb);
                break;
-       case SERIAL_INSTANCE:
+#endif
+       case SR_SERIAL_INSTANCE:
                sr_serial_device_instance_free(sdi->serial);
                break;
        default:
@@ -155,6 +157,8 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
        free(sdi);
 }
 
+#ifdef HAVE_LIBUSB_1_0
+
 struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
                        uint8_t address, struct libusb_device_handle *hdl)
 {
@@ -178,6 +182,8 @@ void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
        /* Nothing to do for this device instance type. */
 }
 
+#endif
+
 struct sr_serial_device_instance *sr_serial_device_instance_new(
                                                const char *port, int fd)
 {