Drop prototype for non-existant make_metadata().

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index efd8f5e1b77dac587ae042f48f6339476303218a..046670d5ffe13731a98f233bbdaea6064c42e0e0 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,11 +138,13 @@ 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:
-               usb_device_instance_free(sdi->usb);
+#ifdef HAVE_LIBUSB_1_0
+       case SR_USB_INSTANCE:
+               sr_usb_device_instance_free(sdi->usb);
                break;
-       case SERIAL_INSTANCE:
-               serial_device_instance_free(sdi->serial);
+#endif
+       case SR_SERIAL_INSTANCE:
+               sr_serial_device_instance_free(sdi->serial);
                break;
        default:
                /* No specific type, nothing extra to free. */
@@ -155,12 +157,14 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
        free(sdi);
 }
 
-struct usb_device_instance *usb_device_instance_new(uint8_t bus,
+#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)
 {
-       struct usb_device_instance *udi;
+       struct sr_usb_device_instance *udi;
 
-       if (!(udi = malloc(sizeof(struct usb_device_instance))))
+       if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
                return NULL;
 
        udi->bus = bus;
@@ -170,7 +174,7 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
        return udi;
 }
 
-void usb_device_instance_free(struct usb_device_instance *usb)
+void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
 {
        /* Avoid compiler warnings. */
        usb = usb;
@@ -178,12 +182,14 @@ void usb_device_instance_free(struct usb_device_instance *usb)
        /* Nothing to do for this device instance type. */
 }
 
-struct serial_device_instance *serial_device_instance_new(
+#endif
+
+struct sr_serial_device_instance *sr_serial_device_instance_new(
                                                const char *port, int fd)
 {
-       struct serial_device_instance *serial;
+       struct sr_serial_device_instance *serial;
 
-       if (!(serial = malloc(sizeof(struct serial_device_instance))))
+       if (!(serial = malloc(sizeof(struct sr_serial_device_instance))))
                return NULL;
 
        serial->port = strdup(port);
@@ -192,7 +198,7 @@ struct serial_device_instance *serial_device_instance_new(
        return serial;
 }
 
-void serial_device_instance_free(struct serial_device_instance *serial)
+void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
 {
        free(serial->port);
 }
@@ -225,15 +231,11 @@ struct hwcap_option *find_hwcap_option(int hwcap)
 
 void source_remove(int fd)
 {
-
-       session_source_remove(fd);
-
+       sr_session_source_remove(fd);
 }
 
 void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
                void *user_data)
 {
-
-       session_source_add(fd, events, timeout, rcv_cb, user_data);
-
+       sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }