saleae logic: fix triggers after style changes

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 78f1567ca775e7a8621a80e305934000fc6e283f..ede379bb24aa101f0517c48ca11722b802dc3d2f 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -358,7 +358,7 @@ GSList *list_hwplugins(void);
 
 /* Generic device instances */
 struct sigrok_device_instance *sigrok_device_instance_new(int index,
-       int status, char *vendor, char *model, char *version);
+       int status, const char *vendor, const char *model, const char *version);
 struct sigrok_device_instance *get_sigrok_device_instance(
                        GSList *device_instances, int device_index);
 void sigrok_device_instance_free(struct sigrok_device_instance *sdi);
@@ -369,7 +369,8 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
 void usb_device_instance_free(struct usb_device_instance *usb);
 
 /* Serial-specific instances */
-struct serial_device_instance *serial_device_instance_new(char *port, int fd);
+struct serial_device_instance *serial_device_instance_new(
+                                       const char *port, int fd);
 void serial_device_instance_free(struct serial_device_instance *serial);
 
 int find_hwcap(int *capabilities, int hwcap);
@@ -433,4 +434,13 @@ void serial_restore_params(int fd, void *backup);
 int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
                      int flowcontrol);
 
+/* libsigrok/hardware/common/misc.c */
+/* TODO: Should not be public. */
+int opendev2(int device_index, struct sigrok_device_instance **sdi,
+            libusb_device *dev, struct libusb_device_descriptor *des,
+            int *skip, uint16_t vid, uint16_t pid, int interface);
+int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
+            struct libusb_device_descriptor *des,
+            uint16_t vid, uint16_t pid, int interface);
+
 #endif